[coreboot] [PATCH] Add CPP logic to VIA CAR init code.

Warren Turkal wt at penguintechs.org
Sat Oct 2 10:59:32 CEST 2010


VIA/AMD experts,

This patch get's the via/vt8454c back to building. However, I am not
sure if the code that is being #ifdef'ed out will actually ever be used
on a via platform. The code comes straight from the amd CAR
implementation. A couple of questions are raised by this:
1) Should we just delete the code from the via file instead of this
   patch?
2) Should the amd and via CAR code be integrated into one file? Maybe
   just portions of the files if not the whole files?

Also, another happy side effect of this change is that all the c7 boards
seem to build with tiny bootblocks. Would everyone be ok with my making
that change?

Thanks,
wt
8<----------------------------------------------------------------------
The execute-in-place (XIP) config options need to be set in order to get
XIP functionality, so it needs to be excluded when those settings are
not set.

Signed-off-by: Warren Turkal <wt at penguintechs.org>
---
 src/cpu/via/car/cache_as_ram.inc |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/cpu/via/car/cache_as_ram.inc b/src/cpu/via/car/cache_as_ram.inc
index be00fe3..d18ac3a 100644
--- a/src/cpu/via/car/cache_as_ram.inc
+++ b/src/cpu/via/car/cache_as_ram.inc
@@ -85,6 +85,8 @@ clear_fixed_var_mtrr_out:
 	movl	$(~(CacheSize - 1) | 0x800), %eax
 	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
@@ -106,6 +108,8 @@ clear_fixed_var_mtrr_out:
 	movl	$(~(CONFIG_XIP_ROM_SIZE - 1) | 0x800), %eax
 	wrmsr
 
+#endif /* CONFIG_XIP_ROM_SIZE && CONFIG_XIP_ROM_BASE */
+
 	/* Set the default memory type and enable fixed and variable MTRRs. */
 	/* TODO: Or also enable fixed MTRRs? Bug in the code? */
 	movl	$MTRRdefType_MSR, %ecx
-- 
1.7.1





More information about the coreboot mailing list