sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include option_table.h every time we include mc146818rtc.h, that was a

Browse Source 
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
This commit is contained in:
Stefan Reinauer
2010-03-29 23:01:35 +00:00
committed by Stefan Reinauer
parent 798ef2893c
commit 8e726b7363
7 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/i386/boot/Makefile.inc
View File

@@ -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)

2
src/arch/i386/boot/coreboot_table.c
View File

@@ -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)

9
src/arch/i386/include/arch/pirq_routing.h
View File

@@ -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;