From 188e3c2ff06a82f61d7d71e610b32b1a250c0a45 Mon Sep 17 00:00:00 2001
From: Stefan Reinauer <reinauer@chromium.org>
Date: Thu, 26 Jul 2012 12:46:48 -0700
Subject: Drop mainboard chip.h

mainboard_config never worked right, at least not since we've had sconfig.
Hence, drop mainboard/<vendor>/<device>/chip.h and fix up the mainboards that
tried to use it anyways.

Change-Id: I7cd403ea188d8a9fd4c1ad15479fa88e02ab8e83
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1359
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
---
 src/mainboard/amd/rumba/chip.h      | 5 -----
 src/mainboard/amd/rumba/mainboard.c | 8 ++------
 2 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 src/mainboard/amd/rumba/chip.h

(limited to 'src/mainboard/amd/rumba')

diff --git a/src/mainboard/amd/rumba/chip.h b/src/mainboard/amd/rumba/chip.h
deleted file mode 100644
index 2094b2392c..0000000000
--- a/src/mainboard/amd/rumba/chip.h
+++ /dev/null
@@ -1,5 +0,0 @@
-extern struct chip_operations mainboard_ops;
-
-struct mainboard_config {
-	int nicirq;
-};
diff --git a/src/mainboard/amd/rumba/mainboard.c b/src/mainboard/amd/rumba/mainboard.c
index 0e7bbb66e7..42547cc8f5 100644
--- a/src/mainboard/amd/rumba/mainboard.c
+++ b/src/mainboard/amd/rumba/mainboard.c
@@ -4,18 +4,14 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
-#include "chip.h"
 
-static void init(struct device *dev) {
-	struct mainboard_config  *mainboard = (struct mainboard_config*)dev->chip_info;
+static void init(struct device *dev)
+{
 	device_t nic = NULL;
 	unsigned bus = 0;
 	unsigned devfn = PCI_DEVFN(0xd, 0);
 	int nicirq = 1;
 
-	if (mainboard->nicirq)
-		nicirq = mainboard->nicirq;
-
 	printk(BIOS_DEBUG, "AMD RUMBA ENTER %s\n", __func__);
 
 	if (nicirq) {
-- 
cgit v1.2.3