From a19f64479946a2972331855389635db16fa2623e Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 28 Apr 2009 14:18:16 +0000 Subject: Enable HAVE_HIGH_TABLES by default for northbridges with support for it. The related mainboards don't need to activate it themselves anymore. Signed-off-by: Patrick Georgi Acked-by: Stefan Reinauer Acked-by: Myles Watson git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4224 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/asus/m2v-mx_se/Options.lb | 2 -- src/mainboard/kontron/986lcd-m/Options.lb | 2 -- src/mainboard/supermicro/h8dme/Options.lb | 2 -- src/mainboard/tyan/s2891/Options.lb | 2 -- src/mainboard/tyan/s2892/Options.lb | 2 -- src/mainboard/tyan/s2895/Options.lb | 2 -- src/mainboard/via/vt8454c/Options.lb | 2 -- src/northbridge/amd/amdk8/Config.lb | 2 ++ src/northbridge/intel/i945/Config.lb | 4 ++++ src/northbridge/via/cx700/Config.lb | 3 +++ 10 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/mainboard/asus/m2v-mx_se/Options.lb b/src/mainboard/asus/m2v-mx_se/Options.lb index 195b34ee80..93c1bd32e6 100644 --- a/src/mainboard/asus/m2v-mx_se/Options.lb +++ b/src/mainboard/asus/m2v-mx_se/Options.lb @@ -48,7 +48,6 @@ uses HEAP_SIZE uses CONFIG_LB_MEM_TOPK uses HAVE_ACPI_TABLES uses HAVE_MAINBOARD_RESOURCES -uses HAVE_HIGH_TABLES uses HAVE_ACPI_RESUME uses HAVE_LOW_TABLES uses LB_CKS_RANGE_START @@ -115,7 +114,6 @@ default CONFIG_MAX_PHYSICAL_CPUS = 1 default CONFIG_LOGICAL_CPUS = 1 default HAVE_ACPI_TABLES = 1 default HAVE_MAINBOARD_RESOURCES = 1 -default HAVE_HIGH_TABLES = 1 default HAVE_LOW_TABLES = 0 default HAVE_ACPI_RESUME = 1 diff --git a/src/mainboard/kontron/986lcd-m/Options.lb b/src/mainboard/kontron/986lcd-m/Options.lb index 1d04d0f516..30c66862c8 100644 --- a/src/mainboard/kontron/986lcd-m/Options.lb +++ b/src/mainboard/kontron/986lcd-m/Options.lb @@ -31,7 +31,6 @@ uses LB_CKS_LOC uses HAVE_ACPI_TABLES uses HAVE_ACPI_RESUME uses HAVE_MAINBOARD_RESOURCES -uses HAVE_HIGH_TABLES # SMP uses CONFIG_SMP uses CONFIG_LOGICAL_CPUS @@ -177,7 +176,6 @@ default HAVE_MP_TABLE=1 ## default HAVE_ACPI_TABLES=1 default HAVE_MAINBOARD_RESOURCES=1 -default HAVE_HIGH_TABLES=1 ## ## Build code to export a CMOS option table diff --git a/src/mainboard/supermicro/h8dme/Options.lb b/src/mainboard/supermicro/h8dme/Options.lb index 46183f9396..91a3f17250 100644 --- a/src/mainboard/supermicro/h8dme/Options.lb +++ b/src/mainboard/supermicro/h8dme/Options.lb @@ -56,7 +56,6 @@ uses XIP_ROM_BASE uses STACK_SIZE uses HEAP_SIZE uses USE_OPTION_TABLE -uses HAVE_HIGH_TABLES uses HAVE_LOW_TABLES uses CONFIG_MULTIBOOT uses LB_CKS_RANGE_START @@ -128,7 +127,6 @@ uses CONFIG_USE_PRINTK_IN_CAR #default ROM_SIZE=524288 default ROM_SIZE=0x100000 -default HAVE_HIGH_TABLES = 1 default HAVE_LOW_TABLES = 0 default CONFIG_MULTIBOOT=0 diff --git a/src/mainboard/tyan/s2891/Options.lb b/src/mainboard/tyan/s2891/Options.lb index 12f3c42256..ed514efc1d 100644 --- a/src/mainboard/tyan/s2891/Options.lb +++ b/src/mainboard/tyan/s2891/Options.lb @@ -33,7 +33,6 @@ uses LB_CKS_RANGE_END uses LB_CKS_LOC uses HAVE_ACPI_TABLES uses HAVE_ACPI_RESUME -uses HAVE_HIGH_TABLES uses HAVE_LOW_TABLES uses CONFIG_MULTIBOOT uses HAVE_SMI_HANDLER @@ -129,7 +128,6 @@ default HAVE_MP_TABLE=1 ## default HAVE_ACPI_TABLES=1 default HAVE_LOW_TABLES=1 -default HAVE_HIGH_TABLES=1 default CONFIG_MULTIBOOT=0 ## diff --git a/src/mainboard/tyan/s2892/Options.lb b/src/mainboard/tyan/s2892/Options.lb index 5cf2ad8c3f..0cfbcd5c56 100644 --- a/src/mainboard/tyan/s2892/Options.lb +++ b/src/mainboard/tyan/s2892/Options.lb @@ -33,7 +33,6 @@ uses LB_CKS_RANGE_END uses LB_CKS_LOC uses HAVE_ACPI_TABLES uses HAVE_ACPI_RESUME -uses HAVE_HIGH_TABLES uses HAVE_LOW_TABLES uses CONFIG_MULTIBOOT uses HAVE_SMI_HANDLER @@ -123,7 +122,6 @@ default HAVE_MP_TABLE=1 ## default HAVE_ACPI_TABLES=1 default HAVE_LOW_TABLES=1 -default HAVE_HIGH_TABLES=1 default CONFIG_MULTIBOOT=0 ## diff --git a/src/mainboard/tyan/s2895/Options.lb b/src/mainboard/tyan/s2895/Options.lb index da6aa5bde2..19c7cdfd73 100644 --- a/src/mainboard/tyan/s2895/Options.lb +++ b/src/mainboard/tyan/s2895/Options.lb @@ -36,7 +36,6 @@ uses LB_CKS_RANGE_END uses LB_CKS_LOC uses HAVE_ACPI_TABLES uses HAVE_ACPI_RESUME -uses HAVE_HIGH_TABLES uses HAVE_LOW_TABLES uses CONFIG_MULTIBOOT uses HAVE_SMI_HANDLER @@ -136,7 +135,6 @@ default HAVE_MP_TABLE=1 ## default HAVE_ACPI_TABLES=1 default HAVE_LOW_TABLES=1 -default HAVE_HIGH_TABLES=1 default CONFIG_MULTIBOOT=0 ## diff --git a/src/mainboard/via/vt8454c/Options.lb b/src/mainboard/via/vt8454c/Options.lb index befd8a6e32..d9cf995cdf 100644 --- a/src/mainboard/via/vt8454c/Options.lb +++ b/src/mainboard/via/vt8454c/Options.lb @@ -26,7 +26,6 @@ uses HAVE_ACPI_TABLES uses HAVE_OPTION_TABLE uses USE_OPTION_TABLE uses HAVE_LOW_TABLES -uses HAVE_HIGH_TABLES uses USE_FALLBACK_IMAGE uses HAVE_FALLBACK_BOOT @@ -145,7 +144,6 @@ default HAVE_OPTION_TABLE=1 ## Build code to fill in tables both in low and high memory ## default HAVE_LOW_TABLES=1 -default HAVE_HIGH_TABLES=1 ## diff --git a/src/northbridge/amd/amdk8/Config.lb b/src/northbridge/amd/amdk8/Config.lb index 272c7fdc62..5aff2aaa9d 100644 --- a/src/northbridge/amd/amdk8/Config.lb +++ b/src/northbridge/amd/amdk8/Config.lb @@ -1,7 +1,9 @@ uses AGP_APERTURE_SIZE uses HAVE_ACPI_TABLES +uses HAVE_HIGH_TABLES default AGP_APERTURE_SIZE=0x4000000 +default HAVE_HIGH_TABLES=1 config chip.h diff --git a/src/northbridge/intel/i945/Config.lb b/src/northbridge/intel/i945/Config.lb index 15a9e8f572..72f620e5ba 100644 --- a/src/northbridge/intel/i945/Config.lb +++ b/src/northbridge/intel/i945/Config.lb @@ -17,6 +17,10 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # +uses HAVE_HIGH_TABLES + +default HAVE_HIGH_TABLES=1 + config chip.h driver northbridge.o driver gma.o diff --git a/src/northbridge/via/cx700/Config.lb b/src/northbridge/via/cx700/Config.lb index f4e558033e..44299ba729 100644 --- a/src/northbridge/via/cx700/Config.lb +++ b/src/northbridge/via/cx700/Config.lb @@ -15,6 +15,8 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +uses HAVE_HIGH_TABLES + config chip.h object cx700_reset.o @@ -26,3 +28,4 @@ driver cx700_lpc.o driver cx700_sata.o driver cx700_vga.o +default HAVE_HIGH_TABLES=1 -- cgit v1.2.3