r3813 - trunk/coreboot-v2/src/mainboard/amd/pistachio

Author: stepan
Date: 2008-12-14 01:01:04 +0100 (Sun, 14 Dec 2008)
New Revision: 3813

Modified:
   trunk/coreboot-v2/src/mainboard/amd/pistachio/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/pistachio/mainboard.c
Log:
oops. there went a new mainboard into the tree and i missed it. Add mainboard
specific changes based on the DBM690T code.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/pistachio/Options.lb	2008-12-13 20:51:34 UTC (rev 3812)
+++ trunk/coreboot-v2/src/mainboard/amd/pistachio/Options.lb	2008-12-14 00:01:04 UTC (rev 3813)
@@ -91,6 +91,7 @@

uses CONFIG_VIDEO_MB
 uses CONFIG_GFXUMA
+uses HAVE_MAINBOARD_RESOURCES

###
 ### Build options
@@ -299,6 +300,7 @@

default CONFIG_VIDEO_MB=1
 default CONFIG_GFXUMA=1
+default HAVE_MAINBOARD_RESOURCES=1

### End Options.lb
 end

Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/mainboard.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/pistachio/mainboard.c	2008-12-13 20:51:34 UTC (rev 3812)
+++ trunk/coreboot-v2/src/mainboard/amd/pistachio/mainboard.c	2008-12-14 00:01:04 UTC (rev 3813)
@@ -42,6 +42,8 @@
 #define ADT7475_write_byte(address, val) \
    do_smbus_write_byte(SMBUS_IO_BASE, ADT7475_ADDRESS, address, val)

+unsigned long uma_memory_start, uma_memory_size;
+
 /********************************************************
 * pistachio uses a BCM5787 as on-board NIC.
 * It has a pin named LOW_POWER to enable it into LOW POWER state.
@@ -322,12 +324,23 @@
    set_thermal_config();
 }

+int add_mainboard_resources(struct lb_memory *mem)
+{
+	/* UMA is removed from system memory in the northbridge code, but
+	 * in some circumstances we want the memory mentioned as reserved.
+ 	 */
+#if (CONFIG_GFXUMA == 1) 
+	printk_info("uma_memory_start=0x%x, uma_memory_size=0x%x \n", 
+	uma_memory_start, uma_memory_size);
+	lb_add_memory_range(mem, LB_MEM_RESERVED, 
+		uma_memory_start, uma_memory_size);
+#endif
+}
+
 /*
 * CONFIG_CHIP_NAME defined in Option.lb.
 */
 struct chip_operations mainboard_amd_pistachio_ops = {
-#if CONFIG_CHIP_NAME == 1
-	CHIP_NAME("AMD pistachio   Mainboard")
-#endif
-	    .enable_dev = pistachio_enable,
+	CHIP_NAME("AMD Pistachio Mainboard")
+	.enable_dev = pistachio_enable,
 };