From 773485b8920145443da8b09712553c10c954fed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 22 Dec 2014 16:33:24 +0200 Subject: intel CAR: Fix DCACHE_RAM_BASE for old sockets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using fixed MTRRs for CAR setup, CONFIG_DCACHE_RAM_BASE is ignored and was not correctly set on affected sockets and boards. It was still referenced in romstage linker script. This was discovered by clang builds failing for cases where DCACHE_RAM_BASE = 0, while gcc builds passed. The actual DCACHE_RAM_BASE programming is base = 0xd0000 - size, as taken from intel/cpu/cache_as_ram.inc. Change-Id: Ied5ab2e9683f12990f1aad48ee15eaf91133121c Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/7887 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/cpu/intel/slot_1/Kconfig | 4 ++++ src/cpu/intel/socket_FC_PGA370/Kconfig | 11 +++++++++-- src/cpu/intel/socket_PGA370/Kconfig | 4 ++++ src/cpu/intel/socket_mFCBGA479/Kconfig | 12 ++++++++++++ src/cpu/intel/socket_mPGA479M/Kconfig | 12 ++++++++++++ 5 files changed, 41 insertions(+), 2 deletions(-) (limited to 'src/cpu') diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig index 57076d71cd..25bcbafe9b 100644 --- a/src/cpu/intel/slot_1/Kconfig +++ b/src/cpu/intel/slot_1/Kconfig @@ -30,6 +30,10 @@ config SLOT_SPECIFIC_OPTIONS # dummy select CPU_INTEL_MODEL_6BX select CPU_INTEL_MODEL_6XX +config DCACHE_RAM_BASE + hex + default 0xcf000 + config DCACHE_RAM_SIZE hex default 0x01000 diff --git a/src/cpu/intel/socket_FC_PGA370/Kconfig b/src/cpu/intel/socket_FC_PGA370/Kconfig index f8ea0f96e8..91295b1517 100644 --- a/src/cpu/intel/socket_FC_PGA370/Kconfig +++ b/src/cpu/intel/socket_FC_PGA370/Kconfig @@ -24,7 +24,14 @@ config CPU_INTEL_SOCKET_FC_PGA370 select MMX select SSE +if CPU_INTEL_SOCKET_FC_PGA370 + +config DCACHE_RAM_BASE + hex + default 0xc8000 + config DCACHE_RAM_SIZE hex - default 0x8000 - depends on CPU_INTEL_SOCKET_FC_PGA370 + default 0x08000 + +endif diff --git a/src/cpu/intel/socket_PGA370/Kconfig b/src/cpu/intel/socket_PGA370/Kconfig index ea2de870c6..d3cf7248e6 100644 --- a/src/cpu/intel/socket_PGA370/Kconfig +++ b/src/cpu/intel/socket_PGA370/Kconfig @@ -30,6 +30,10 @@ config SSE2 bool default n +config DCACHE_RAM_BASE + hex + default 0xcf000 + config DCACHE_RAM_SIZE hex default 0x01000 diff --git a/src/cpu/intel/socket_mFCBGA479/Kconfig b/src/cpu/intel/socket_mFCBGA479/Kconfig index 5576623be0..74508549e3 100644 --- a/src/cpu/intel/socket_mFCBGA479/Kconfig +++ b/src/cpu/intel/socket_mFCBGA479/Kconfig @@ -3,3 +3,15 @@ config CPU_INTEL_SOCKET_MFCBGA479 select CPU_INTEL_MODEL_6BX select MMX select SSE + +if CPU_INTEL_SOCKET_MFCBGA479 + +config DCACHE_RAM_BASE + hex + default 0xc8000 + +config DCACHE_RAM_SIZE + hex + default 0x08000 + +endif diff --git a/src/cpu/intel/socket_mPGA479M/Kconfig b/src/cpu/intel/socket_mPGA479M/Kconfig index 8598eaf5aa..ba6f7ea58a 100644 --- a/src/cpu/intel/socket_mPGA479M/Kconfig +++ b/src/cpu/intel/socket_mPGA479M/Kconfig @@ -6,3 +6,15 @@ config CPU_INTEL_SOCKET_MPGA479M select CPU_INTEL_MODEL_F2X select MMX select SSE + +if CPU_INTEL_SOCKET_MPGA479M + +config DCACHE_RAM_BASE + hex + default 0xc8000 + +config DCACHE_RAM_SIZE + hex + default 0x08000 + +endif -- cgit v1.2.3