aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/files/0006-core-Quark-patch-quark.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/files/0006-core-Quark-patch-quark.patch')
-rw-r--r--recipes-kernel/linux/files/0006-core-Quark-patch-quark.patch48
1 files changed, 26 insertions, 22 deletions
diff --git a/recipes-kernel/linux/files/0006-core-Quark-patch-quark.patch b/recipes-kernel/linux/files/0006-core-Quark-patch-quark.patch
index 81841a5..37c57f6 100644
--- a/recipes-kernel/linux/files/0006-core-Quark-patch-quark.patch
+++ b/recipes-kernel/linux/files/0006-core-Quark-patch-quark.patch
@@ -1,23 +1,25 @@
From xxxx Mon Sep 17 00:00:00 2001
From: Bryan O'Donoghue <bryan.odonoghue@intel.com>
-Date: Thu, 13 Feb 2014 16:41:02 +0000
+Date: Fri, 18 Apr 2014 10:11:00 +0100
Subject: [PATCH 06/21] core Quark patch
---
- arch/x86/Kconfig | 23 +
+ arch/x86/Kconfig | 25 +-
arch/x86/include/asm/imr.h | 22 +
- arch/x86/include/asm/qrk.h | 85 +
+ arch/x86/include/asm/qrk.h | 78 +
arch/x86/include/asm/serial.h | 6 +
arch/x86/kernel/cpu/intel.c | 11 +
arch/x86/kernel/setup.c | 5 +-
arch/x86/platform/efi/efi-bgrt.c | 20 +-
include/linux/efi-bgrt.h | 2 +
- 8 files changed, 168 insertions(+), 6 deletions(-)
+ meta/cfg/kernel-cache/bsp/quark/quark.cfg | 3063 +++++++++++++++++++++++++++++
+ 9 files changed, 3225 insertions(+), 7 deletions(-)
create mode 100644 arch/x86/include/asm/imr.h
create mode 100644 arch/x86/include/asm/qrk.h
+ create mode 100644 meta/cfg/kernel-cache/bsp/quark/quark.cfg
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 0694d09..2c881ac 100644
+index 0694d09..a10027f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -417,6 +417,15 @@ config X86_INTEL_CE
@@ -50,6 +52,15 @@ index 0694d09..2c881ac 100644
config X86_VISWS
bool "SGI 320/540 (Visual Workstation)"
depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT
+@@ -1169,7 +1185,7 @@ config ARCH_PHYS_ADDR_T_64BIT
+
+ config ARCH_DMA_ADDR_T_64BIT
+ def_bool y
+- depends on X86_64 || HIGHMEM64G
++ depends on X86_64 || HIGHMEM64G && !INTEL_QUARK_X1000_SOC
+
+ config DIRECT_GBPAGES
+ bool "Enable 1GB pages for kernel pagetables" if EXPERT
@@ -1524,6 +1540,13 @@ config EFI_STUB
See Documentation/x86/efi-stub.txt for more information.
@@ -94,28 +105,21 @@ index 0000000..876d499
+#endif /* _ASM_X86_IMR_H */
diff --git a/arch/x86/include/asm/qrk.h b/arch/x86/include/asm/qrk.h
new file mode 100644
-index 0000000..bd65b86
+index 0000000..ed4dab4
--- /dev/null
+++ b/arch/x86/include/asm/qrk.h
-@@ -0,0 +1,85 @@
+@@ -0,0 +1,78 @@
+/*
+ * Copyright(c) 2013 Intel Corporation.
+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of version 2 of the GNU General Public License as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful, but
-+ * WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * General Public License for more details.
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms and conditions of the GNU General Public License,
++ * version 2, as published by the Free Software Foundation.
+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Contact Information:
-+ * Intel Corporation
++ * This program is distributed in the hope it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
++ * more details.
+ */
+#ifndef _ASM_X86_QRK_H
+#define _ASM_X86_QRK_H
@@ -316,4 +320,4 @@ index 051b21f..165426b 100644
+static inline bool efi_bgrt_probe(void) { return false; }
#endif /* !CONFIG_ACPI_BGRT */
-
+