diff options
| -rw-r--r-- | src/mainboard/intel/bayleybay_fsp/irqroute.h | 5 | ||||
| -rw-r--r-- | src/soc/intel/fsp_baytrail/acpi/irq_helper.h | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/mainboard/intel/bayleybay_fsp/irqroute.h b/src/mainboard/intel/bayleybay_fsp/irqroute.h index 4a29b20930..08552c534c 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 e3a23d8eee..a0bcbabbbc 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) |