[coreboot-gerrit] New patch to review for coreboot: e245c32 soc/intel/fsp_baytrail: set up for including irqroute.h twice

[Martin Roth (gaumless@gmail.com)]

Martin Roth (gaumless at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6572

-gerrit

commit e245c3277486c88360b059d50736d326c672a87e
Author: Martin Roth <martin.roth at se-eng.com>
Date:   Sat Aug 9 16:26:17 2014 -0600

    soc/intel/fsp_baytrail: set up for including irqroute.h twice
    
    irq_helper.h intentionally gets included into irqroute.asl twice - once
    for pic mode and once for apic mode.  Since people are used to seeing
    guard statements on the .h files, add the guards to irqroute.h and add
    a comment to irq_helper.h explaining why they aren't there.  Add a
    time.
    
    Change-Id: I882cbbff0f73bdb170bd0f1053767893722dc60a
    Signed-off-by: Martin Roth <martin.roth at se-eng.com>
---
 src/mainboard/intel/bayleybay_fsp/irqroute.h | 5 +++++
 src/soc/intel/fsp_baytrail/acpi/irq_helper.h | 8 ++++++++
 2 files changed, 13 insertions(+)

diff --git a/src/mainboard/intel/bayleybay_fsp/irqroute.h b/src/mainboard/intel/bayleybay_fsp/irqroute.h
index 4a29b20..08552c5 100644
--- a/src/mainboard/intel/bayleybay_fsp/irqroute.h
+++ b/src/mainboard/intel/bayleybay_fsp/irqroute.h
@@ -17,6 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef IRQROUTE_H
+#define IRQROUTE_H
+
 #include <soc/intel/fsp_baytrail/baytrail/irq.h>
 #include <soc/intel/fsp_baytrail/baytrail/pci_devs.h>
 
@@ -70,3 +73,5 @@
 	PIRQ_PIC(F, 12), \
 	PIRQ_PIC(G, 14), \
 	PIRQ_PIC(H, 15)
+
+#endif /* IRQROUTE_H */
diff --git a/src/soc/intel/fsp_baytrail/acpi/irq_helper.h b/src/soc/intel/fsp_baytrail/acpi/irq_helper.h
index e3a23d8..a0bcbab 100644
--- a/src/soc/intel/fsp_baytrail/acpi/irq_helper.h
+++ b/src/soc/intel/fsp_baytrail/acpi/irq_helper.h
@@ -18,17 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+
+/*
+ * This file intentionally gets included multiple times, to set pic and apic
+ * modes, so should not have guard statements added.
+ */
+
 /*
  * This file will use arch/x86/acpi/irqroute.asl and mainboard/irqroute.h
  * to generate the ACPI IRQ routing for the mainboard being compiled.
  * This method uses #defines in irqroute.h along with the macros contained
  * in this file to generate an IRQ routing for each PCI device in the system.
  */
+
 #undef PCI_DEV_PIRQ_ROUTES
 #undef ACPI_DEV_IRQ
 #undef PCI_DEV_PIRQ_ROUTE
 #undef PIRQ_PIC_ROUTES
 #undef PIRQ_PIC
+#undef IRQROUTE_H
 
 #if defined(PIC_MODE)