intel CAR: Fix DCACHE_RAM_BASE for old sockets

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 <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7887
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Kyösti Mälkki 2014-12-22 16:33:24 +02:00
parent 2b9814629b
commit 773485b892
10 changed files with 41 additions and 42 deletions

View File

@ -30,6 +30,10 @@ config SLOT_SPECIFIC_OPTIONS # dummy
select CPU_INTEL_MODEL_6BX select CPU_INTEL_MODEL_6BX
select CPU_INTEL_MODEL_6XX select CPU_INTEL_MODEL_6XX
config DCACHE_RAM_BASE
hex
default 0xcf000
config DCACHE_RAM_SIZE config DCACHE_RAM_SIZE
hex hex
default 0x01000 default 0x01000

View File

@ -24,7 +24,14 @@ config CPU_INTEL_SOCKET_FC_PGA370
select MMX select MMX
select SSE select SSE
if CPU_INTEL_SOCKET_FC_PGA370
config DCACHE_RAM_BASE
hex
default 0xc8000
config DCACHE_RAM_SIZE config DCACHE_RAM_SIZE
hex hex
default 0x8000 default 0x08000
depends on CPU_INTEL_SOCKET_FC_PGA370
endif

View File

@ -30,6 +30,10 @@ config SSE2
bool bool
default n default n
config DCACHE_RAM_BASE
hex
default 0xcf000
config DCACHE_RAM_SIZE config DCACHE_RAM_SIZE
hex hex
default 0x01000 default 0x01000

View File

@ -3,3 +3,15 @@ config CPU_INTEL_SOCKET_MFCBGA479
select CPU_INTEL_MODEL_6BX select CPU_INTEL_MODEL_6BX
select MMX select MMX
select SSE select SSE
if CPU_INTEL_SOCKET_MFCBGA479
config DCACHE_RAM_BASE
hex
default 0xc8000
config DCACHE_RAM_SIZE
hex
default 0x08000
endif

View File

@ -6,3 +6,15 @@ config CPU_INTEL_SOCKET_MPGA479M
select CPU_INTEL_MODEL_F2X select CPU_INTEL_MODEL_F2X
select MMX select MMX
select SSE select SSE
if CPU_INTEL_SOCKET_MPGA479M
config DCACHE_RAM_BASE
hex
default 0xc8000
config DCACHE_RAM_SIZE
hex
default 0x08000
endif

View File

@ -18,14 +18,6 @@ config MAINBOARD_PART_NUMBER
string string
default "smartModule855" default "smartModule855"
config DCACHE_RAM_BASE
hex
default 0xffdf8000
config DCACHE_RAM_SIZE
hex
default 0x8000
config IRQ_SLOT_COUNT config IRQ_SLOT_COUNT
int int
default 5 default 5

View File

@ -23,14 +23,6 @@ config IRQ_SLOT_COUNT
int int
default 1 default 1
config DCACHE_RAM_BASE
hex
default 0xffdf8000
config DCACHE_RAM_SIZE
hex
default 0x8000
config MAX_CPUS config MAX_CPUS
int int
default 4 default 4

View File

@ -18,14 +18,6 @@ config MAINBOARD_PART_NUMBER
string string
default "EM-8510" default "EM-8510"
config DCACHE_RAM_BASE
hex
default 0xffdf8000
config DCACHE_RAM_SIZE
hex
default 0x8000
config IRQ_SLOT_COUNT config IRQ_SLOT_COUNT
int int
default 10 default 10

View File

@ -18,14 +18,6 @@ config MAINBOARD_PART_NUMBER
string string
default "RM4100" default "RM4100"
config DCACHE_RAM_BASE
hex
default 0xffdf8000
config DCACHE_RAM_SIZE
hex
default 0x8000
config IRQ_SLOT_COUNT config IRQ_SLOT_COUNT
int int
default 7 default 7

View File

@ -19,14 +19,6 @@ config MAINBOARD_PART_NUMBER
string string
default "IP1000" default "IP1000"
config DCACHE_RAM_BASE
hex
default 0xffdf8000
config DCACHE_RAM_SIZE
hex
default 0x8000
config IRQ_SLOT_COUNT config IRQ_SLOT_COUNT
int int
default 7 default 7