From b8e2027be817159d4606f991475b59fc36b0242d Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Thu, 15 Oct 2009 13:35:47 +0000 Subject: Add CONFIG_GENERATE_* for tables so that the user can select which tables not to build, but by default all the tables that are available are built. Make PIRQ table build for qemu. Signed-off-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4778 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/kontron/kt690/Config.lb | 6 +++--- src/mainboard/kontron/kt690/Makefile.inc | 10 +++++----- src/mainboard/kontron/kt690/Options.lb | 12 ++++++------ src/mainboard/kontron/kt690/mptable.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/mainboard/kontron/kt690') diff --git a/src/mainboard/kontron/kt690/Config.lb b/src/mainboard/kontron/kt690/Config.lb index 0f7577288e..1fb667deb9 100644 --- a/src/mainboard/kontron/kt690/Config.lb +++ b/src/mainboard/kontron/kt690/Config.lb @@ -33,13 +33,13 @@ driver mainboard.o #dir /drivers/si/3114 -if CONFIG_HAVE_MP_TABLE object mptable.o end -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_MP_TABLE object mptable.o end +if CONFIG_GENERATE_PIRQ_TABLE object get_bus_conf.o object irq_tables.o end -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o object fadt.o makerule dsdt.c diff --git a/src/mainboard/kontron/kt690/Makefile.inc b/src/mainboard/kontron/kt690/Makefile.inc index 0a2460d166..317f9ca1c5 100644 --- a/src/mainboard/kontron/kt690/Makefile.inc +++ b/src/mainboard/kontron/kt690/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # Needed by irq_tables and mptable and acpi_tables. obj-y += get_bus_conf.o -obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o -obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o +obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o +obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o # This is part of the conversion to init-obj and away from included code. diff --git a/src/mainboard/kontron/kt690/Options.lb b/src/mainboard/kontron/kt690/Options.lb index 1ca2dfb906..6e3ad131eb 100644 --- a/src/mainboard/kontron/kt690/Options.lb +++ b/src/mainboard/kontron/kt690/Options.lb @@ -20,9 +20,9 @@ ## ## -uses CONFIG_HAVE_MP_TABLE -uses CONFIG_HAVE_PIRQ_TABLE -uses CONFIG_HAVE_ACPI_TABLES +uses CONFIG_GENERATE_MP_TABLE +uses CONFIG_GENERATE_PIRQ_TABLE +uses CONFIG_GENERATE_ACPI_TABLES uses CONFIG_HAVE_ACPI_RESUME uses CONFIG_USE_FALLBACK_IMAGE uses CONFIG_HAVE_FALLBACK_BOOT @@ -121,17 +121,17 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## Build code to export a programmable irq routing table ## -default CONFIG_HAVE_PIRQ_TABLE=1 +default CONFIG_GENERATE_PIRQ_TABLE=1 default CONFIG_IRQ_SLOT_COUNT=11 ## ## Build code to export an x86 MP table ## Useful for specifying IRQ routing values ## -default CONFIG_HAVE_MP_TABLE=1 +default CONFIG_GENERATE_MP_TABLE=1 ## ACPI tables will be included -default CONFIG_HAVE_ACPI_TABLES=1 +default CONFIG_GENERATE_ACPI_TABLES=1 ## ## Build code to export a CMOS option table diff --git a/src/mainboard/kontron/kt690/mptable.c b/src/mainboard/kontron/kt690/mptable.c index f629e55962..06926bdad4 100644 --- a/src/mainboard/kontron/kt690/mptable.c +++ b/src/mainboard/kontron/kt690/mptable.c @@ -142,7 +142,7 @@ void *smp_write_config_table(void *v) /* PCI interrupts are level triggered, and are * associated with a specific bus/device/function tuple. */ -#if CONFIG_HAVE_ACPI_TABLES == 0 +#if CONFIG_GENERATE_ACPI_TABLES == 0 #define PCI_INT(bus, dev, fn, pin) \ smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, (bus), (((dev)<<2)|(fn)), apicid_sb600, (pin)) #else -- cgit v1.2.3