[commit] r5745 - in trunk: documentation src src/mainboard/amd/dbm690t src/mainboard/amd/mahogany src/mainboard/asrock/939a785gmh src/northbridge/amd/amdfam10 src/northbridge/amd/amdk8 src/northbri...

[repository service]

Author: stepan
Date: Fri Aug 27 11:36:41 2010
New Revision: 5745
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5745

Log:
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

Modified:
   trunk/documentation/Kconfig.tex
   trunk/src/Kconfig
   trunk/src/mainboard/amd/dbm690t/Kconfig
   trunk/src/mainboard/amd/mahogany/Kconfig
   trunk/src/mainboard/asrock/939a785gmh/Kconfig
   trunk/src/northbridge/amd/amdfam10/Kconfig
   trunk/src/northbridge/amd/amdk8/Kconfig
   trunk/src/northbridge/amd/lx/Kconfig
   trunk/src/northbridge/intel/e7501/Kconfig
   trunk/src/northbridge/intel/e7520/Kconfig
   trunk/src/northbridge/intel/e7525/Kconfig
   trunk/src/northbridge/intel/i3100/Kconfig
   trunk/src/northbridge/intel/i440bx/Kconfig
   trunk/src/northbridge/intel/i440lx/Kconfig
   trunk/src/northbridge/intel/i82810/Kconfig
   trunk/src/northbridge/intel/i82830/Kconfig
   trunk/src/northbridge/intel/i855/Kconfig
   trunk/src/northbridge/intel/i945/Kconfig
   trunk/src/northbridge/via/cn400/Kconfig
   trunk/src/northbridge/via/cn400/vga.c
   trunk/src/northbridge/via/cn700/Kconfig
   trunk/src/northbridge/via/cx700/Kconfig
   trunk/src/northbridge/via/vt8601/Kconfig
   trunk/src/northbridge/via/vt8623/Kconfig
   trunk/src/northbridge/via/vx800/Kconfig

Modified: trunk/documentation/Kconfig.tex
==============================================================================
--- trunk/documentation/Kconfig.tex	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/documentation/Kconfig.tex	Fri Aug 27 11:36:41 2010	(r5745)
@@ -420,10 +420,6 @@
 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.

Modified: trunk/src/Kconfig
==============================================================================
--- trunk/src/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -250,27 +250,6 @@
 #
 # 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 @@
    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

Modified: trunk/src/mainboard/amd/dbm690t/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/dbm690t/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/mainboard/amd/dbm690t/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -24,11 +24,6 @@
    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

Modified: trunk/src/mainboard/amd/mahogany/Kconfig
==============================================================================
--- trunk/src/mainboard/amd/mahogany/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/mainboard/amd/mahogany/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -26,11 +26,6 @@
    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

Modified: trunk/src/mainboard/asrock/939a785gmh/Kconfig
==============================================================================
--- trunk/src/mainboard/asrock/939a785gmh/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/mainboard/asrock/939a785gmh/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -27,11 +27,6 @@
    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

Modified: trunk/src/northbridge/amd/amdfam10/Kconfig
==============================================================================
--- trunk/src/northbridge/amd/amdfam10/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/amd/amdfam10/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -21,7 +21,6 @@
    bool
    select HAVE_DEBUG_RAM_SETUP
    select HAVE_DEBUG_SMBUS
-	select HAVE_HIGH_TABLES
    select HYPERTRANSPORT_PLUGIN_SUPPORT
    select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX

Modified: trunk/src/northbridge/amd/amdk8/Kconfig
==============================================================================
--- trunk/src/northbridge/amd/amdk8/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/amd/amdk8/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -21,7 +21,6 @@
    bool
    select HAVE_DEBUG_RAM_SETUP
    select HAVE_DEBUG_SMBUS
-	select HAVE_HIGH_TABLES
    select HYPERTRANSPORT_PLUGIN_SUPPORT

config AGP_APERTURE_SIZE

Modified: trunk/src/northbridge/amd/lx/Kconfig
==============================================================================
--- trunk/src/northbridge/amd/lx/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/amd/lx/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,6 +1,5 @@
 config NORTHBRIDGE_AMD_LX
    bool
-	select HAVE_HIGH_TABLES
    select GEODE_VSA

config VIDEO_MB

Modified: trunk/src/northbridge/intel/e7501/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/e7501/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/e7501/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,5 +1,4 @@
 config NORTHBRIDGE_INTEL_E7501
    bool
    select HAVE_DEBUG_RAM_SETUP
-	select HAVE_HIGH_TABLES

Modified: trunk/src/northbridge/intel/e7520/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/e7520/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/e7520/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,4 +1,3 @@
 config NORTHBRIDGE_INTEL_E7520
    bool
-	select HAVE_HIGH_TABLES

Modified: trunk/src/northbridge/intel/e7525/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/e7525/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/e7525/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,4 +1,3 @@
 config NORTHBRIDGE_INTEL_E7525
    bool
-	select HAVE_HIGH_TABLES

Modified: trunk/src/northbridge/intel/i3100/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/i3100/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/i3100/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,4 +1,3 @@
 config NORTHBRIDGE_INTEL_I3100
    bool
-	select HAVE_HIGH_TABLES

Modified: trunk/src/northbridge/intel/i440bx/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/i440bx/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/i440bx/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -20,7 +20,6 @@
 config NORTHBRIDGE_INTEL_I440BX
    bool
    select HAVE_DEBUG_RAM_SETUP
-	select HAVE_HIGH_TABLES

config SDRAMPWR_4DIMM
    bool

Modified: trunk/src/northbridge/intel/i440lx/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/i440lx/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/i440lx/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -19,5 +19,4 @@

config NORTHBRIDGE_INTEL_I440LX
    bool
-	select HAVE_HIGH_TABLES

Modified: trunk/src/northbridge/intel/i82810/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/i82810/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/i82810/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -20,7 +20,6 @@
 config NORTHBRIDGE_INTEL_I82810
    bool
    select HAVE_DEBUG_RAM_SETUP
-	select HAVE_HIGH_TABLES

choice
    prompt "Onboard graphics"

Modified: trunk/src/northbridge/intel/i82830/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/i82830/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/i82830/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,7 +1,6 @@
 config NORTHBRIDGE_INTEL_I82830
    bool
    select HAVE_DEBUG_RAM_SETUP
-	select HAVE_HIGH_TABLES

choice
    prompt "Onboard graphics"

Modified: trunk/src/northbridge/intel/i855/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/i855/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/i855/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,4 +1,3 @@
 config NORTHBRIDGE_INTEL_I855
    bool
-	select HAVE_HIGH_TABLES

Modified: trunk/src/northbridge/intel/i945/Kconfig
==============================================================================
--- trunk/src/northbridge/intel/i945/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/intel/i945/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -20,7 +20,6 @@
 config NORTHBRIDGE_INTEL_I945
    bool
    select HAVE_DEBUG_RAM_SETUP
-	select HAVE_HIGH_TABLES

config FALLBACK_VGA_BIOS_ID
    string

Modified: trunk/src/northbridge/via/cn400/Kconfig
==============================================================================
--- trunk/src/northbridge/via/cn400/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/via/cn400/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -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

Modified: trunk/src/northbridge/via/cn400/vga.c
==============================================================================
--- trunk/src/northbridge/via/cn400/vga.c	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/via/cn400/vga.c	Fri Aug 27 11:36:41 2010	(r5745)
@@ -83,23 +83,6 @@

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 @@
    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;

Modified: trunk/src/northbridge/via/cn700/Kconfig
==============================================================================
--- trunk/src/northbridge/via/cn700/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/via/cn700/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,7 +1,6 @@
 config NORTHBRIDGE_VIA_CN700
    bool
    select HAVE_DEBUG_RAM_SETUP
-	select HAVE_HIGH_TABLES

config FALLBACK_SIZE
    int

Modified: trunk/src/northbridge/via/cx700/Kconfig
==============================================================================
--- trunk/src/northbridge/via/cx700/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/via/cx700/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -2,7 +2,6 @@
    bool
    select HAVE_DEBUG_RAM_SETUP
    select HAVE_DEBUG_SMBUS
-	select HAVE_HIGH_TABLES
    select HAVE_HARD_RESET
    select IOAPIC
    select SMP

Modified: trunk/src/northbridge/via/vt8601/Kconfig
==============================================================================
--- trunk/src/northbridge/via/vt8601/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/via/vt8601/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,9 +1,3 @@
 config NORTHBRIDGE_VIA_VT8601
    bool
-	select HAVE_HIGH_TABLES
-
-config FALLBACK_SIZE
-	int
-	default 0
-	depends on NORTHBRIDGE_VIA_VT8601

Modified: trunk/src/northbridge/via/vt8623/Kconfig
==============================================================================
--- trunk/src/northbridge/via/vt8623/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/via/vt8623/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -1,9 +1,3 @@
 config NORTHBRIDGE_VIA_VT8623
    bool
-	select HAVE_HIGH_TABLES
-
-config FALLBACK_SIZE
-	int
-	default 0
-	depends on NORTHBRIDGE_VIA_VT8623

Modified: trunk/src/northbridge/via/vx800/Kconfig
==============================================================================
--- trunk/src/northbridge/via/vx800/Kconfig	Thu Aug 26 20:24:04 2010	(r5744)
+++ trunk/src/northbridge/via/vx800/Kconfig	Fri Aug 27 11:36:41 2010	(r5745)
@@ -3,8 +3,3 @@
    select HAVE_DEBUG_RAM_SETUP
    select HAVE_DEBUG_SMBUS

-config FALLBACK_SIZE
-	int
-	default 0
-	depends on NORTHBRIDGE_VIA_VX800
-