diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-08-01 17:22:17 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-08-01 17:22:17 +0000 |
| commit | c9ce895199653555c2e5610a824c9de43494e66d (patch) | |
| tree | 899688ae733545408f0427098efa05d2d2c14a2f | |
| parent | f97654833adc12d9ebcceff633755e2dc9939158 (diff) | |
make early_mtrr_init() invisible for cache as ram targets as it breaks them.
Fix up converted mainboards that still used early_mtrr_init()
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5678 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/cpu/x86/mtrr/earlymtrr.c | 2 | ||||
| -rw-r--r-- | src/mainboard/bcom/winnetp680/romstage.c | 5 | ||||
| -rw-r--r-- | src/mainboard/via/epia-cn/romstage.c | 5 | ||||
| -rw-r--r-- | src/mainboard/via/pc2500e/romstage.c | 3 |
4 files changed, 2 insertions, 13 deletions
diff --git a/src/cpu/x86/mtrr/earlymtrr.c b/src/cpu/x86/mtrr/earlymtrr.c index 1cbc544350..72c471e180 100644 --- a/src/cpu/x86/mtrr/earlymtrr.c +++ b/src/cpu/x86/mtrr/earlymtrr.c @@ -62,6 +62,7 @@ static inline void cache_lbmem(int type) enable_cache(); } +#if !defined(CONFIG_USE_DCACHE_RAM) || (CONFIG_USE_DCACHE_RAM == 0) /* the fixed and variable MTTRs are power-up with random values, * clear them to MTRR_TYPE_UNCACHEABLE for safty. */ @@ -118,6 +119,7 @@ static inline void early_mtrr_init(void) do_early_mtrr_init(mtrr_msrs); enable_cache(); } +#endif static inline int early_mtrr_init_detected(void) { diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c index cdf4ad359c..edca90bd11 100644 --- a/src/mainboard/bcom/winnetp680/romstage.c +++ b/src/mainboard/bcom/winnetp680/romstage.c @@ -95,11 +95,6 @@ void main(unsigned long bist) enable_smbus(); smbus_fixup(&ctrl); - if (bist == 0) { - print_debug("doing early_mtrr\n"); - early_mtrr_init(); - } - /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c index eb7f294510..b98103be6d 100644 --- a/src/mainboard/via/epia-cn/romstage.c +++ b/src/mainboard/via/epia-cn/romstage.c @@ -93,11 +93,6 @@ void main(unsigned long bist) enable_smbus(); smbus_fixup(&ctrl); - if (bist == 0) { - print_debug("doing early_mtrr\n"); - early_mtrr_init(); - } - /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c index 32a853cdb3..90913e1710 100644 --- a/src/mainboard/via/pc2500e/romstage.c +++ b/src/mainboard/via/pc2500e/romstage.c @@ -67,9 +67,6 @@ void main(unsigned long bist) enable_smbus(); smbus_fixup(&ctrl); - if (bist == 0) - early_mtrr_init(); - /* Halt if there was a built-in self test failure. */ report_bist_failure(bist); |