[coreboot] [commit] r5364 - in trunk/src: drivers/generic/debug mainboard/msi/ms7135 mainboard/tyan/s2735 mainboard/via/epia mainboard/via/epia-m mainboard/via/epia-m700 mainboard/via/epia-n southbridge/intel...
repository service
svn at coreboot.org
Wed Apr 7 04:06:54 CEST 2010
Author: stepan
Date: Wed Apr 7 04:06:53 2010
New Revision: 5364
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5364
Log:
switch some ROMCC boards back to ROMCC.
Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Modified:
trunk/src/drivers/generic/debug/debug_dev.c
trunk/src/mainboard/msi/ms7135/mptable.c
trunk/src/mainboard/tyan/s2735/Kconfig
trunk/src/mainboard/via/epia-m/Kconfig
trunk/src/mainboard/via/epia-m700/Kconfig
trunk/src/mainboard/via/epia-n/Kconfig
trunk/src/mainboard/via/epia/Kconfig
trunk/src/southbridge/intel/esb6300/esb6300_bridge1c.c
trunk/src/southbridge/intel/esb6300/esb6300_ide.c
trunk/src/southbridge/intel/esb6300/esb6300_lpc.c
trunk/src/southbridge/intel/esb6300/esb6300_sata.c
trunk/src/southbridge/via/vt8235/vt8235_early_serial.c
trunk/src/southbridge/via/vt8235/vt8235_early_smbus.c
trunk/src/superio/smsc/lpc47m10x/superio.c
Modified: trunk/src/drivers/generic/debug/debug_dev.c
==============================================================================
--- trunk/src/drivers/generic/debug/debug_dev.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/drivers/generic/debug/debug_dev.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -59,7 +59,7 @@
}
}
-static void print_cpuid()
+static void print_cpuid(void)
{
msr_t msr;
unsigned index;
Modified: trunk/src/mainboard/msi/ms7135/mptable.c
==============================================================================
--- trunk/src/mainboard/msi/ms7135/mptable.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/mainboard/msi/ms7135/mptable.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -47,7 +47,6 @@
unsigned sbdn;
int bus_num;
- int i;
mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
memset(mc, 0, sizeof(*mc));
Modified: trunk/src/mainboard/tyan/s2735/Kconfig
==============================================================================
--- trunk/src/mainboard/tyan/s2735/Kconfig Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/mainboard/tyan/s2735/Kconfig Wed Apr 7 04:06:53 2010 (r5364)
@@ -15,6 +15,7 @@
select USE_DCACHE_RAM
select USE_WATCHDOG_ON_BOOT
select BOARD_ROMSIZE_KB_512
+ select USE_PRINTK_IN_CAR
config MAINBOARD_DIR
string
Modified: trunk/src/mainboard/via/epia-m/Kconfig
==============================================================================
--- trunk/src/mainboard/via/epia-m/Kconfig Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/mainboard/via/epia-m/Kconfig Wed Apr 7 04:06:53 2010 (r5364)
@@ -10,22 +10,13 @@
select HAVE_PIRQ_TABLE
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_256
+ select ROMCC
config MAINBOARD_DIR
string
default via/epia-m
depends on BOARD_VIA_EPIA_M
-#config DCACHE_RAM_BASE
-# hex
-# default 0xffef0000
-# depends on BOARD_VIA_EPIA_M
-
-#config DCACHE_RAM_SIZE
-# hex
-# default 0x8000
-# depends on BOARD_VIA_EPIA_M
-
config MAINBOARD_PART_NUMBER
string
default "EPIA-M"
Modified: trunk/src/mainboard/via/epia-m700/Kconfig
==============================================================================
--- trunk/src/mainboard/via/epia-m700/Kconfig Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/mainboard/via/epia-m700/Kconfig Wed Apr 7 04:06:53 2010 (r5364)
@@ -7,6 +7,7 @@
select BOARD_HAS_FADT
select HAVE_ACPI_TABLES
select BOARD_ROMSIZE_KB_512
+ select USE_PRINTK_IN_CAR
config MAINBOARD_DIR
string
Modified: trunk/src/mainboard/via/epia-n/Kconfig
==============================================================================
--- trunk/src/mainboard/via/epia-n/Kconfig Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/mainboard/via/epia-n/Kconfig Wed Apr 7 04:06:53 2010 (r5364)
@@ -18,16 +18,6 @@
default via/epia-n
depends on BOARD_VIA_EPIA_N
-#config DCACHE_RAM_BASE
-# hex
-# default 0xffef0000
-# depends on BOARD_VIA_EPIA_N
-#
-#config DCACHE_RAM_SIZE
-# hex
-# default 0x8000
-# depends on BOARD_VIA_EPIA_N
-
config MAINBOARD_PART_NUMBER
string
default "EPIA-N"
Modified: trunk/src/mainboard/via/epia/Kconfig
==============================================================================
--- trunk/src/mainboard/via/epia/Kconfig Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/mainboard/via/epia/Kconfig Wed Apr 7 04:06:53 2010 (r5364)
@@ -7,22 +7,13 @@
select SUPERIO_WINBOND_W83627HF
select HAVE_PIRQ_TABLE
select BOARD_ROMSIZE_KB_256
+ select ROMCC
config MAINBOARD_DIR
string
default via/epia
depends on BOARD_VIA_EPIA
-#config DCACHE_RAM_BASE
-# hex
-# default 0xffef0000
-# depends on BOARD_VIA_EPIA
-#
-#config DCACHE_RAM_SIZE
-# hex
-# default 0x8000
-# depends on BOARD_VIA_EPIA
-
config MAINBOARD_PART_NUMBER
string
default "EPIA"
Modified: trunk/src/southbridge/intel/esb6300/esb6300_bridge1c.c
==============================================================================
--- trunk/src/southbridge/intel/esb6300/esb6300_bridge1c.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/southbridge/intel/esb6300/esb6300_bridge1c.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -7,9 +7,6 @@
static void bridge1c_init(struct device *dev)
{
-
- uint16_t word;
-
/* configuration */
pci_write_config8(dev, 0x1b, 0x30);
// pci_write_config8(dev, 0x3e, 0x07);
@@ -31,7 +28,6 @@
/* multi transaction timer */
pci_write_config8(dev, 0x42, 0x08);
-
}
static struct device_operations pci_ops = {
Modified: trunk/src/southbridge/intel/esb6300/esb6300_ide.c
==============================================================================
--- trunk/src/southbridge/intel/esb6300/esb6300_ide.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/southbridge/intel/esb6300/esb6300_ide.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -9,7 +9,6 @@
{
/* Enable ide devices so the linux ide driver will work */
- uint16_t word;
/* Enable IDE devices */
pci_write_config16(dev, 0x40, 0x0a307);
@@ -19,6 +18,7 @@
pci_write_config16(dev, 0x54, 0x5055);
#if 0
+ uint16_t word;
word = pci_read_config16(dev, 0x40);
word |= (1 << 15);
pci_write_config16(dev, 0x40, word);
Modified: trunk/src/southbridge/intel/esb6300/esb6300_lpc.c
==============================================================================
--- trunk/src/southbridge/intel/esb6300/esb6300_lpc.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/southbridge/intel/esb6300/esb6300_lpc.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -51,13 +51,13 @@
device_t dev, struct resource *res, config_t *config)
{
uint32_t gpio_use_sel, gpio_use_sel2;
- int i;
// gpio_use_sel = 0x1B003100;
// gpio_use_sel2 = 0x03000000;
gpio_use_sel = 0x1BBC31C0;
gpio_use_sel2 = 0x03000FE1;
#if 0
+ int i;
for(i = 0; i < 64; i++) {
int val;
switch(config->gpio[i] & ESB6300_GPIO_USE_MASK) {
@@ -84,13 +84,13 @@
device_t dev, struct resource *res, config_t *config)
{
uint32_t gpio_io_sel, gpio_io_sel2;
- int i;
// gpio_io_sel = 0x0000ffff;
// gpio_io_sel2 = 0x00000000;
gpio_io_sel = 0x1900ffff;
gpio_io_sel2 = 0x00000fe1;
#if 0
+ int i;
for(i = 0; i < 64; i++) {
int val;
switch(config->gpio[i] & ESB6300_GPIO_SEL_MASK) {
@@ -118,7 +118,6 @@
{
uint32_t gpio_lvl, gpio_lvl2;
uint32_t gpio_blink;
- int i;
// gpio_lvl = 0x1b3f0000;
// gpio_blink = 0x00040000;
@@ -127,6 +126,7 @@
gpio_blink = 0x00000000;
gpio_lvl2 = 0x00000fff;
#if 0
+ int i;
for(i = 0; i < 64; i++) {
int val, blink;
switch(config->gpio[i] & ESB6300_GPIO_LVL_MASK) {
@@ -157,10 +157,10 @@
device_t dev, struct resource *res, config_t *config)
{
uint32_t gpio_inv;
- int i;
gpio_inv = 0x00003100;
#if 0
+ int i;
for(i = 0; i < 32; i++) {
int val;
switch(config->gpio[i] & ESB6300_GPIO_INV_MASK) {
Modified: trunk/src/southbridge/intel/esb6300/esb6300_sata.c
==============================================================================
--- trunk/src/southbridge/intel/esb6300/esb6300_sata.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/southbridge/intel/esb6300/esb6300_sata.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -7,9 +7,7 @@
static void sata_init(struct device *dev)
{
-
/* Enable sata devices so the linux sata driver will work */
- uint16_t word;
/* Enable SATA devices */
Modified: trunk/src/southbridge/via/vt8235/vt8235_early_serial.c
==============================================================================
--- trunk/src/southbridge/via/vt8235/vt8235_early_serial.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/southbridge/via/vt8235/vt8235_early_serial.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -38,9 +38,6 @@
static void enable_vt8235_serial(void)
{
- unsigned long x;
- uint8_t c;
- device_t dev;
// turn on pnp
vt8235_writepnpaddr(0x87);
vt8235_writepnpaddr(0x87);
Modified: trunk/src/southbridge/via/vt8235/vt8235_early_smbus.c
==============================================================================
--- trunk/src/southbridge/via/vt8235/vt8235_early_smbus.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/southbridge/via/vt8235/vt8235_early_smbus.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -85,7 +85,6 @@
unsigned long loops;
loops = SMBUS_TIMEOUT;
do {
- unsigned char val;
smbus_delay();
c = inb(SMBUS_IO_BASE + SMBHSTSTAT);
while((c & 1) == 1) {
@@ -121,7 +120,6 @@
unsigned char byte;
loops = SMBUS_TIMEOUT;
do {
- unsigned char val;
smbus_delay();
byte = inb(SMBUS_IO_BASE + SMBHSTSTAT);
Modified: trunk/src/superio/smsc/lpc47m10x/superio.c
==============================================================================
--- trunk/src/superio/smsc/lpc47m10x/superio.c Wed Apr 7 03:44:04 2010 (r5363)
+++ trunk/src/superio/smsc/lpc47m10x/superio.c Wed Apr 7 04:06:53 2010 (r5364)
@@ -44,7 +44,7 @@
static void pnp_enter_conf_state(device_t dev);
static void pnp_exit_conf_state(device_t dev);
-static void dump_pnp_device(device_t dev);
+//static void dump_pnp_device(device_t dev);
struct chip_operations superio_smsc_lpc47m10x_ops = {
CHIP_NAME("SMSC LPC47M10x Super I/O")
More information about the coreboot
mailing list