diff options
Diffstat (limited to 'src/arch/i386')
| -rw-r--r-- | src/arch/i386/init/car.S | 8 |
1 files changed, 7 insertions, 1 deletions
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 |