4 files changed, 11 insertions, 10 deletions
diff --git a/src/mainboard/intel/xe7501devkit/Config.lb b/src/mainboard/intel/xe7501devkit/Config.lb
index 98a1414e46..b6404a7146 100644
--- a/src/mainboard/intel/xe7501devkit/Config.lb
+++ b/src/mainboard/intel/xe7501devkit/Config.lb
@@ -9,9 +9,9 @@ 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_HAVE_ACPI_TABLES 	object acpi_tables.o end
+if CONFIG_GENERATE_MP_TABLE 		object mptable.o 	 end
+if CONFIG_GENERATE_PIRQ_TABLE 		object irq_tables.o	 end
+if CONFIG_GENERATE_ACPI_TABLES 	object acpi_tables.o end
 object reset.o
 
 ##
diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig
index f2b4c1ff0b..36166a3314 100644
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -7,6 +7,7 @@ config BOARD_INTEL_XE7501DEVKIT
 	select SOUTHBRIDGE_INTEL_I82801CA
 	select SUPERIO_SMSC_LPC47B272
 	select HAVE_PIRQ_TABLE
+	select HAVE_MP_TABLE
 	select UDELAY_TSC
 	select HAVE_OPTION_TABLE
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/intel/xe7501devkit/Makefile.inc b/src/mainboard/intel/xe7501devkit/Makefile.inc
index a40cb5a5ae..cd66339206 100644
--- a/src/mainboard/intel/xe7501devkit/Makefile.inc
+++ b/src/mainboard/intel/xe7501devkit/Makefile.inc
@@ -1,4 +1,4 @@
 ROMCCFLAGS := -mcpu=p4 -O2
-obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o
 include $(src)/mainboard/Makefile.romccboard.inc
 
diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb
index 19ac7fedeb..0de6572398 100644
--- a/src/mainboard/intel/xe7501devkit/Options.lb
+++ b/src/mainboard/intel/xe7501devkit/Options.lb
@@ -1,7 +1,7 @@
-uses CONFIG_HAVE_MP_TABLE
-uses CONFIG_HAVE_ACPI_TABLES
+uses CONFIG_GENERATE_MP_TABLE
+uses CONFIG_GENERATE_ACPI_TABLES
 uses CONFIG_HAVE_ACPI_RESUME
-uses CONFIG_HAVE_PIRQ_TABLE
+uses CONFIG_GENERATE_PIRQ_TABLE
 uses CONFIG_HAVE_FALLBACK_BOOT
 uses CONFIG_HAVE_OPTION_TABLE
 uses CONFIG_IRQ_SLOT_COUNT
@@ -85,17 +85,17 @@ default CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2=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=12
 
 ##
 ## 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 ACPI tables?
-default CONFIG_HAVE_ACPI_TABLES=1
+default CONFIG_GENERATE_ACPI_TABLES=1
 
 ##
 ## Build code to export a CMOS option table?