[commit] r5324 - in trunk/src: arch/i386/boot arch/i386/include/arch mainboard/msi/ms9652_fam10

[repository service]

Author: stepan
Date: Tue Mar 30 10:20:37 2010
New Revision: 5324
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5324

Log:
fix ms9652_fam10

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/arch/i386/boot/pirq_routing.c
   trunk/src/arch/i386/include/arch/pirq_routing.h
   trunk/src/mainboard/msi/ms9652_fam10/Kconfig

Modified: trunk/src/arch/i386/boot/pirq_routing.c
==============================================================================
--- trunk/src/arch/i386/boot/pirq_routing.c	Tue Mar 30 10:01:43 2010	(r5323)
+++ trunk/src/arch/i386/boot/pirq_routing.c	Tue Mar 30 10:20:37 2010	(r5324)
@@ -3,10 +3,6 @@
 #include <string.h>
 #include <device/pci.h>

-#ifndef CONFIG_IRQ_SLOT_COUNT
-#warning "CONFIG_IRQ_SLOT_COUNT is not defined. PIRQ won't work correctly."
-#endif
-
 #if CONFIG_DEBUG
 static void check_pirq_routing_table(struct irq_routing_table *rt)
 {

Modified: trunk/src/arch/i386/include/arch/pirq_routing.h
==============================================================================
--- trunk/src/arch/i386/include/arch/pirq_routing.h	Tue Mar 30 10:01:43 2010	(r5323)
+++ trunk/src/arch/i386/include/arch/pirq_routing.h	Tue Mar 30 10:20:37 2010	(r5324)
@@ -17,8 +17,8 @@
    u8 rfu;
 } __attribute__((packed));

-#if !defined(CONFIG_IRQ_SLOT_COUNT)
-#error "No IRQ_SLOT_COUNT in Kconfig."
+#ifndef CONFIG_IRQ_SLOT_COUNT
+#warning "IRQ_SLOT_COUNT is not defined in Kconfig. PIRQ won't work correctly."
 #endif

struct irq_routing_table {

Modified: trunk/src/mainboard/msi/ms9652_fam10/Kconfig
==============================================================================
--- trunk/src/mainboard/msi/ms9652_fam10/Kconfig	Tue Mar 30 10:01:43 2010	(r5323)
+++ trunk/src/mainboard/msi/ms9652_fam10/Kconfig	Tue Mar 30 10:20:37 2010	(r5324)
@@ -42,9 +42,11 @@
    default y
    depends on BOARD_MSI_MS9652_FAM10

-config CONFIG_IRQ_SLOT_COUNT
-	hex
-	default 0x0b
+# Define to 0 because the IRQ slot count is
+# determined dynamically for this board.
+config IRQ_SLOT_COUNT
+	int
+	default 0
    depends on BOARD_MSI_MS9652_FAM10

config HAVE_OPTION_TABLE