From 53ad9f585ddc3f40671adcd92a6341eadd229a06 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Tue, 29 Sep 2009 21:35:48 +0000 Subject: Make CONFIG_HAVE_HIGH_TABLES consistent in where and how it is set. Signed-off-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4691 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/intel/eagleheights/Kconfig | 6 +++++- src/northbridge/amd/amdfam10/Kconfig | 6 +----- src/northbridge/amd/amdk8/Kconfig | 6 +----- src/northbridge/amd/amdk8/Makefile.inc | 5 ----- src/northbridge/intel/e7501/Kconfig | 5 +---- src/northbridge/intel/e7520/Kconfig | 5 +---- src/northbridge/intel/e7525/Kconfig | 5 +---- src/northbridge/intel/i3100/Kconfig | 5 +---- src/northbridge/intel/i440bx/Kconfig | 6 +----- src/northbridge/intel/i82810/Kconfig | 6 +----- src/northbridge/intel/i82830/Kconfig | 5 +---- src/northbridge/intel/i855gme/Kconfig | 5 +---- src/northbridge/intel/i855pm/Kconfig | 5 +---- src/northbridge/intel/i945/Kconfig | 7 +------ src/northbridge/via/cn700/Kconfig | 6 +----- src/northbridge/via/vt8601/Kconfig | 5 +---- src/northbridge/via/vt8623/Kconfig | 5 +---- 17 files changed, 20 insertions(+), 73 deletions(-) diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig index 8360ee293a..c611d414ac 100644 --- a/src/mainboard/intel/eagleheights/Kconfig +++ b/src/mainboard/intel/eagleheights/Kconfig @@ -7,7 +7,6 @@ config BOARD_INTEL_EAGLEHEIGHTS select SUPERIO_INTEL_I3100 select SUPERIO_SMSC_SMSCSUPERIO select HAVE_PIRQ_TABLE - select HAVE_HIGH_TABLES select MMCONF_SUPPORT select USE_PRINTK_IN_CAR select UDELAY_TSC @@ -21,6 +20,11 @@ config MAINBOARD_DIR default intel/eagleheights depends on BOARD_INTEL_EAGLEHEIGHTS +config MMCONF_BASE_ADDRESS + hex + default 0xe0000000 + depends on BOARD_INTEL_EAGLEHEIGHTS + config DCACHE_RAM_BASE hex default 0xffdf8000 diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig index e3b55fc3bb..c729566553 100644 --- a/src/northbridge/amd/amdfam10/Kconfig +++ b/src/northbridge/amd/amdfam10/Kconfig @@ -20,15 +20,11 @@ config NORTHBRIDGE_AMD_AMDFAM10 bool default n + select HAVE_HIGH_TABLES config AGP_APERTURE_SIZE hex default 0x4000000 depends on NORTHBRIDGE_AMD_AMDFAM10 -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_AMD_AMDFAM10 - source src/northbridge/amd/amdfam10/root_complex/Kconfig diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig index bbc4c651da..d33c069769 100644 --- a/src/northbridge/amd/amdk8/Kconfig +++ b/src/northbridge/amd/amdk8/Kconfig @@ -19,6 +19,7 @@ config NORTHBRIDGE_AMD_AMDK8 bool + select HAVE_HIGH_TABLES default n config AGP_APERTURE_SIZE @@ -26,11 +27,6 @@ config AGP_APERTURE_SIZE default 0x4000000 depends on NORTHBRIDGE_AMD_AMDK8 -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_AMD_AMDK8 - config HYPERTRANSPORT_PLUGIN_SUPPORT bool default y diff --git a/src/northbridge/amd/amdk8/Makefile.inc b/src/northbridge/amd/amdk8/Makefile.inc index 8a12d77f10..716e38c6bf 100644 --- a/src/northbridge/amd/amdk8/Makefile.inc +++ b/src/northbridge/amd/amdk8/Makefile.inc @@ -1,8 +1,3 @@ - -#default CONFIG_AGP_APERTURE_SIZE=0x4000000 -#default CONFIG_HAVE_HIGH_TABLES=1 - - driver-y += northbridge.o driver-y += misc_control.o obj-y += get_sblk_pci1234.o diff --git a/src/northbridge/intel/e7501/Kconfig b/src/northbridge/intel/e7501/Kconfig index a888320282..64098abbfb 100644 --- a/src/northbridge/intel/e7501/Kconfig +++ b/src/northbridge/intel/e7501/Kconfig @@ -1,8 +1,5 @@ config NORTHBRIDGE_INTEL_E7501 bool default n + select HAVE_HIGH_TABLES -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_E7501 diff --git a/src/northbridge/intel/e7520/Kconfig b/src/northbridge/intel/e7520/Kconfig index 577c6dc603..bb01dc28ec 100644 --- a/src/northbridge/intel/e7520/Kconfig +++ b/src/northbridge/intel/e7520/Kconfig @@ -1,8 +1,5 @@ config NORTHBRIDGE_INTEL_E7520 bool default n + select HAVE_HIGH_TABLES -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_E7520 diff --git a/src/northbridge/intel/e7525/Kconfig b/src/northbridge/intel/e7525/Kconfig index 07d7b69b8b..9688332639 100644 --- a/src/northbridge/intel/e7525/Kconfig +++ b/src/northbridge/intel/e7525/Kconfig @@ -1,8 +1,5 @@ config NORTHBRIDGE_INTEL_E7525 bool default n + select HAVE_HIGH_TABLES -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_E7525 diff --git a/src/northbridge/intel/i3100/Kconfig b/src/northbridge/intel/i3100/Kconfig index 1a1a959ce0..4ee5472585 100644 --- a/src/northbridge/intel/i3100/Kconfig +++ b/src/northbridge/intel/i3100/Kconfig @@ -1,8 +1,5 @@ config NORTHBRIDGE_INTEL_I3100 bool default n + select HAVE_HIGH_TABLES -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_I3100 diff --git a/src/northbridge/intel/i440bx/Kconfig b/src/northbridge/intel/i440bx/Kconfig index b9ff5a4228..a41c7de034 100644 --- a/src/northbridge/intel/i440bx/Kconfig +++ b/src/northbridge/intel/i440bx/Kconfig @@ -21,9 +21,5 @@ config NORTHBRIDGE_INTEL_I440BX bool default n - -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_I440BX + select HAVE_HIGH_TABLES diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig index 42cd4e24ba..ec4245ed87 100644 --- a/src/northbridge/intel/i82810/Kconfig +++ b/src/northbridge/intel/i82810/Kconfig @@ -21,9 +21,5 @@ config NORTHBRIDGE_INTEL_I82810 bool default n - -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_I82810 + select HAVE_HIGH_TABLES diff --git a/src/northbridge/intel/i82830/Kconfig b/src/northbridge/intel/i82830/Kconfig index 9dc7678bae..2fb8dc5fc0 100644 --- a/src/northbridge/intel/i82830/Kconfig +++ b/src/northbridge/intel/i82830/Kconfig @@ -1,8 +1,5 @@ config NORTHBRIDGE_INTEL_I82830 bool default n + select HAVE_HIGH_TABLES -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_I82830 diff --git a/src/northbridge/intel/i855gme/Kconfig b/src/northbridge/intel/i855gme/Kconfig index 554cbf5fba..7d17c02433 100644 --- a/src/northbridge/intel/i855gme/Kconfig +++ b/src/northbridge/intel/i855gme/Kconfig @@ -1,8 +1,5 @@ config NORTHBRIDGE_INTEL_I855GME bool default n + select HAVE_HIGH_TABLES -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_I855GME diff --git a/src/northbridge/intel/i855pm/Kconfig b/src/northbridge/intel/i855pm/Kconfig index 4ce9be7557..9f9c65f28d 100644 --- a/src/northbridge/intel/i855pm/Kconfig +++ b/src/northbridge/intel/i855pm/Kconfig @@ -1,8 +1,5 @@ config NORTHBRIDGE_INTEL_I855PM bool default n + select HAVE_HIGH_TABLES -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_I855PM diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig index b569f2707e..0068bf165a 100644 --- a/src/northbridge/intel/i945/Kconfig +++ b/src/northbridge/intel/i945/Kconfig @@ -19,10 +19,5 @@ config NORTHBRIDGE_INTEL_I945 bool + select HAVE_HIGH_TABLES default n - -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_INTEL_I945 - diff --git a/src/northbridge/via/cn700/Kconfig b/src/northbridge/via/cn700/Kconfig index 5395416c19..6902857690 100644 --- a/src/northbridge/via/cn700/Kconfig +++ b/src/northbridge/via/cn700/Kconfig @@ -1,13 +1,9 @@ config NORTHBRIDGE_VIA_CN700 bool default n + select HAVE_HIGH_TABLES config FALLBACK_SIZE int default 0 depends on NORTHBRIDGE_VIA_CN700 - -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_VIA_CN700 diff --git a/src/northbridge/via/vt8601/Kconfig b/src/northbridge/via/vt8601/Kconfig index 5f5a672654..324719f722 100644 --- a/src/northbridge/via/vt8601/Kconfig +++ b/src/northbridge/via/vt8601/Kconfig @@ -1,13 +1,10 @@ config NORTHBRIDGE_VIA_VT8601 bool default n + select HAVE_HIGH_TABLES config FALLBACK_SIZE int default 0 depends on NORTHBRIDGE_VIA_VT8601 -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_VIA_VT8601 diff --git a/src/northbridge/via/vt8623/Kconfig b/src/northbridge/via/vt8623/Kconfig index 3976ed1f65..8907676d35 100644 --- a/src/northbridge/via/vt8623/Kconfig +++ b/src/northbridge/via/vt8623/Kconfig @@ -1,13 +1,10 @@ config NORTHBRIDGE_VIA_VT8623 bool default n + select HAVE_HIGH_TABLES config FALLBACK_SIZE int default 0 depends on NORTHBRIDGE_VIA_VT8623 -config HAVE_HIGH_TABLES - bool - default y - depends on NORTHBRIDGE_VIA_VT8623 -- cgit v1.2.3