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 <JRottmann@LiPPERTEmbedded.de>
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5745 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/documentation/Kconfig.tex b/documentation/Kconfig.tex
index 7254c5a5d231c2ddc273112b1af338bc525f9683..e8e3f414e7289b874040e37a6ddb590269608554 100644 (file)
--- 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 5dde389edba081eb5fc5c14620b14172f2cbcea4..ec3a13bdbf97edb9192fc9dc3ceeaef45dcc0341 100644 (file)
--- 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 a60cc166837b3d060724b6ecd026c423a1c95af0..86c193e7d4b8f31b5bfba9f2565fb5c7351e54c8 100644 (file)
--- 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 508292848b92a7d5c582f9e42e1b00f8a17536d0..ce4e88d7cfe08fcf9859b040886daec30ef94d0e 100644 (file)
--- 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 ce43fc0f5f6ba9dc7e3c336adbc29c162c22e7fa..1d99e064d990095b20d012f68c27827033568cd1 100644 (file)
--- 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 8c41a75f7ba96fcfc0ae9baa9b89a34e12405374..102753e1729f5c92810350f1ae26522532d8446a 100644 (file)
--- 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 a73246fa65988037304532dbbb11a8e224b9979c..014e1ee03d91b5458112941767a6633f097f97b9 100644 (file)
--- 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 09eba0791aff3fb624f018a89d3eca92f0a3a092..c1fea495ff64d473552c4f7b2cbe75d36ef873ae 100644 (file)
--- 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 3dd16dbec980dce7bb9d14cc5f40124a5a45a131..c8219e89a2a91d5f3d528d8ff61fca2b8114cb2f 100644 (file)
--- 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 32c092841d27e018a687ac00af289900485d2cdd..426db8b12fbb462ec27264e6f1bd8e9dc737531e 100644 (file)
--- 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 4b31fc21b7f08bcf6ed3f7f1affe4e524efd84d4..d8bff2225b09f8539e6e97ad886844b61ff7049e 100644 (file)
--- 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 cc5cc2ea881460d88dbc70a7e27417fab83bdfb4..a85162310e8484c884f3ae0f3d660cca728aa886 100644 (file)
--- 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 8fff69f34b68727509ed4c11fb86b6450faa61fc..4044a4a9ac9ec69cbd588e3a023c892676f0f979 100644 (file)
--- 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 f8bcfd0f6a9d9edbe64e29ca44db8cc855cb7fba..cff3aac2d25d82d01991e7bfb7555789ff37be14 100644 (file)
--- 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 414c784ec1ec8db798dfcbe8fecbbe3b9e1059bc..6d4e6c4e7987433938273be7f1fe3d5368763ae7 100644 (file)
--- 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 125633668dd4aa3329844cb10cac7976a9b69f82..20b31a2fb3d0032b0f9c723a073fca1f807fd687 100644 (file)
--- 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 e76c1c8d0ff92216684bbd23dc91522862aa164e..3d3443a2c9aba22b8273889b59542718bce25366 100644 (file)
--- 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 fb91fb05195785dbff3faced1b8dab6f2fc96c89..952bd9ed6855fdf770551551feb579c59ad85fe2 100644 (file)
--- 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 8a27af42f2c5f6c75232a89ef26f4f5c3b84da0c..42fa0968942e4969da9599a2e775e2e35e68d249 100644 (file)
--- 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 511079b03a48633cda95ba0896f7639ecaff1c49..7641a81012d99187183cbc05c4670916579259c4 100644 (file)
--- 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 aa09869436dcb8672c22e87cfc70b6d921914f8e..00af051cb626dcb5b801ddc7803a3956ad9736aa 100644 (file)
--- 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 046adc7adce26902731774fb37c81303f370a13f..7e4a193ab5b3258d578b7ed0c2171362e5948178 100644 (file)
--- 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 90f7f015612aaf905ef9fe36e9e5d4560f572e94..cb64dbcb31aeafd88f3cb0cc36135723eb147aed 100644 (file)
--- 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 dbdb313227eaa35f7b645c18b45aae174f98c034..c2aa82b47ec25c10348f2c6d7c749e0d1411c034 100644 (file)
--- 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 89a33cff525f29de24a7294a21efb6c51b0b8904..48ea456e482f5fa2601e0de9d1b2bdcfc6654168 100644 (file)
--- 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
-