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/broadcom/blast/Config.lb | 4 ++-- src/mainboard/broadcom/blast/Kconfig | 1 + src/mainboard/broadcom/blast/Makefile.inc | 4 ++-- src/mainboard/broadcom/blast/Options.lb | 10 +++++----- 4 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src/mainboard/broadcom') diff --git a/src/mainboard/broadcom/blast/Config.lb b/src/mainboard/broadcom/blast/Config.lb index e82bc9cf30..38375626e8 100644 --- a/src/mainboard/broadcom/blast/Config.lb +++ b/src/mainboard/broadcom/blast/Config.lb @@ -12,8 +12,8 @@ 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 diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig index 2cd56f1580..fb94ddc3ee 100644 --- a/src/mainboard/broadcom/blast/Kconfig +++ b/src/mainboard/broadcom/blast/Kconfig @@ -9,6 +9,7 @@ config BOARD_BROADCOM_BLAST select SOUTHBRIDGE_BROADCOM_BCM5785 select SUPERIO_NSC_PC87417 select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM select HAVE_HARD_RESET diff --git a/src/mainboard/broadcom/blast/Makefile.inc b/src/mainboard/broadcom/blast/Makefile.inc index 09a594ee00..81e9def4eb 100644 --- a/src/mainboard/broadcom/blast/Makefile.inc +++ b/src/mainboard/broadcom/blast/Makefile.inc @@ -2,8 +2,8 @@ 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_GENERATE_MP_TABLE) += mptable.o +obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o driver-y += ../../../drivers/i2c/i2cmux2/i2cmux2.o diff --git a/src/mainboard/broadcom/blast/Options.lb b/src/mainboard/broadcom/blast/Options.lb index 76b369ecea..208a6c7433 100644 --- a/src/mainboard/broadcom/blast/Options.lb +++ b/src/mainboard/broadcom/blast/Options.lb @@ -1,6 +1,6 @@ -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 @@ -93,14 +93,14 @@ 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 ## ## Build code to export a CMOS option table -- cgit v1.2.3