[coreboot-gerrit] New patch to review for coreboot: 8de6efd southbridge/intel/fsp_rangeley: fix to include irqroute.h twice
Martin Roth (gaumless@gmail.com)
gerrit at coreboot.org
Mon Aug 11 20:37:55 CEST 2014
Martin Roth (gaumless at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6606
-gerrit
commit 8de6efd2a28c47ea76c9235afa1469043d0ff378
Author: Martin Roth <martin.roth at se-eng.com>
Date: Mon Aug 11 12:37:24 2014 -0600
southbridge/intel/fsp_rangeley: fix to include irqroute.h twice
This matches what was done on baytrail in commit bfca984b -
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.
Change-Id: I709f9370ce7db1b3ffac2297aeaba5cc670ec20c
Signed-off-by: Martin Roth <martin.roth at se-eng.com>
---
src/mainboard/intel/mohonpeak/irqroute.h | 5 +++++
src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/src/mainboard/intel/mohonpeak/irqroute.h b/src/mainboard/intel/mohonpeak/irqroute.h
index 0e71a88..cbd320a 100644
--- a/src/mainboard/intel/mohonpeak/irqroute.h
+++ b/src/mainboard/intel/mohonpeak/irqroute.h
@@ -18,6 +18,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifndef IRQROUTE_H
+#define IRQROUTE_H
+
#include <southbridge/intel/fsp_rangeley/irq.h>
#include <southbridge/intel/fsp_rangeley/pci_devs.h>
@@ -66,3 +69,5 @@
PIRQ_PIC(F, 15), \
PIRQ_PIC(G, 14), \
PIRQ_PIC(H, 15)
+
+#endif /* IRQROUTE_H */
\ No newline at end of file
diff --git a/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h b/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h
index 4a298d3..49aca6e 100644
--- a/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h
+++ b/src/southbridge/intel/fsp_rangeley/acpi/irq_helper.h
@@ -19,6 +19,11 @@
*/
/*
+ * This file intentionally gets included multiple times, to set pic and apic
+ * modes, so should not have guard statements added.
+ */
+
+/*
* This file will use 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
@@ -29,6 +34,7 @@
#undef PCI_DEV_PIRQ_ROUTE
#undef PIRQ_PIC_ROUTES
#undef PIRQ_PIC
+#undef IRQROUTE_H
#if defined(PIC_MODE)
More information about the coreboot-gerrit
mailing list