- Update abuild.sh so it will rebuild successfull builds

- Move pci_set_method out of hardwaremain.c
- Re-add debugging name field but only include the CONFIG_CHIP_NAME is
  enabled.  All instances are now wrapped in CHIP_NAME
- Many minor cleanups so most ports build.


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1737 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 6 insertions, 4 deletions

diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index 238a997916..5c29534ac3 100644
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -65,5 +65,6 @@ void amd8111_enable(device_t dev)
 }
 
 struct chip_operations southbridge_amd_amd8111_ops = {
+	CHIP_NAME("AMD 8111")
 	.enable_dev = amd8111_enable,
 };
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm.c b/src/southbridge/intel/i82801dbm/i82801dbm.c
index ee9b60ab7f..29804dfbc5 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm.c
+++ b/src/southbridge/intel/i82801dbm/i82801dbm.c
@@ -51,6 +51,6 @@ void i82801dbm_enable(device_t dev)
 }
 
 struct chip_operations southbridge_intel_i82801dbm_control = {
-	.name       = "Intel 82801dbm Southbridge",
+	CHIP_NAME("Intel 82801dbm Southbridge")
 	.enable_dev = i82801dbm_enable,
 };
diff --git a/src/southbridge/intel/i82801er/i82801er.c b/src/southbridge/intel/i82801er/i82801er.c
index c721a29983..79ad25e8b0 100644
--- a/src/southbridge/intel/i82801er/i82801er.c
+++ b/src/southbridge/intel/i82801er/i82801er.c
@@ -51,5 +51,6 @@ void i82801er_enable(device_t dev)
 }
 
 struct chip_operations southbridge_intel_i82801er_ops = {
+	CHIP_NAME("Intel 82801er Southbridge")
 	.enable_dev = i82801er_enable,
 };
diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c
index 4240f96a40..2f42fe752c 100644
--- a/src/southbridge/ricoh/rl5c476/rl5c476.c
+++ b/src/southbridge/ricoh/rl5c476/rl5c476.c
@@ -223,6 +223,6 @@ static struct pci_driver ricoh_rl5c476_driver __pci_driver = {
 };
 
 struct chip_operations southbridge_ricoh_rl5c476_control = {
+	CHIP_NAME("RICOH RL5C476")
 	.enable    = southbridge_init,
-	.name      = "RICOH RL5C476"
 };
diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c
index 082b64e0f3..d78bb2cf86 100644
--- a/src/southbridge/via/vt8231/vt8231.c
+++ b/src/southbridge/via/vt8231/vt8231.c
@@ -436,6 +436,6 @@ static void southbridge_enable(struct device *dev)
 }
 
 struct chip_operations southbridge_via_vt8231_ops = {
+	CHIP_NAME("VIA vt8231")
 	.enable_dev	= southbridge_enable,
-	.name		= "VIA vt8231"
 };
diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c
index 29d32df8fa..d2c78aff2a 100644
--- a/src/southbridge/via/vt8235/vt8235.c
+++ b/src/southbridge/via/vt8235/vt8235.c
@@ -558,6 +558,6 @@ static void southbridge_init(struct chip *chip, enum chip_pass pass)
 }
 
 struct chip_operations southbridge_via_vt8235_control = {
+	CHIP_NAME("VIA vt8235")
 	.enable    = southbridge_init,
-	.name      = "VIA vt8235"
 };