3 files changed, 14 insertions, 14 deletions
diff --git a/src/northbridge/amd/amdfam10/Config.lb b/src/northbridge/amd/amdfam10/Config.lb
index f217fcdd3c..27c3625fb0 100644
--- a/src/northbridge/amd/amdfam10/Config.lb
+++ b/src/northbridge/amd/amdfam10/Config.lb
@@ -18,18 +18,18 @@
 #
 
 uses CONFIG_AGP_APERTURE_SIZE
-uses CONFIG_HAVE_ACPI_TABLES
-uses CONFIG_HAVE_HIGH_TABLES
+uses CONFIG_GENERATE_ACPI_TABLES
+uses CONFIG_WRITE_HIGH_TABLES
 
 default CONFIG_AGP_APERTURE_SIZE=0x4000000
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
 
 config chip.h
 
 driver northbridge.o
 driver misc_control.o
 
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
 	object amdfam10_acpi.o
 	makerule ssdt.c
 		depends "$(TOP)/src/northbridge/amd/amdfam10/ssdt.dsl"
diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc
index 9cca322c23..bcc7cab3d3 100644
--- a/src/northbridge/amd/amdfam10/Makefile.inc
+++ b/src/northbridge/amd/amdfam10/Makefile.inc
@@ -1,13 +1,13 @@
 driver-y += northbridge.o
 driver-y += misc_control.o
 
-obj-$(CONFIG_HAVE_ACPI_TABLES) += amdfam10_acpi.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr1.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr2.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr3.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr4.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += sspr5.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr3.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr4.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += sspr5.o
 
 obj-y += get_pci1234.o
 
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 44fa9e4e4b..52ec0194b9 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -877,7 +877,7 @@ static void disable_hoist_memory(unsigned long hole_startk, int i)
 
 #endif
 
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 #define HIGH_TABLES_SIZE 64	// maximum size of high tables in KB
 extern uint64_t high_tables_base, high_tables_size;
 #endif
@@ -1052,7 +1052,7 @@ static void pci_domain_set_resources(device_t dev)
 					ram_resource(dev, (idx | i), basek, pre_sizek);
 					idx += 0x10;
 					sizek -= pre_sizek;
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 					if (i==0 && high_tables_base==0) {
 					/* Leave some space for ACPI, PIRQ and MP tables */
 						high_tables_base = (mmio_basek - HIGH_TABLES_SIZE) * 1024;
@@ -1085,7 +1085,7 @@ static void pci_domain_set_resources(device_t dev)
 		}
 		ram_resource(dev, (idx | i), basek, sizek);
 		idx += 0x10;
-#if CONFIG_HAVE_HIGH_TABLES==1
+#if CONFIG_WRITE_HIGH_TABLES==1
 		printk_debug("%d: mmio_basek=%08lx, basek=%08x, limitk=%08x\n",
 			     i, mmio_basek, basek, limitk);
 		if (i==0 && high_tables_base==0) {