summaryrefslogtreecommitdiff
path: root/src/cpu
diff options
context:
space:
mode:
authorRudolf Marek <r.marek@assembler.cz>2010-01-05 17:35:44 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-01-05 17:35:44 +0000
commit95c50c6091cdc700c79da832f61b2a94b3e5c87c (patch)
treef5899737c5acca1972eeb241ffb1791c5e99fafa /src/cpu
parenta0c68f864e9095a94c684183deb41f706e0bd1c3 (diff)
downloadcoreboot-95c50c6091cdc700c79da832f61b2a94b3e5c87c.tar.xz
- Let AMD CAR code pick the right XIP area
for tinybootblock - move asus/m2v-mx_se to tinybootblock - Add romstrap for via southbridge to tinybootblock-bootblock Signed-off-by: Rudolf Marek <r.marek@assembler.cz> Acked-by: Peter Stuge <peter@stuge.se> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4999 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu')
-rw-r--r--src/cpu/amd/car/cache_as_ram.inc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/cpu/amd/car/cache_as_ram.inc b/src/cpu/amd/car/cache_as_ram.inc
index fa595f94e5..b4de775b02 100644
--- a/src/cpu/amd/car/cache_as_ram.inc
+++ b/src/cpu/amd/car/cache_as_ram.inc
@@ -264,7 +264,14 @@ clear_fixed_var_mtrr_out:
*/
movl $0x202, %ecx
xorl %edx, %edx
- movl $(CONFIG_XIP_ROM_BASE | MTRR_TYPE_WRBACK), %eax
+
+#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
+ movl $REAL_XIP_ROM_BASE, %eax
+ orl $MTRR_TYPE_WRBACK, %eax
wrmsr
movl $0x203, %ecx