[coreboot] r3949 - in trunk/coreboot-v2/src: mainboard/amd/dbm690t mainboard/amd/pistachio southbridge/amd/rs690
svn at coreboot.org
svn at coreboot.org
Sun Feb 15 03:53:18 CET 2009
Author: stepan
Date: 2009-02-15 03:53:18 +0100 (Sun, 15 Feb 2009)
New Revision: 3949
Modified:
trunk/coreboot-v2/src/mainboard/amd/dbm690t/mainboard.c
trunk/coreboot-v2/src/mainboard/amd/pistachio/mainboard.c
trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_cmn.c
Log:
- Fix up amd pistachio and dbm690t.
- make uma_memory_base and uma_memory_size uint64_t as they may be 64bit BARs
on some platforms.
Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified: trunk/coreboot-v2/src/mainboard/amd/dbm690t/mainboard.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/dbm690t/mainboard.c 2009-02-14 16:23:16 UTC (rev 3948)
+++ trunk/coreboot-v2/src/mainboard/amd/dbm690t/mainboard.c 2009-02-15 02:53:18 UTC (rev 3949)
@@ -44,7 +44,7 @@
#define ADT7461_write_byte(address, val) \
do_smbus_write_byte(SMBUS_IO_BASE, ADT7461_ADDRESS, address, val)
-unsigned long uma_memory_start, uma_memory_size;
+uint64_t uma_memory_base, uma_memory_size;
/********************************************************
* dbm690t uses a BCM5789 as on-board NIC.
@@ -235,14 +235,14 @@
break;
}
- uma_memory_start = msr.lo - uma_memory_size; /* TOP_MEM1 */
- printk_info("%s: uma size 0x%08x, memory start 0x%08x\n",
- __func__, uma_memory_size, uma_memory_start);
+ uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
+ printk_info("%s: uma size 0x%08lx, memory start 0x%08lx\n",
+ __func__, uma_memory_size, uma_memory_base);
/* TODO: TOP_MEM2 */
#else
uma_memory_size = 0x8000000; /* 128M recommended UMA */
- uma_memory_start = 0x38000000; /* 1GB system memory supposed */
+ uma_memory_base = 0x38000000; /* 1GB system memory supposed */
#endif
enable_onboard_nic();
@@ -256,10 +256,10 @@
* 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);
+ printk_info("uma_memory_base=0x%lx, uma_memory_size=0x%lx \n",
+ uma_memory_base, uma_memory_size);
lb_add_memory_range(mem, LB_MEM_RESERVED,
- uma_memory_start, uma_memory_size);
+ uma_memory_base, uma_memory_size);
#endif
}
Modified: trunk/coreboot-v2/src/mainboard/amd/pistachio/mainboard.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/pistachio/mainboard.c 2009-02-14 16:23:16 UTC (rev 3948)
+++ trunk/coreboot-v2/src/mainboard/amd/pistachio/mainboard.c 2009-02-15 02:53:18 UTC (rev 3949)
@@ -42,7 +42,7 @@
#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;
+uint64_t uma_memory_base, uma_memory_size;
/********************************************************
* pistachio uses a BCM5787 as on-board NIC.
@@ -307,14 +307,14 @@
break;
}
- uma_memory_start = msr.lo - uma_memory_size; /* TOP_MEM1 */
- printk_info("%s: uma size 0x%08x, memory start 0x%08x\n",
- __func__, uma_memory_size, uma_memory_start);
+ uma_memory_base = msr.lo - uma_memory_size; /* TOP_MEM1 */
+ printk_info("%s: uma size 0x%08lx, memory start 0x%08lx\n",
+ __func__, uma_memory_size, uma_memory_base);
/* TODO: TOP_MEM2 */
#else
uma_memory_size = 0x8000000; /* 128M recommended UMA */
- uma_memory_start = 0x38000000; /* 1GB system memory supposed */
+ uma_memory_base = 0x38000000; /* 1GB system memory supposed */
#endif
enable_onboard_nic();
@@ -328,10 +328,10 @@
* 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);
+ printk_info("uma_memory_base=0x%lx, uma_memory_size=0x%lx \n",
+ uma_memory_base, uma_memory_size);
lb_add_memory_range(mem, LB_MEM_RESERVED,
- uma_memory_start, uma_memory_size);
+ uma_memory_base, uma_memory_size);
#endif
}
Modified: trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_cmn.c
===================================================================
--- trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_cmn.c 2009-02-14 16:23:16 UTC (rev 3948)
+++ trunk/coreboot-v2/src/southbridge/amd/rs690/rs690_cmn.c 2009-02-15 02:53:18 UTC (rev 3949)
@@ -307,10 +307,10 @@
*/
void rs690_set_tom(device_t nb_dev)
{
- extern unsigned long uma_memory_start;
+ extern uint64_t uma_memory_base;
/* set TOM */
- pci_write_config32(nb_dev, 0x90, uma_memory_start);
- nbmc_write_index(nb_dev, 0x1e, uma_memory_start);
+ pci_write_config32(nb_dev, 0x90, uma_memory_base);
+ nbmc_write_index(nb_dev, 0x1e, uma_memory_base);
}
More information about the coreboot
mailing list