[coreboot] [commit] r5122 - in trunk/src/mainboard/thomson: . ip1000

[repository service]

Author: linux_junkie
Date: Fri Feb 12 18:58:53 2010
New Revision: 5122
URL: http://tracker.coreboot.org/trac/coreboot/changeset/5122

Log:
This patch allows a Kconfig option to choose between 64MB (IP1000) and 128MB (IP1000T) of onboard memory.
Signed-off-by: Joseph Smith <joe at settoplinux.org>
Acked-by: Myles Watson <mylesgw at gmail.com>

Modified:
   trunk/src/mainboard/thomson/Kconfig
   trunk/src/mainboard/thomson/ip1000/Kconfig
   trunk/src/mainboard/thomson/ip1000/spd_table.h

Modified: trunk/src/mainboard/thomson/Kconfig
==============================================================================
--- trunk/src/mainboard/thomson/Kconfig	Fri Feb 12 12:59:37 2010	(r5121)
+++ trunk/src/mainboard/thomson/Kconfig	Fri Feb 12 18:58:53 2010	(r5122)
@@ -6,3 +6,15 @@
 
 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
+

Modified: trunk/src/mainboard/thomson/ip1000/Kconfig
==============================================================================
--- trunk/src/mainboard/thomson/ip1000/Kconfig	Fri Feb 12 12:59:37 2010	(r5121)
+++ trunk/src/mainboard/thomson/ip1000/Kconfig	Fri Feb 12 18:58:53 2010	(r5122)
@@ -28,5 +28,4 @@
 config IRQ_SLOT_COUNT
 	int
 	default 7
-	depends on BOARD_THOMSON_IP1000
-
+	depends on BOARD_THOMSON_IP1000
\ No newline at end of file

Modified: trunk/src/mainboard/thomson/ip1000/spd_table.h
==============================================================================
--- trunk/src/mainboard/thomson/ip1000/spd_table.h	Fri Feb 12 12:59:37 2010	(r5121)
+++ trunk/src/mainboard/thomson/ip1000/spd_table.h	Fri Feb 12 18:58:53 2010	(r5122)
@@ -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 @@
 	{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 */
 };