Major CONFIG_IRQ_TABLE_COUNT fixing and cleanups. Some of these boards

and PIRQ tables were actually wrong, I cannot imagine they ever
worked properly.

 - Use CONFIG_IRQ_TABLE_COUNT in all irq_tables.c files instead of
   hard-coded numbers.

 - Make all CONFIG_IRQ_TABLE_COUNT values in irq_tables.c match Options.lb.

 - Make all CONFIG_IRQ_TABLE_COUNT values match the actual number of entries
   in the irq_tables.c file.

 - Set all CONFIG_IRQ_SLOT_COUNT values in src/.../Options.lb for those
   boards where they were set to 0 (in order to be overridden in
   the respective targets/.../Config.lb).

   This is mainly done to aid Patrick's scripts for kconfig conversion.

 - Fix a number of comments in irq_tables.c files.

 - Drop CONFIG_IRQ_SLOT_COUNT usage from boards that don't have irq_tables.c:
    - tyan/s1846
    - asus/a8v-e_se
    - asus/m2v-mx_se

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Myles Watson <mylesgw@gmail.com>



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

10 files changed, 10 insertions, 10 deletions

diff --git a/src/mainboard/supermicro/x6dai_g/Options.lb b/src/mainboard/supermicro/x6dai_g/Options.lb
index c996da5487..e3c9912495 100644
--- a/src/mainboard/supermicro/x6dai_g/Options.lb
+++ b/src/mainboard/supermicro/x6dai_g/Options.lb
@@ -81,7 +81,7 @@ default CONFIG_HAVE_HARD_RESET=1
 ## Build code to export a programmable irq routing table
 ##
 default CONFIG_HAVE_PIRQ_TABLE=1
-default CONFIG_IRQ_SLOT_COUNT=16
+default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
diff --git a/src/mainboard/supermicro/x6dai_g/irq_tables.c b/src/mainboard/supermicro/x6dai_g/irq_tables.c
index 4fdb5d4fd3..656b4d8ca2 100644
--- a/src/mainboard/supermicro/x6dai_g/irq_tables.c
+++ b/src/mainboard/supermicro/x6dai_g/irq_tables.c
@@ -5,7 +5,7 @@
 const struct irq_routing_table intel_irq_routing_table = {
 	0x52495024, /* u32 signature */
 	0x0100,     /* u16 version   */
-	272,        /* u16 Table size 32+(16*devices)  */
+	32 + 16 * CONFIG_IRQ_SLOT_COUNT,        /* u16 Table size 32+(16*devices)  */
 	0x00,       /* u8 Bus 0 */
 	0xf8,       /* u8 Device 1, Function 0 */
 	0x0000,     /* u16 reserve IRQ for PCI */
diff --git a/src/mainboard/supermicro/x6dhe_g/Options.lb b/src/mainboard/supermicro/x6dhe_g/Options.lb
index 1b52a2584c..fcc68a2968 100644
--- a/src/mainboard/supermicro/x6dhe_g/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g/Options.lb
@@ -81,7 +81,7 @@ default CONFIG_HAVE_HARD_RESET=1
 ## Build code to export a programmable irq routing table
 ##
 default CONFIG_HAVE_PIRQ_TABLE=1
-default CONFIG_IRQ_SLOT_COUNT=16
+default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
diff --git a/src/mainboard/supermicro/x6dhe_g/irq_tables.c b/src/mainboard/supermicro/x6dhe_g/irq_tables.c
index 9eb6279c5b..e0d5f32b5d 100644
--- a/src/mainboard/supermicro/x6dhe_g/irq_tables.c
+++ b/src/mainboard/supermicro/x6dhe_g/irq_tables.c
@@ -5,7 +5,7 @@
 const struct irq_routing_table intel_irq_routing_table = {
 	0x52495024, /* u32 signature */
 	0x0100,     /* u16 version   */
-	272,        /* u16 Table size 32+(15*devices)  */
+	32 + 16 * CONFIG_IRQ_SLOT_COUNT,        /* u16 Table size 32+(16*devices)  */
 	0x00,       /* u8 Bus 0 */
 	0xf8,       /* u8 Device 1, Function 0 */
 	0x0000,     /* u16 reserve IRQ for PCI */
diff --git a/src/mainboard/supermicro/x6dhe_g2/Options.lb b/src/mainboard/supermicro/x6dhe_g2/Options.lb
index 1b52a2584c..fcc68a2968 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Options.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Options.lb
@@ -81,7 +81,7 @@ default CONFIG_HAVE_HARD_RESET=1
 ## Build code to export a programmable irq routing table
 ##
 default CONFIG_HAVE_PIRQ_TABLE=1
-default CONFIG_IRQ_SLOT_COUNT=16
+default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
diff --git a/src/mainboard/supermicro/x6dhe_g2/irq_tables.c b/src/mainboard/supermicro/x6dhe_g2/irq_tables.c
index 9eb6279c5b..e0d5f32b5d 100644
--- a/src/mainboard/supermicro/x6dhe_g2/irq_tables.c
+++ b/src/mainboard/supermicro/x6dhe_g2/irq_tables.c
@@ -5,7 +5,7 @@
 const struct irq_routing_table intel_irq_routing_table = {
 	0x52495024, /* u32 signature */
 	0x0100,     /* u16 version   */
-	272,        /* u16 Table size 32+(15*devices)  */
+	32 + 16 * CONFIG_IRQ_SLOT_COUNT,        /* u16 Table size 32+(16*devices)  */
 	0x00,       /* u8 Bus 0 */
 	0xf8,       /* u8 Device 1, Function 0 */
 	0x0000,     /* u16 reserve IRQ for PCI */
diff --git a/src/mainboard/supermicro/x6dhr_ig/Options.lb b/src/mainboard/supermicro/x6dhr_ig/Options.lb
index 647f863675..2698b3b418 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig/Options.lb
@@ -81,7 +81,7 @@ default CONFIG_HAVE_HARD_RESET=1
 ## Build code to export a programmable irq routing table
 ##
 default CONFIG_HAVE_PIRQ_TABLE=1
-default CONFIG_IRQ_SLOT_COUNT=16
+default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
diff --git a/src/mainboard/supermicro/x6dhr_ig/irq_tables.c b/src/mainboard/supermicro/x6dhr_ig/irq_tables.c
index 2dec5b1c58..600f6c1e0b 100644
--- a/src/mainboard/supermicro/x6dhr_ig/irq_tables.c
+++ b/src/mainboard/supermicro/x6dhr_ig/irq_tables.c
@@ -5,7 +5,7 @@
 const struct irq_routing_table intel_irq_routing_table = {
 	0x52495024, /* u32 signature */
 	0x0100,     /* u16 version   */
-	272,        /* u16 Table size 32+(15*devices)  */
+	32 + 16 * CONFIG_IRQ_SLOT_COUNT,        /* u16 Table size 32+(16*devices)  */
 	0x00,       /* u8 Bus 0 */
 	0xf8,       /* u8 Device 1, Function 0 */
 	0x0000,     /* u16 reserve IRQ for PCI */
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Options.lb b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
index 647f863675..2698b3b418 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Options.lb
+++ b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
@@ -81,7 +81,7 @@ default CONFIG_HAVE_HARD_RESET=1
 ## Build code to export a programmable irq routing table
 ##
 default CONFIG_HAVE_PIRQ_TABLE=1
-default CONFIG_IRQ_SLOT_COUNT=16
+default CONFIG_IRQ_SLOT_COUNT=15
 
 ##
 ## Build code to export an x86 MP table
diff --git a/src/mainboard/supermicro/x6dhr_ig2/irq_tables.c b/src/mainboard/supermicro/x6dhr_ig2/irq_tables.c
index 2dec5b1c58..600f6c1e0b 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/irq_tables.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/irq_tables.c
@@ -5,7 +5,7 @@
 const struct irq_routing_table intel_irq_routing_table = {
 	0x52495024, /* u32 signature */
 	0x0100,     /* u16 version   */
-	272,        /* u16 Table size 32+(15*devices)  */
+	32 + 16 * CONFIG_IRQ_SLOT_COUNT,        /* u16 Table size 32+(16*devices)  */
 	0x00,       /* u8 Bus 0 */
 	0xf8,       /* u8 Device 1, Function 0 */
 	0x0000,     /* u16 reserve IRQ for PCI */