GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@se-eng.com>
Reviewed-on: http://review.coreboot.org/6572
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Martin Roth 2014-08-09 16:26:17 -06:00 committed by Patrick Georgi
parent 61f767f6a4
commit bfca984b78
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mainboard/intel/bayleybay_fsp/irqroute.h
View File

@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * 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/irq.h>
#include <soc/intel/fsp_baytrail/baytrail/pci_devs.h> #include <soc/intel/fsp_baytrail/baytrail/pci_devs.h>
@ -70,3 +73,5 @@
PIRQ_PIC(F, 12), \ PIRQ_PIC(F, 12), \
PIRQ_PIC(G, 14), \ PIRQ_PIC(G, 14), \
PIRQ_PIC(H, 15) PIRQ_PIC(H, 15)
#endif /* IRQROUTE_H */

8
src/soc/intel/fsp_baytrail/acpi/irq_helper.h
View File

@ -18,17 +18,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * 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 * This file will use arch/x86/acpi/irqroute.asl and mainboard/irqroute.h
* to generate the ACPI IRQ routing for the mainboard being compiled. * to generate the ACPI IRQ routing for the mainboard being compiled.
* This method uses #defines in irqroute.h along with the macros contained * 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. * in this file to generate an IRQ routing for each PCI device in the system.
*/ */
#undef PCI_DEV_PIRQ_ROUTES #undef PCI_DEV_PIRQ_ROUTES
#undef ACPI_DEV_IRQ #undef ACPI_DEV_IRQ
#undef PCI_DEV_PIRQ_ROUTE #undef PCI_DEV_PIRQ_ROUTE
#undef PIRQ_PIC_ROUTES #undef PIRQ_PIC_ROUTES
#undef PIRQ_PIC #undef PIRQ_PIC
#undef IRQROUTE_H
#if defined(PIC_MODE) #if defined(PIC_MODE)