From 34697d67c18780bf765ac9f66dcb1f14c7ef74c8 Mon Sep 17 00:00:00 2001 From: Aurelien Guillaume Date: Tue, 7 Sep 2010 07:43:10 +0000 Subject: Set up an arbitrary amount of system memory on Geode LX, so coreboot_ram can be unpacked to 1MB. The value is quickly replaced with the real value later, thus causing no harm. Move RAMBASE to the default of 1MB for the affected boards Signed-off-by: Aurelien Guillaume Acked-by: Patrick Georgi git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5779 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/amd/model_lx/msrinit.c | 13 +++++++++++++ src/mainboard/amd/db800/Kconfig | 4 ---- src/mainboard/amd/norwich/Kconfig | 4 ---- src/mainboard/artecgroup/dbe61/Kconfig | 4 ---- src/mainboard/digitallogic/msm800sev/Kconfig | 4 ---- src/mainboard/iei/pcisa-lx-800-r10/Kconfig | 4 ---- src/mainboard/lippert/roadrunner-lx/Kconfig | 4 ---- src/mainboard/lippert/spacerunner-lx/Kconfig | 4 ---- src/mainboard/pcengines/alix1c/Kconfig | 4 ---- src/mainboard/pcengines/alix2d/Kconfig | 4 ---- src/mainboard/traverse/geos/Kconfig | 4 ---- src/mainboard/winent/pl6064/Kconfig | 4 ---- 12 files changed, 13 insertions(+), 44 deletions(-) diff --git a/src/cpu/amd/model_lx/msrinit.c b/src/cpu/amd/model_lx/msrinit.c index 35c9ae4f25..6569338a2f 100644 --- a/src/cpu/amd/model_lx/msrinit.c +++ b/src/cpu/amd/model_lx/msrinit.c @@ -39,6 +39,19 @@ static const msrinit_t msr_table[] = {MSR_GLIU1_BASE1, {.hi = 0x20000000,.lo = 0x000fff80}}, // 0x00000-0x7FFFF {MSR_GLIU1_BASE2, {.hi = 0x20000000,.lo = 0x080fffe0}}, // 0x80000-0x9FFFF {MSR_GLIU1_SHADOW, {.hi = 0x2000FFFF,.lo = 0xFFFF0003}}, // 0xC0000-0xFFFFF + + /* Pre-setup access to memory above 1Mb. Here we set up about 500Mb of memory. + * It doesn't really matter in fact how much, however, because the only usage + * of this extended memory will be to host the coreboot_ram stage at RAMBASE, + * currently 1Mb. + * These registers will be set to their correct value by the Northbridge init code. + * + * WARNING: if coreboot_ram could not be loaded, these registers are probably + * incorrectly set here. You may comment the following two lines and set RAMBASE + * to 0x4000 to revert to the previous behavior for LX-boards. + */ + {MSR_GLIU0_SYSMEM, {.hi = 0x2000001F,.lo = 0x6BF00100}}, // 0x100000-0x1F6BF000 + {MSR_GLIU1_SYSMEM, {.hi = 0x2000001F,.lo = 0x6BF00100}}, // 0x100000-0x1F6BF000 }; static void msr_init(void) diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig index 006de405e1..b973c9dad8 100644 --- a/src/mainboard/amd/db800/Kconfig +++ b/src/mainboard/amd/db800/Kconfig @@ -25,8 +25,4 @@ config IRQ_SLOT_COUNT int default 4 -config RAMBASE - hex - default 0x4000 - endif # BOARD_AMD_DB800 diff --git a/src/mainboard/amd/norwich/Kconfig b/src/mainboard/amd/norwich/Kconfig index d97e522161..6c65f4de1a 100644 --- a/src/mainboard/amd/norwich/Kconfig +++ b/src/mainboard/amd/norwich/Kconfig @@ -24,8 +24,4 @@ config IRQ_SLOT_COUNT int default 6 -config RAMBASE - hex - default 0x4000 - endif # BOARD_AMD_NORWICH diff --git a/src/mainboard/artecgroup/dbe61/Kconfig b/src/mainboard/artecgroup/dbe61/Kconfig index 3997be8856..9dfb0ca72a 100644 --- a/src/mainboard/artecgroup/dbe61/Kconfig +++ b/src/mainboard/artecgroup/dbe61/Kconfig @@ -24,8 +24,4 @@ config IRQ_SLOT_COUNT int default 3 -#config RAMBASE -# hex -# default 0x4000 - endif # BOARD_ARTECGROUP_DBE61 diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig b/src/mainboard/digitallogic/msm800sev/Kconfig index 6172b26219..f98101b03a 100644 --- a/src/mainboard/digitallogic/msm800sev/Kconfig +++ b/src/mainboard/digitallogic/msm800sev/Kconfig @@ -25,8 +25,4 @@ config IRQ_SLOT_COUNT int default 9 -config RAMBASE - hex - default 0x4000 - endif # BOARD_DIGITALLOGIC_MSM800SEV diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig index 91766050f1..7bef792a0b 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig +++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig @@ -24,8 +24,4 @@ config IRQ_SLOT_COUNT int default 9 -config RAMBASE - hex - default 0x4000 - endif # BOARD_IEI_PCISA_LX_800_R10 diff --git a/src/mainboard/lippert/roadrunner-lx/Kconfig b/src/mainboard/lippert/roadrunner-lx/Kconfig index fa140acfce..ef6171fa50 100644 --- a/src/mainboard/lippert/roadrunner-lx/Kconfig +++ b/src/mainboard/lippert/roadrunner-lx/Kconfig @@ -27,10 +27,6 @@ config IRQ_SLOT_COUNT int default 7 -config RAMBASE - hex - default 0x4000 - config ONBOARD_UARTS_RS485 bool "Switch on-board serial ports to RS485" default n diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig b/src/mainboard/lippert/spacerunner-lx/Kconfig index a7e0eba22b..89a52ae1a6 100644 --- a/src/mainboard/lippert/spacerunner-lx/Kconfig +++ b/src/mainboard/lippert/spacerunner-lx/Kconfig @@ -28,10 +28,6 @@ config IRQ_SLOT_COUNT int default 7 -config RAMBASE - hex - default 0x4000 - config ONBOARD_UARTS_RS485 bool "Switch on-board serial ports to RS485" default n diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig index d6edad0479..395df75eb2 100644 --- a/src/mainboard/pcengines/alix1c/Kconfig +++ b/src/mainboard/pcengines/alix1c/Kconfig @@ -25,8 +25,4 @@ config IRQ_SLOT_COUNT int default 5 -config RAMBASE - hex - default 0x4000 - endif # BOARD_PCENGINES_ALIX1C diff --git a/src/mainboard/pcengines/alix2d/Kconfig b/src/mainboard/pcengines/alix2d/Kconfig index f0997fda5e..bd363f3407 100644 --- a/src/mainboard/pcengines/alix2d/Kconfig +++ b/src/mainboard/pcengines/alix2d/Kconfig @@ -24,8 +24,4 @@ config IRQ_SLOT_COUNT int default 7 -config RAMBASE - hex - default 0x4000 - endif # BOARD_PCENGINES_ALIX2D diff --git a/src/mainboard/traverse/geos/Kconfig b/src/mainboard/traverse/geos/Kconfig index d3c643a2c8..c1d1af41a0 100644 --- a/src/mainboard/traverse/geos/Kconfig +++ b/src/mainboard/traverse/geos/Kconfig @@ -24,8 +24,4 @@ config IRQ_SLOT_COUNT int default 6 -config RAMBASE - hex - default 0x4000 - endif # BOARD_TRAVERSE_GEOS diff --git a/src/mainboard/winent/pl6064/Kconfig b/src/mainboard/winent/pl6064/Kconfig index 142721441a..df6db01198 100644 --- a/src/mainboard/winent/pl6064/Kconfig +++ b/src/mainboard/winent/pl6064/Kconfig @@ -25,8 +25,4 @@ config IRQ_SLOT_COUNT int default 7 -config RAMBASE - hex - default 0x4000 - endif # BOARD_WINENT_PL6064 -- cgit v1.2.3