i386: Remove non-PAE hypervisor build target.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

4 files changed, 2 insertions, 34 deletions

diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S
index 7988051f91..c10aa62b2d 100644
--- a/xen/arch/x86/boot/head.S
+++ b/xen/arch/x86/boot/head.S
@@ -132,7 +132,7 @@ __start:
         mov     %eax,sym_phys(idle_pg_table) + (262*8) /* PML4[262]: 1:1 map */
         mov     $(sym_phys(l3_xenmap)+7),%eax
         mov     %eax,sym_phys(idle_pg_table) + (261*8) /* PML4[261]: xen map */
-#elif defined(CONFIG_X86_PAE)
+#else
         /* Initialize low and high mappings of memory with 2MB pages */
         mov     $sym_phys(idle_pg_table_l2),%edi
         mov     $0xe3,%eax                   /* PRESENT+RW+A+D+2MB */
@@ -147,19 +147,6 @@ __start:
         add     $(1<<L2_PAGETABLE_SHIFT),%eax
         cmp     $(16<<20)+0xe3,%eax
         jne     1b
-#else
-        /* Initialize low and high mappings of memory with 4MB pages */
-        mov     $sym_phys(idle_pg_table),%edi
-        mov     $0xe3,%eax                   /* PRESENT+RW+A+D+4MB */
-1:      mov     %eax,__PAGE_OFFSET>>20(%edi) /* high mapping */
-        stosl                                /* low mapping */
-        add     $(1<<L2_PAGETABLE_SHIFT),%eax
-        cmp     $DIRECTMAP_PHYS_END+0xe3,%eax
-        jne     1b
-1:      stosl   /* low mappings cover up to 16MB */
-        add     $(1<<L2_PAGETABLE_SHIFT),%eax
-        cmp     $(16<<20)+0xe3,%eax
-        jne     1b
 #endif
 
         /* Initialize 4kB mappings of first 2MB or 4MB of memory. */
@@ -170,9 +157,7 @@ __start:
 #endif
         xor     %ecx,%ecx
 1:      stosl
-#if CONFIG_PAGING_LEVELS >= 3
         add     $4,%edi
-#endif
         add     $PAGE_SIZE,%eax
         inc     %ecx
         /* VGA hole (0xa0000-0xc0000) should be mapped UC. */
@@ -188,12 +173,9 @@ __start:
 #if defined(__x86_64__)
         mov     %edi,sym_phys(l2_identmap)
         mov     %edi,sym_phys(l2_xenmap)
-#elif defined(CONFIG_X86_PAE)
+#else
         mov     %edi,sym_phys(idle_pg_table_l2)
         mov     %edi,sym_phys(idle_pg_table_l2) + (__PAGE_OFFSET>>18)
-#else
-        mov     %edi,sym_phys(idle_pg_table)
-        mov     %edi,sym_phys(idle_pg_table) + (__PAGE_OFFSET>>20)
 #endif
 
         /* Copy bootstrap trampoline to low memory, below 1MB. */
diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S
index af4de553a8..ad15f5c4e8 100644
--- a/xen/arch/x86/boot/trampoline.S
+++ b/xen/arch/x86/boot/trampoline.S
@@ -60,11 +60,7 @@ trampoline_protmode_entry:
         fninit
 
         /* Initialise CR4. */
-#if CONFIG_PAGING_LEVELS == 2
-        mov     $X86_CR4_PSE,%ecx
-#else
         mov     $X86_CR4_PAE,%ecx
-#endif
         mov     %ecx,%cr4
 
         /* Load pagetable base register. */
@@ -72,7 +68,6 @@ trampoline_protmode_entry:
         add     bootsym_phys(trampoline_xen_phys_start),%eax
         mov     %eax,%cr3
 
-#if CONFIG_PAGING_LEVELS != 2
         /* Set up EFER (Extended Feature Enable Register). */
         mov     bootsym_phys(cpuid_ext_features),%edi
         test    $0x20100800,%edi /* SYSCALL/SYSRET, No Execute, Long Mode? */
@@ -88,7 +83,6 @@ trampoline_protmode_entry:
         btsl    $_EFER_NX,%eax  /* No Execute     */
 1:      wrmsr
 .Lskip_efer:
-#endif
 
         mov     $0x80050033,%eax /* hi-to-lo: PG,AM,WP,NE,ET,MP,PE */
         mov     %eax,%cr0
diff --git a/xen/arch/x86/boot/wakeup.S b/xen/arch/x86/boot/wakeup.S
index a986b422f8..502f510102 100644
--- a/xen/arch/x86/boot/wakeup.S
+++ b/xen/arch/x86/boot/wakeup.S
@@ -126,11 +126,7 @@ wakeup_32:
         /* fpu init? */
 
         /* Initialise CR4. */
-#if CONFIG_PAGING_LEVELS == 2
-        mov     $X86_CR4_PSE, %ecx
-#else
         mov     $X86_CR4_PAE, %ecx
-#endif
         mov     %ecx, %cr4
 
         /* Load pagetable base register */
@@ -139,7 +135,6 @@ wakeup_32:
         mov     %eax,%cr3
 
         /* Will cpuid feature change after resume? */
-#if CONFIG_PAGING_LEVELS != 2
         /* Set up EFER (Extended Feature Enable Register). */
         mov     bootsym_phys(cpuid_ext_features),%edi
         test    $0x20100800,%edi /* SYSCALL/SYSRET, No Execute, Long Mode? */
@@ -155,7 +150,6 @@ wakeup_32:
         btsl    $_EFER_NX,%eax  /* No Execute     */
 1:      wrmsr
 .Lskip_eferw:
-#endif
 
         wbinvd
 
diff --git a/xen/arch/x86/boot/x86_32.S b/xen/arch/x86/boot/x86_32.S
index a48c360611..5e29e4d7ea 100644
--- a/xen/arch/x86/boot/x86_32.S
+++ b/xen/arch/x86/boot/x86_32.S
@@ -81,14 +81,12 @@ gdt_descr:
         .long   gdt_table - FIRST_RESERVED_GDT_BYTE
 
 
-#ifdef CONFIG_X86_PAE
         .align 32
 ENTRY(idle_pg_table)
         .long sym_phys(idle_pg_table_l2) + 0*PAGE_SIZE + 0x01, 0
         .long sym_phys(idle_pg_table_l2) + 1*PAGE_SIZE + 0x01, 0
         .long sym_phys(idle_pg_table_l2) + 2*PAGE_SIZE + 0x01, 0
         .long sym_phys(idle_pg_table_l2) + 3*PAGE_SIZE + 0x01, 0
-#endif
 
         .align PAGE_SIZE, 0
 /* NB. Rings != 0 get access up to MACH2PHYS_VIRT_END. This allows access to */