diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-29 23:01:35 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-29 23:01:35 +0000 |
| commit | 8e726b7363365459ab07b6f68e579b15a3ea8693 (patch) | |
| tree | 19a317cad1f08f75e1f3a7284c9e5afbf8bf23d7 /src/arch | |
| parent | 798ef2893c44ce3194c539c8c5db33d11e8edbac (diff) | |
| download | coreboot-8e726b7363365459ab07b6f68e579b15a3ea8693.tar.xz | |
Don't include option_table.h every time we include mc146818rtc.h, that was a
stupid idea. Instead include it where it is needed. And add some explicit
dependencies to it.
Also, error for missing IRQ_SLOT_COUNT for now, so we can fix up the boards.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5321 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/i386/boot/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/arch/i386/boot/coreboot_table.c | 2 | ||||
| -rw-r--r-- | src/arch/i386/include/arch/pirq_routing.h | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/arch/i386/boot/Makefile.inc b/src/arch/i386/boot/Makefile.inc index e9c539f187..4ef5d6f386 100644 --- a/src/arch/i386/boot/Makefile.inc +++ b/src/arch/i386/boot/Makefile.inc @@ -8,3 +8,5 @@ obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpigen.o obj-$(CONFIG_HAVE_ACPI_RESUME) += wakeup.o +$(obj)/arch/i386/boot/coreboot_table.o : $(OPTION_TABLE_H) + diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c index d904c91ec4..b88ca1adba 100644 --- a/src/arch/i386/boot/coreboot_table.c +++ b/src/arch/i386/boot/coreboot_table.c @@ -30,7 +30,7 @@ #include <device/device.h> #include <stdlib.h> #if (CONFIG_HAVE_OPTION_TABLE == 1) -#include <pc80/mc146818rtc.h> +#include <option_table.h> #endif static struct lb_header *lb_table_init(unsigned long addr) diff --git a/src/arch/i386/include/arch/pirq_routing.h b/src/arch/i386/include/arch/pirq_routing.h index 174884d02f..4f56de3598 100644 --- a/src/arch/i386/include/arch/pirq_routing.h +++ b/src/arch/i386/include/arch/pirq_routing.h @@ -16,11 +16,8 @@ struct irq_info { uint8_t rfu; } __attribute__((packed)); -#if defined(CONFIG_IRQ_SLOT_COUNT) -#define IRQ_SLOTS_COUNT CONFIG_IRQ_SLOT_COUNT -#else -#warning "No IRQ_SLOT_COUNT in Kconfig." -#define IRQ_SLOTS_COUNT +#if !defined(CONFIG_IRQ_SLOT_COUNT) +#error "No IRQ_SLOT_COUNT in Kconfig." #endif struct irq_routing_table { @@ -33,7 +30,7 @@ struct irq_routing_table { uint32_t miniport_data; /* Crap */ uint8_t rfu[11]; uint8_t checksum; /* Modulo 256 checksum must give zero */ - struct irq_info slots[IRQ_SLOTS_COUNT]; + struct irq_info slots[CONFIG_IRQ_SLOT_COUNT]; } __attribute__((packed)); extern const struct irq_routing_table intel_irq_routing_table; |