summaryrefslogtreecommitdiff
path: root/src/mainboard/newisys
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard/newisys')
-rw-r--r--src/mainboard/newisys/khepri/Config.lb4
-rw-r--r--src/mainboard/newisys/khepri/Kconfig1
-rw-r--r--src/mainboard/newisys/khepri/Makefile.inc4
-rw-r--r--src/mainboard/newisys/khepri/Options.lb8
4 files changed, 9 insertions, 8 deletions
diff --git a/src/mainboard/newisys/khepri/Config.lb b/src/mainboard/newisys/khepri/Config.lb
index f24c351130..72ded47327 100644
--- a/src/mainboard/newisys/khepri/Config.lb
+++ b/src/mainboard/newisys/khepri/Config.lb
@@ -13,8 +13,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
if CONFIG_USE_INIT
diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig
index 84285ff322..350d583baf 100644
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -9,6 +9,7 @@ config BOARD_NEWISYS_KHEPRI
select SOUTHBRIDGE_AMD_AMD8131
select SUPERIO_WINBOND_W83627HF
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/newisys/khepri/Makefile.inc b/src/mainboard/newisys/khepri/Makefile.inc
index 86d71e152b..c382cc681d 100644
--- a/src/mainboard/newisys/khepri/Makefile.inc
+++ b/src/mainboard/newisys/khepri/Makefile.inc
@@ -21,8 +21,8 @@
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
# This is part of the conversion to init-obj and away from included code.
diff --git a/src/mainboard/newisys/khepri/Options.lb b/src/mainboard/newisys/khepri/Options.lb
index 266f7ba266..ad54dc6037 100644
--- a/src/mainboard/newisys/khepri/Options.lb
+++ b/src/mainboard/newisys/khepri/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
@@ -85,14 +85,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