From b3f8090f4e42a73434da3f6d7854762f855ee679 Mon Sep 17 00:00:00 2001 From: Jens Rottmann Date: Fri, 27 Aug 2010 09:36:41 +0000 Subject: [PATCH] drop three unneeded config variables: - HAVE_HIGH_TABLES - HAVE_LOW_TABLES - FALLBACK_SIZE Jens Rottmann sent an almost identical patch at the same time, so Signed-off-by: Jens Rottmann Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5745 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- documentation/Kconfig.tex | 4 ---- src/Kconfig | 26 ------------------------- src/mainboard/amd/dbm690t/Kconfig | 5 ----- src/mainboard/amd/mahogany/Kconfig | 5 ----- src/mainboard/asrock/939a785gmh/Kconfig | 5 ----- src/northbridge/amd/amdfam10/Kconfig | 1 - src/northbridge/amd/amdk8/Kconfig | 1 - src/northbridge/amd/lx/Kconfig | 1 - src/northbridge/intel/e7501/Kconfig | 1 - src/northbridge/intel/e7520/Kconfig | 1 - src/northbridge/intel/e7525/Kconfig | 1 - src/northbridge/intel/i3100/Kconfig | 1 - src/northbridge/intel/i440bx/Kconfig | 1 - src/northbridge/intel/i440lx/Kconfig | 1 - src/northbridge/intel/i82810/Kconfig | 1 - src/northbridge/intel/i82830/Kconfig | 1 - src/northbridge/intel/i855/Kconfig | 1 - src/northbridge/intel/i945/Kconfig | 1 - src/northbridge/via/cn400/Kconfig | 5 ----- src/northbridge/via/cn400/vga.c | 22 --------------------- src/northbridge/via/cn700/Kconfig | 1 - src/northbridge/via/cx700/Kconfig | 1 - src/northbridge/via/vt8601/Kconfig | 6 ------ src/northbridge/via/vt8623/Kconfig | 6 ------ src/northbridge/via/vx800/Kconfig | 5 ----- 25 files changed, 104 deletions(-) diff --git a/documentation/Kconfig.tex b/documentation/Kconfig.tex index 7254c5a5d2..e8e3f414e7 100644 --- a/documentation/Kconfig.tex +++ b/documentation/Kconfig.tex @@ -420,10 +420,6 @@ config NORTHBRIDGE_AMD_AMDK8 config AGP_APERTURE_SIZE hex default 0x4000000 - -config HAVE_HIGH_TABLES - int - default 1 \end{verbatim} \subsubsection{northbridge/$<$vendor$>$/$<$chip$>$/Makefile.inc} Typically very small set of rules, and very simple. diff --git a/src/Kconfig b/src/Kconfig index 5dde389edb..ec3a13bdbf 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -250,27 +250,6 @@ config GFXUMA # # endmenu -#TODO Remove this option or make it useful. -config HAVE_LOW_TABLES - bool - default y - help - This Option is unused in the code. Since two boards try to set it to - 'n', they may be broken. We either need to make the option useful or - get rid of it. The broken boards are: - asus/m2v-mx_se - supermicro/h8dme - -config HAVE_HIGH_TABLES - bool - default y - help - This variable specifies whether a given northbridge has high table - support. - It is set in northbridge/*/Kconfig. - Whether or not the high tables are actually written by coreboot is - configurable by the user via WRITE_HIGH_TABLES. - config HAVE_ACPI_TABLES bool help @@ -310,15 +289,10 @@ config GENERATE_PIRQ_TABLE bool default HAVE_PIRQ_TABLE -config WRITE_HIGH_TABLES - bool - default HAVE_HIGH_TABLES - menu "System tables" config WRITE_HIGH_TABLES bool "Write 'high' tables to avoid being overwritten in F segment" - depends on HAVE_HIGH_TABLES default y config MULTIBOOT diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index a60cc16683..86c193e7d4 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -24,11 +24,6 @@ config MAINBOARD_DIR default amd/dbm690t depends on BOARD_AMD_DBM690T -config HAVE_HIGH_TABLES - bool - default n - depends on BOARD_AMD_DBM690T - # This is a temporary fix, and should be removed when the race condition for # building option_table.h is fixed. config WARNINGS_ARE_ERRORS diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig index 508292848b..ce4e88d7cf 100644 --- a/src/mainboard/amd/mahogany/Kconfig +++ b/src/mainboard/amd/mahogany/Kconfig @@ -26,11 +26,6 @@ config MAINBOARD_DIR default amd/mahogany depends on BOARD_AMD_MAHOGANY -config HAVE_HIGH_TABLES - bool - default n - depends on BOARD_AMD_MAHOGANY - config DCACHE_RAM_BASE hex default 0xc8000 diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig index ce43fc0f5f..1d99e064d9 100644 --- a/src/mainboard/asrock/939a785gmh/Kconfig +++ b/src/mainboard/asrock/939a785gmh/Kconfig @@ -27,11 +27,6 @@ config MAINBOARD_DIR default asrock/939a785gmh depends on BOARD_ASROCK_939A785GMH -config HAVE_HIGH_TABLES - bool - default n - depends on BOARD_ASROCK_939A785GMH - config DCACHE_RAM_BASE hex default 0xc8000 diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig index 8c41a75f7b..102753e172 100644 --- a/src/northbridge/amd/amdfam10/Kconfig +++ b/src/northbridge/amd/amdfam10/Kconfig @@ -21,7 +21,6 @@ config NORTHBRIDGE_AMD_AMDFAM10 bool select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_SMBUS - select HAVE_HIGH_TABLES select HYPERTRANSPORT_PLUGIN_SUPPORT select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig index a73246fa65..014e1ee03d 100644 --- a/src/northbridge/amd/amdk8/Kconfig +++ b/src/northbridge/amd/amdk8/Kconfig @@ -21,7 +21,6 @@ config NORTHBRIDGE_AMD_AMDK8 bool select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_SMBUS - select HAVE_HIGH_TABLES select HYPERTRANSPORT_PLUGIN_SUPPORT config AGP_APERTURE_SIZE diff --git a/src/northbridge/amd/lx/Kconfig b/src/northbridge/amd/lx/Kconfig index 09eba0791a..c1fea495ff 100644 --- a/src/northbridge/amd/lx/Kconfig +++ b/src/northbridge/amd/lx/Kconfig @@ -1,6 +1,5 @@ config NORTHBRIDGE_AMD_LX bool - select HAVE_HIGH_TABLES select GEODE_VSA config VIDEO_MB diff --git a/src/northbridge/intel/e7501/Kconfig b/src/northbridge/intel/e7501/Kconfig index 3dd16dbec9..c8219e89a2 100644 --- a/src/northbridge/intel/e7501/Kconfig +++ b/src/northbridge/intel/e7501/Kconfig @@ -1,5 +1,4 @@ config NORTHBRIDGE_INTEL_E7501 bool select HAVE_DEBUG_RAM_SETUP - select HAVE_HIGH_TABLES diff --git a/src/northbridge/intel/e7520/Kconfig b/src/northbridge/intel/e7520/Kconfig index 32c092841d..426db8b12f 100644 --- a/src/northbridge/intel/e7520/Kconfig +++ b/src/northbridge/intel/e7520/Kconfig @@ -1,4 +1,3 @@ config NORTHBRIDGE_INTEL_E7520 bool - select HAVE_HIGH_TABLES diff --git a/src/northbridge/intel/e7525/Kconfig b/src/northbridge/intel/e7525/Kconfig index 4b31fc21b7..d8bff2225b 100644 --- a/src/northbridge/intel/e7525/Kconfig +++ b/src/northbridge/intel/e7525/Kconfig @@ -1,4 +1,3 @@ config NORTHBRIDGE_INTEL_E7525 bool - select HAVE_HIGH_TABLES diff --git a/src/northbridge/intel/i3100/Kconfig b/src/northbridge/intel/i3100/Kconfig index cc5cc2ea88..a85162310e 100644 --- a/src/northbridge/intel/i3100/Kconfig +++ b/src/northbridge/intel/i3100/Kconfig @@ -1,4 +1,3 @@ config NORTHBRIDGE_INTEL_I3100 bool - select HAVE_HIGH_TABLES diff --git a/src/northbridge/intel/i440bx/Kconfig b/src/northbridge/intel/i440bx/Kconfig index 8fff69f34b..4044a4a9ac 100644 --- a/src/northbridge/intel/i440bx/Kconfig +++ b/src/northbridge/intel/i440bx/Kconfig @@ -20,7 +20,6 @@ config NORTHBRIDGE_INTEL_I440BX bool select HAVE_DEBUG_RAM_SETUP - select HAVE_HIGH_TABLES config SDRAMPWR_4DIMM bool diff --git a/src/northbridge/intel/i440lx/Kconfig b/src/northbridge/intel/i440lx/Kconfig index f8bcfd0f6a..cff3aac2d2 100644 --- a/src/northbridge/intel/i440lx/Kconfig +++ b/src/northbridge/intel/i440lx/Kconfig @@ -19,5 +19,4 @@ config NORTHBRIDGE_INTEL_I440LX bool - select HAVE_HIGH_TABLES diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig index 414c784ec1..6d4e6c4e79 100644 --- a/src/northbridge/intel/i82810/Kconfig +++ b/src/northbridge/intel/i82810/Kconfig @@ -20,7 +20,6 @@ config NORTHBRIDGE_INTEL_I82810 bool select HAVE_DEBUG_RAM_SETUP - select HAVE_HIGH_TABLES choice prompt "Onboard graphics" diff --git a/src/northbridge/intel/i82830/Kconfig b/src/northbridge/intel/i82830/Kconfig index 125633668d..20b31a2fb3 100644 --- a/src/northbridge/intel/i82830/Kconfig +++ b/src/northbridge/intel/i82830/Kconfig @@ -1,7 +1,6 @@ config NORTHBRIDGE_INTEL_I82830 bool select HAVE_DEBUG_RAM_SETUP - select HAVE_HIGH_TABLES choice prompt "Onboard graphics" diff --git a/src/northbridge/intel/i855/Kconfig b/src/northbridge/intel/i855/Kconfig index e76c1c8d0f..3d3443a2c9 100644 --- a/src/northbridge/intel/i855/Kconfig +++ b/src/northbridge/intel/i855/Kconfig @@ -1,4 +1,3 @@ config NORTHBRIDGE_INTEL_I855 bool - select HAVE_HIGH_TABLES diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig index fb91fb0519..952bd9ed68 100644 --- a/src/northbridge/intel/i945/Kconfig +++ b/src/northbridge/intel/i945/Kconfig @@ -20,7 +20,6 @@ config NORTHBRIDGE_INTEL_I945 bool select HAVE_DEBUG_RAM_SETUP - select HAVE_HIGH_TABLES config FALLBACK_VGA_BIOS_ID string diff --git a/src/northbridge/via/cn400/Kconfig b/src/northbridge/via/cn400/Kconfig index 8a27af42f2..42fa096894 100644 --- a/src/northbridge/via/cn400/Kconfig +++ b/src/northbridge/via/cn400/Kconfig @@ -1,11 +1,6 @@ config NORTHBRIDGE_VIA_CN400 bool -config FALLBACK_SIZE - int - default 0 - depends on NORTHBRIDGE_VIA_CN400 - # TODO: Values are from the CX700 datasheet, not sure if this matches CN400. # TODO: What should be the per-chipset default value here? choice diff --git a/src/northbridge/via/cn400/vga.c b/src/northbridge/via/cn400/vga.c index 511079b03a..7641a81012 100644 --- a/src/northbridge/via/cn400/vga.c +++ b/src/northbridge/via/cn400/vga.c @@ -83,23 +83,6 @@ static void vga_init(device_t dev) mainboard_interrupt_handlers(0x15, &via_cn400_int15_handler); -#undef OLD_BOCHS_METHOD -#ifdef OLD_BOCHS_METHOD - u32 temp; - // XXX We might need more bios hooks in the f segment, but - // this way of copying the BOCHS BIOS does not work anymore. - // As soon as someone verifies that CN400 can init VGA, the - // code should be removed. - temp = (0xffffffff - CONFIG_FALLBACK_SIZE - 0xffff); - printk(BIOS_DEBUG, "Copying BOCHS BIOS from 0x%08X to 0xf000\n", temp); - /* - * Copy BOCHS BIOS from 4G-CONFIG_FALLBACK_SIZE-64k (in flash) to 0xf0000 (in RAM) - * This is for compatibility with the VGA ROM's BIOS callbacks. - */ - //memcpy(0xf0000, (0xffffffff - CONFIG_ROM_SIZE - 0xffff), 0x10000); - memcpy((void *)0xf0000, (void *)temp, 0x10000); -#endif - /* Set memory rate to 200 MHz. */ outb(0x3d, CRTM_INDEX); reg8 = inb(CRTM_DATA); @@ -138,11 +121,6 @@ static void vga_init(device_t dev) outb(0x39, SR_INDEX); outb(reg8, SR_DATA); -#ifdef OLD_BOCHS_METHOD - /* Clear the BOCHS BIOS out of memory, so it doesn't confuse Linux. */ - memset((void *)0xf0000, 0, 0x10000); -#endif - #ifdef DEBUG_CN400 int i, j; diff --git a/src/northbridge/via/cn700/Kconfig b/src/northbridge/via/cn700/Kconfig index aa09869436..00af051cb6 100644 --- a/src/northbridge/via/cn700/Kconfig +++ b/src/northbridge/via/cn700/Kconfig @@ -1,7 +1,6 @@ config NORTHBRIDGE_VIA_CN700 bool select HAVE_DEBUG_RAM_SETUP - select HAVE_HIGH_TABLES config FALLBACK_SIZE int diff --git a/src/northbridge/via/cx700/Kconfig b/src/northbridge/via/cx700/Kconfig index 046adc7adc..7e4a193ab5 100644 --- a/src/northbridge/via/cx700/Kconfig +++ b/src/northbridge/via/cx700/Kconfig @@ -2,7 +2,6 @@ config NORTHBRIDGE_VIA_CX700 bool select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_SMBUS - select HAVE_HIGH_TABLES select HAVE_HARD_RESET select IOAPIC select SMP diff --git a/src/northbridge/via/vt8601/Kconfig b/src/northbridge/via/vt8601/Kconfig index 90f7f01561..cb64dbcb31 100644 --- a/src/northbridge/via/vt8601/Kconfig +++ b/src/northbridge/via/vt8601/Kconfig @@ -1,9 +1,3 @@ config NORTHBRIDGE_VIA_VT8601 bool - select HAVE_HIGH_TABLES - -config FALLBACK_SIZE - int - default 0 - depends on NORTHBRIDGE_VIA_VT8601 diff --git a/src/northbridge/via/vt8623/Kconfig b/src/northbridge/via/vt8623/Kconfig index dbdb313227..c2aa82b47e 100644 --- a/src/northbridge/via/vt8623/Kconfig +++ b/src/northbridge/via/vt8623/Kconfig @@ -1,9 +1,3 @@ config NORTHBRIDGE_VIA_VT8623 bool - select HAVE_HIGH_TABLES - -config FALLBACK_SIZE - int - default 0 - depends on NORTHBRIDGE_VIA_VT8623 diff --git a/src/northbridge/via/vx800/Kconfig b/src/northbridge/via/vx800/Kconfig index 89a33cff52..48ea456e48 100644 --- a/src/northbridge/via/vx800/Kconfig +++ b/src/northbridge/via/vx800/Kconfig @@ -3,8 +3,3 @@ config NORTHBRIDGE_VIA_VX800 select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_SMBUS -config FALLBACK_SIZE - int - default 0 - depends on NORTHBRIDGE_VIA_VX800 -