summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Smith <joe@settoplinux.org>2010-02-12 17:58:53 +0000
committerJoseph Smith <joe@smittys.pointclark.net>2010-02-12 17:58:53 +0000
commit7ae11632ed03575d5d2b2d97cd0da5e8a4e4c3a8 (patch)
tree2f5bf23a06cef367145c8e065a62e2eccb978620
parent2593d1068153aefaa3f78b567ef5061387665f82 (diff)
downloadcoreboot-7ae11632ed03575d5d2b2d97cd0da5e8a4e4c3a8.tar.xz
This patch allows a Kconfig option to choose between 64MB (IP1000) and 128MB (IP1000T) of onboard memory.
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
-rw-r--r--src/mainboard/thomson/Kconfig12
-rw-r--r--src/mainboard/thomson/ip1000/Kconfig3
-rw-r--r--src/mainboard/thomson/ip1000/spd_table.h12
3 files changed, 24 insertions, 3 deletions
diff --git a/src/mainboard/thomson/Kconfig b/src/mainboard/thomson/Kconfig
index 6aeee5b40f..936ad3e71d 100644
--- 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 7feaf31695..6a87d0cfc8 100644
--- 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 e771d82014..6b92f1a61c 100644
--- 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 */
};