aboutsummaryrefslogtreecommitdiff
path: root/src/northbridge/amd/amdk8
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/northbridge/amd/amdk8
parent45b811b13552a94af4713b77613d377561e4ef26 (diff)
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/northbridge/amd/amdk8')
-rw-r--r--src/northbridge/amd/amdk8/Config.lb8
-rw-r--r--src/northbridge/amd/amdk8/Makefile.inc2
-rw-r--r--src/northbridge/amd/amdk8/northbridge.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/src/northbridge/amd/amdk8/Config.lb b/src/northbridge/amd/amdk8/Config.lb
index 149a5421b0..d9a3ac5ce4 100644
--- a/src/northbridge/amd/amdk8/Config.lb
+++ b/src/northbridge/amd/amdk8/Config.lb
@@ -1,10 +1,10 @@
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
uses CONFIG_K8_REV_F_SUPPORT
default CONFIG_AGP_APERTURE_SIZE=0x4000000
-default CONFIG_HAVE_HIGH_TABLES=1
+default CONFIG_WRITE_HIGH_TABLES=1
config chip.h
@@ -30,7 +30,7 @@ end
end
-if CONFIG_HAVE_ACPI_TABLES
+if CONFIG_GENERATE_ACPI_TABLES
object amdk8_acpi.o
end
diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc
index 716e38c6bf..9053404776 100644
--- a/src/northbridge/amd/amdk8/Makefile.inc
+++ b/src/northbridge/amd/amdk8/Makefile.inc
@@ -1,7 +1,7 @@
driver-y += northbridge.o
driver-y += misc_control.o
obj-y += get_sblk_pci1234.o
-obj-$(CONFIG_HAVE_ACPI_TABLES) += amdk8_acpi.o
+obj-$(CONFIG_GENERATE_ACPI_TABLES) += amdk8_acpi.o
# Not sure what to do with these yet. How did raminit_test even work?
# Should be a target in -y form.
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index aa620c5e6b..a252e08510 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -836,7 +836,7 @@ static uint32_t hoist_memory(unsigned long hole_startk, int node_id)
}
#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
@@ -1014,7 +1014,7 @@ static void amdk8_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;
@@ -1048,7 +1048,7 @@ static void amdk8_domain_set_resources(device_t dev)
if (sizek)
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) {