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 <aurelien@iwi.me>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5779 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/cpu/amd/model_lx/msrinit.c b/src/cpu/amd/model_lx/msrinit.c
index 35c9ae4f250938867ecece2e31586925ceaa0ee4..6569338a2f63ee7ff7885fdc5d975323e42c35ad 100644 (file)
--- 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 006de405e12b19b275f610990a44bfe5499fe2ef..b973c9dad82ec2ac42b056340368099e713b68a9 100644 (file)
--- 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 d97e52216128649e2842bb58e8bccb391dd2679c..6c65f4de1a422e79ed81e7d98711c109aed4af3d 100644 (file)
--- 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 3997be8856866409eb1e9218feeb55d8c7588057..9dfb0ca72a8da8d51d9375498a0f61a015da41b6 100644 (file)
--- 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 6172b2621958de618e54e305918c1c6967108f75..f98101b03a830f2a84acb6439d190aae8597c932 100644 (file)
--- 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 91766050f14b3d6867769815c4957eabef5a6265..7bef792a0b29dbeb6517d87449fa820104c564d3 100644 (file)
--- 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 fa140acfce30c9c763dc1dbabb83dae31815b05d..ef6171fa50a8c5703d7ac4b900686eb77ca8b9d1 100644 (file)
--- 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 a7e0eba22bb49092e801df935e2fe71e2ff86e70..89a52ae1a6c4cbfdfeb084c0b6a7398a00f73b6e 100644 (file)
--- 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 d6edad0479b82e5cee7b9957fbef200cfce341b3..395df75eb21f66ccc94478a97232bda61bc1d061 100644 (file)
--- 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 f0997fda5e2dcca78a742e7c6898cc448b803860..bd363f3407cb9185b9a264309f8b665f91545634 100644 (file)
--- 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 d3c643a2c8415920c0dc91f976c3dc171ec1802d..c1d1af41a05d3db96c6ab1c8a707d77539d790ef 100644 (file)
--- 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 142721441a7ecb79ecdc1449aef2ea138826d4b6..df6db01198f0a3396aa88e792e981c809b9daf03 100644 (file)
--- 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