summaryrefslogtreecommitdiff
path: root/src/mainboard/dell/s1850
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-10-15 13:35:47 +0000
committerMyles Watson <mylesgw@gmail.com>2009-10-15 13:35:47 +0000
commitb8e2027be817159d4606f991475b59fc36b0242d (patch)
tree1ab06caebfc37dbff884d916c43cca6b9562ae85 /src/mainboard/dell/s1850
parent45b811b13552a94af4713b77613d377561e4ef26 (diff)
downloadcoreboot-b8e2027be817159d4606f991475b59fc36b0242d.tar.xz
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 <mylesgw@gmail.com> Acked-by: Peter Stuge <peter@stuge.se> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4778 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/dell/s1850')
-rw-r--r--src/mainboard/dell/s1850/Config.lb4
-rw-r--r--src/mainboard/dell/s1850/Kconfig3
-rw-r--r--src/mainboard/dell/s1850/Makefile.inc4
-rw-r--r--src/mainboard/dell/s1850/Options.lb8
4 files changed, 10 insertions, 9 deletions
diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb
index 4eb4a026be..0f28b50b10 100644
--- a/src/mainboard/dell/s1850/Config.lb
+++ b/src/mainboard/dell/s1850/Config.lb
@@ -18,8 +18,8 @@ arch i386 end
##
driver mainboard.o
-if CONFIG_HAVE_MP_TABLE object mptable.o end
-if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end
+if CONFIG_GENERATE_MP_TABLE object mptable.o end
+if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end
object reset.o
##
diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig
index 49c4ae86af..4466e44763 100644
--- a/src/mainboard/dell/s1850/Kconfig
+++ b/src/mainboard/dell/s1850/Kconfig
@@ -6,7 +6,8 @@ config BOARD_DELL_S1850
select SOUTHBRIDGE_INTEL_I82801ER
select SOUTHBRIDGE_INTEL_PXHD
select SUPERIO_NSC_PC8374
- select PIRQ_TABLE
+ select HAVE_PIRQ_TABLE
+ select HAVE_MP_TABLE
config MAINBOARD_DIR
string
diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc
index a3473c7e7e..ade0e18d4d 100644
--- a/src/mainboard/dell/s1850/Makefile.inc
+++ b/src/mainboard/dell/s1850/Makefile.inc
@@ -41,8 +41,8 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
driver-y += mainboard.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
ifdef POST_EVALUATION
diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb
index 61ce744f6c..fb65f8d8e2 100644
--- a/src/mainboard/dell/s1850/Options.lb
+++ b/src/mainboard/dell/s1850/Options.lb
@@ -1,5 +1,5 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
uses CONFIG_USE_FALLBACK_IMAGE
uses CONFIG_HAVE_FALLBACK_BOOT
uses CONFIG_HAVE_HARD_RESET
@@ -80,14 +80,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=9
##
## 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