From 535e3b4baa6edc43fb4f7d9ad77854b9eef4c76b Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Thu, 11 Feb 2010 21:51:04 +0000 Subject: Adapt all uses of CONFIG_XIP_ROM_BASE to use AUTO_XIP_ROM_BASE (as implemented for tinybootblock) if available. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5118 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/arch/i386/init/car.S | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/arch') diff --git a/src/arch/i386/init/car.S b/src/arch/i386/init/car.S index bfd7e343ce..107da7b222 100644 --- a/src/arch/i386/init/car.S +++ b/src/arch/i386/init/car.S @@ -236,12 +236,18 @@ clear_fixed_var_mtrr_out: wrmsr #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 +#else +#define REAL_XIP_ROM_BASE CONFIG_XIP_ROM_BASE +#endif /* enable write base caching so we can do execute in place * on the flash rom. */ movl $0x202, %ecx xorl %edx, %edx - movl $(CONFIG_XIP_ROM_BASE | MTRR_TYPE_WRBACK), %eax + movl $REAL_XIP_ROM_BASE, %eax + orl $MTRR_TYPE_WRBACK, %eax wrmsr movl $0x203, %ecx -- cgit v1.2.3