Patchwork Use mainboard Kconfig option for AMD rumba

login
register
about
Submitter Myles Watson
Date 2010-08-30 21:11:41
Message ID <AANLkTi=uh6Mhkpmbgmszx21DKfMkrRX6Gr2yF+TF-s93@mail.gmail.com>
Download mbox | patch
Permalink /patch/1821/
State New
Headers show

Comments

Myles Watson - 2010-08-30 21:11:41
Thanks to Jens for his patch that makes this work!

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles

Patch

Index: svn/src/mainboard/amd/rumba/Kconfig
===================================================================
--- svn.orig/src/mainboard/amd/rumba/Kconfig
+++ svn/src/mainboard/amd/rumba/Kconfig
@@ -41,4 +41,8 @@  config IRQ_SLOT_COUNT
 	int
 	default 2
 
+config RUMBA_NIC_IRQ
+	int "NIC IRQ setting"
+	default 1
+
 endif # BOARD_AMD_RUMBA
Index: svn/src/mainboard/amd/rumba/chip.h
===================================================================
--- svn.orig/src/mainboard/amd/rumba/chip.h
+++ svn/src/mainboard/amd/rumba/chip.h
@@ -1,5 +1,3 @@ 
 extern struct chip_operations mainboard_ops;
 
-struct mainboard_config {
-	int nicirq;
-};
+struct mainboard_config {};
Index: svn/src/mainboard/amd/rumba/mainboard.c
===================================================================
--- svn.orig/src/mainboard/amd/rumba/mainboard.c
+++ svn/src/mainboard/amd/rumba/mainboard.c
@@ -7,14 +7,10 @@ 
 #include "chip.h"
 
 static void init(struct device *dev) {
-	struct mainboard_config  *mainboard = (struct mainboard_config*)dev->chip_info;
 	device_t nic = NULL;
 	unsigned bus = 0;
 	unsigned devfn = PCI_DEVFN(0xd, 0);
-	int nicirq = 1;
-
-	if (mainboard->nicirq)
-		nicirq = mainboard->nicirq;
+	int nicirq = CONFIG_RUMBA_NIC_IRQ;
 
 	printk(BIOS_DEBUG, "AMD RUMBA ENTER %s\n", __func__);