---

yaml --- r: 257427 b: refs/heads/master c: 43605ef h: refs/heads/master i: 257425: f348e5b 257423: 47fe7f8 v: v3
git-mirror · Jul 21, 2011 · 1a2baaf · 1a2baaf
1 parent b165347
commit 1a2baaf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 050438ed5a05b25cdf287f5691e56a58c2606997
+refs/heads/master: 43605ef188cd39708ddc5e3adc47b337b6ebe40e
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -384,12 +384,21 @@ config X86_INTEL_CE
 	  This option compiles in support for the CE4100 SOC for settop
 	  boxes and media devices.
 
+config X86_INTEL_MID
+	bool "Intel MID platform support"
+	depends on X86_32
+	depends on X86_EXTENDED_PLATFORM
+	---help---
+	  Select to build a kernel capable of supporting Intel MID platform
+	  systems which do not have the PCI legacy interfaces (Moorestown,
+	  Medfield). If you are building for a PC class system say N here.
+
+if X86_INTEL_MID
+
 config X86_MRST
        bool "Moorestown MID platform"
 	depends on PCI
 	depends on PCI_GOANY
-	depends on X86_32
-	depends on X86_EXTENDED_PLATFORM
 	depends on X86_IO_APIC
 	select APB_TIMER
 	select I2C
@@ -404,6 +413,8 @@ config X86_MRST
 	  nor standard legacy replacement devices/features. e.g. Moorestown does
 	  not contain i8259, i8254, HPET, legacy BIOS, most of the io ports.
 
+endif
+
 config X86_RDC321X
 	bool "RDC R-321x SoC"
 	depends on X86_32

diff --git a/trunk/arch/x86/kernel/relocate_kernel_32.S b/trunk/arch/x86/kernel/relocate_kernel_32.S
@@ -97,8 +97,6 @@ relocate_kernel:
 	ret
 
 identity_mapped:
-	/* set return address to 0 if not preserving context */
-	pushl	$0
 	/* store the start address on the stack */
 	pushl   %edx
 

diff --git a/trunk/arch/x86/kernel/relocate_kernel_64.S b/trunk/arch/x86/kernel/relocate_kernel_64.S
@@ -100,8 +100,6 @@ relocate_kernel:
 	ret
 
 identity_mapped:
-	/* set return address to 0 if not preserving context */
-	pushq	$0
 	/* store the start address on the stack */
 	pushq   %rdx