summaryrefslogtreecommitdiff
path: root/src/cpu/x86
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-03-18 20:58:41 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-03-18 20:58:41 +0000
commit78acf932912669eb0eb7f7280da1b3c550035ebb (patch)
tree89f13a87df362395527d41f42d0a57a167eab8db /src/cpu/x86
parent2bd91003413d431f0a4db6c3c6691f4b688cf5c5 (diff)
Remove remaining uses of
HAVE_FAILOVER_BOOT HAVE_FALLBACK_BOOT USE_FAILOVER_IMAGE USE_FALLBACK_IMAGE Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5259 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/x86')
-rw-r--r--src/cpu/x86/car/cache_as_ram.inc17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/cpu/x86/car/cache_as_ram.inc b/src/cpu/x86/car/cache_as_ram.inc
index bfc2ebdb31..cd37ac39ab 100644
--- a/src/cpu/x86/car/cache_as_ram.inc
+++ b/src/cpu/x86/car/cache_as_ram.inc
@@ -36,9 +36,6 @@
movl %eax, %ebp
CacheAsRam:
- /* hope we can skip the double set for normal part */
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-
// Check whether the processor has HT capability
movl $01, %eax
cpuid
@@ -191,14 +188,6 @@ clear_fixed_var_mtrr_out:
simplemask CacheSize, 0
wrmsr
-#else
- /* disable cache */
- movl %cr0, %eax
- orl $(0x1 << 30), %eax
- movl %eax, %cr0
-
-#endif /* CONFIG_USE_FALLBACK_IMAGE == 1*/
-
#if defined(CONFIG_XIP_ROM_SIZE) && defined(CONFIG_XIP_ROM_BASE)
#if defined(CONFIG_TINY_BOOTBLOCK) && CONFIG_TINY_BOOTBLOCK
#define REAL_XIP_ROM_BASE AUTO_XIP_ROM_BASE
@@ -225,8 +214,6 @@ clear_fixed_var_mtrr_out:
andl $0x9fffffff, %eax
movl %eax, %cr0
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-
/* Read the range with lodsl*/
movl $CacheBase, %esi
cld
@@ -283,8 +270,6 @@ clear_fixed_var_mtrr_out:
.xout1x:
#endif
-#endif /*CONFIG_USE_FALLBACK_IMAGE == 1*/
-
movl $(CacheBase + CacheSize - 4), %eax
movl %eax, %esp
@@ -319,7 +304,6 @@ var_mtrr_msr:
.long 0x20C, 0x20D, 0x20E, 0x20F
.long 0x000 /* NULL, end of table */
-#if CONFIG_USE_FALLBACK_IMAGE == 1
.align 0x1000
.code16
.global LogicalAP_SIPI
@@ -349,5 +333,4 @@ Halt_LogicalAP:
hlt
jmp Halt_LogicalAP
.code32
-#endif /*CONFIG_USE_FALLBACK_IMAGE == 1*/
.CacheAsRam_out: