This patch allows a Kconfig option to choose between 64MB (IP1000) and 128MB (IP1000T...

Signed-off-by: Joseph Smith <joe@settoplinux.org>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5122 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/mainboard/thomson/Kconfig b/src/mainboard/thomson/Kconfig
index 6aeee5b40fe0d62f9b21af5e00d819b9e7a781eb..936ad3e71d3f307e1a547609cd3a90fb30872804 100644 (file)
--- a/src/mainboard/thomson/Kconfig
+++ b/src/mainboard/thomson/Kconfig
@@ -6,3 +6,15 @@ source "src/mainboard/thomson/ip1000/Kconfig"
 
 endchoice
 
+choice
+       prompt "IP1000 Onboard Memory"
+       default ONBOARD_MEMORY_64MB
+       depends on BOARD_THOMSON_IP1000
+
+config ONBOARD_MEMORY_64MB
+       bool "IP1000-64MB"
+config ONBOARD_MEMORY_128MB
+       bool "IP1000T-128MB"
+
+endchoice
+

diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index 7feaf3169577f1476035b943d282d6c7df017632..6a87d0cfc85b8d4d75c997e8152a5d2b50262e3a 100644 (file)
--- a/src/mainboard/thomson/ip1000/Kconfig
+++ b/src/mainboard/thomson/ip1000/Kconfig
@@ -28,5 +28,4 @@ config HAVE_OPTION_TABLE
 config IRQ_SLOT_COUNT
        int
        default 7
-       depends on BOARD_THOMSON_IP1000
-
+       depends on BOARD_THOMSON_IP1000
\ No newline at end of file

diff --git a/src/mainboard/thomson/ip1000/spd_table.h b/src/mainboard/thomson/ip1000/spd_table.h
index e771d82014e12e28d5ef00e905811f217a5fc667..6b92f1a61cc8d7bc35db599efc79b5a09978ccf7 100644 (file)
--- a/src/mainboard/thomson/ip1000/spd_table.h
+++ b/src/mainboard/thomson/ip1000/spd_table.h
@@ -20,6 +20,16 @@
 
 #include <spd.h>
 
+#if CONFIG_ONBOARD_MEMORY_64MB
+
+#define DENSITY 0x10
+
+#elif CONFIG_ONBOARD_MEMORY_128MB
+
+#define DENSITY 0x20
+
+#endif
+
 struct spd_entry {
        unsigned int address;
        unsigned int data;
@@ -36,5 +46,5 @@ const struct spd_entry spd_table [] = {
        {SPD_MODULE_DATA_WIDTH_LSB,           0x40}, /* Module data width (LSB) */
        {SPD_MIN_CYCLE_TIME_AT_CAS_MAX,       0x75}, /* SDRAM cycle time (highest CAS latency), RAS access time (tRAC) */
        {SPD_ACCESS_TIME_FROM_CLOCK,          0x54}, /* SDRAM access time from clock (highest CAS latency), CAS access time (Tac, tCAC) */
-       {SPD_DENSITY_OF_EACH_ROW_ON_MODULE,   0x10}, /* Density of each row on module */
+       {SPD_DENSITY_OF_EACH_ROW_ON_MODULE,   DENSITY}, /* Density of each row on module */
 };