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
This commit is contained in:
parent
78265d5609
commit
b3f8090f4e
|
@ -420,10 +420,6 @@ config NORTHBRIDGE_AMD_AMDK8
|
||||||
config AGP_APERTURE_SIZE
|
config AGP_APERTURE_SIZE
|
||||||
hex
|
hex
|
||||||
default 0x4000000
|
default 0x4000000
|
||||||
|
|
||||||
config HAVE_HIGH_TABLES
|
|
||||||
int
|
|
||||||
default 1
|
|
||||||
\end{verbatim}
|
\end{verbatim}
|
||||||
\subsubsection{northbridge/$<$vendor$>$/$<$chip$>$/Makefile.inc}
|
\subsubsection{northbridge/$<$vendor$>$/$<$chip$>$/Makefile.inc}
|
||||||
Typically very small set of rules, and very simple.
|
Typically very small set of rules, and very simple.
|
||||||
|
|
26
src/Kconfig
26
src/Kconfig
|
@ -250,27 +250,6 @@ config GFXUMA
|
||||||
#
|
#
|
||||||
# endmenu
|
# 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
|
config HAVE_ACPI_TABLES
|
||||||
bool
|
bool
|
||||||
help
|
help
|
||||||
|
@ -310,15 +289,10 @@ config GENERATE_PIRQ_TABLE
|
||||||
bool
|
bool
|
||||||
default HAVE_PIRQ_TABLE
|
default HAVE_PIRQ_TABLE
|
||||||
|
|
||||||
config WRITE_HIGH_TABLES
|
|
||||||
bool
|
|
||||||
default HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
menu "System tables"
|
menu "System tables"
|
||||||
|
|
||||||
config WRITE_HIGH_TABLES
|
config WRITE_HIGH_TABLES
|
||||||
bool "Write 'high' tables to avoid being overwritten in F segment"
|
bool "Write 'high' tables to avoid being overwritten in F segment"
|
||||||
depends on HAVE_HIGH_TABLES
|
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config MULTIBOOT
|
config MULTIBOOT
|
||||||
|
|
|
@ -24,11 +24,6 @@ config MAINBOARD_DIR
|
||||||
default amd/dbm690t
|
default amd/dbm690t
|
||||||
depends on BOARD_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
|
# This is a temporary fix, and should be removed when the race condition for
|
||||||
# building option_table.h is fixed.
|
# building option_table.h is fixed.
|
||||||
config WARNINGS_ARE_ERRORS
|
config WARNINGS_ARE_ERRORS
|
||||||
|
|
|
@ -26,11 +26,6 @@ config MAINBOARD_DIR
|
||||||
default amd/mahogany
|
default amd/mahogany
|
||||||
depends on BOARD_AMD_MAHOGANY
|
depends on BOARD_AMD_MAHOGANY
|
||||||
|
|
||||||
config HAVE_HIGH_TABLES
|
|
||||||
bool
|
|
||||||
default n
|
|
||||||
depends on BOARD_AMD_MAHOGANY
|
|
||||||
|
|
||||||
config DCACHE_RAM_BASE
|
config DCACHE_RAM_BASE
|
||||||
hex
|
hex
|
||||||
default 0xc8000
|
default 0xc8000
|
||||||
|
|
|
@ -27,11 +27,6 @@ config MAINBOARD_DIR
|
||||||
default asrock/939a785gmh
|
default asrock/939a785gmh
|
||||||
depends on BOARD_ASROCK_939A785GMH
|
depends on BOARD_ASROCK_939A785GMH
|
||||||
|
|
||||||
config HAVE_HIGH_TABLES
|
|
||||||
bool
|
|
||||||
default n
|
|
||||||
depends on BOARD_ASROCK_939A785GMH
|
|
||||||
|
|
||||||
config DCACHE_RAM_BASE
|
config DCACHE_RAM_BASE
|
||||||
hex
|
hex
|
||||||
default 0xc8000
|
default 0xc8000
|
||||||
|
|
|
@ -21,7 +21,6 @@ config NORTHBRIDGE_AMD_AMDFAM10
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_DEBUG_SMBUS
|
select HAVE_DEBUG_SMBUS
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
select HYPERTRANSPORT_PLUGIN_SUPPORT
|
select HYPERTRANSPORT_PLUGIN_SUPPORT
|
||||||
select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
|
select NORTHBRIDGE_AMD_AMDFAM10_ROOT_COMPLEX
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@ config NORTHBRIDGE_AMD_AMDK8
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_DEBUG_SMBUS
|
select HAVE_DEBUG_SMBUS
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
select HYPERTRANSPORT_PLUGIN_SUPPORT
|
select HYPERTRANSPORT_PLUGIN_SUPPORT
|
||||||
|
|
||||||
config AGP_APERTURE_SIZE
|
config AGP_APERTURE_SIZE
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
config NORTHBRIDGE_AMD_LX
|
config NORTHBRIDGE_AMD_LX
|
||||||
bool
|
bool
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
select GEODE_VSA
|
select GEODE_VSA
|
||||||
|
|
||||||
config VIDEO_MB
|
config VIDEO_MB
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
config NORTHBRIDGE_INTEL_E7501
|
config NORTHBRIDGE_INTEL_E7501
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
config NORTHBRIDGE_INTEL_E7520
|
config NORTHBRIDGE_INTEL_E7520
|
||||||
bool
|
bool
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
config NORTHBRIDGE_INTEL_E7525
|
config NORTHBRIDGE_INTEL_E7525
|
||||||
bool
|
bool
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
config NORTHBRIDGE_INTEL_I3100
|
config NORTHBRIDGE_INTEL_I3100
|
||||||
bool
|
bool
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
config NORTHBRIDGE_INTEL_I440BX
|
config NORTHBRIDGE_INTEL_I440BX
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
config SDRAMPWR_4DIMM
|
config SDRAMPWR_4DIMM
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -19,5 +19,4 @@
|
||||||
|
|
||||||
config NORTHBRIDGE_INTEL_I440LX
|
config NORTHBRIDGE_INTEL_I440LX
|
||||||
bool
|
bool
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
config NORTHBRIDGE_INTEL_I82810
|
config NORTHBRIDGE_INTEL_I82810
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "Onboard graphics"
|
prompt "Onboard graphics"
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
config NORTHBRIDGE_INTEL_I82830
|
config NORTHBRIDGE_INTEL_I82830
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "Onboard graphics"
|
prompt "Onboard graphics"
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
config NORTHBRIDGE_INTEL_I855
|
config NORTHBRIDGE_INTEL_I855
|
||||||
bool
|
bool
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@
|
||||||
config NORTHBRIDGE_INTEL_I945
|
config NORTHBRIDGE_INTEL_I945
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
config FALLBACK_VGA_BIOS_ID
|
config FALLBACK_VGA_BIOS_ID
|
||||||
string
|
string
|
||||||
|
|
|
@ -1,11 +1,6 @@
|
||||||
config NORTHBRIDGE_VIA_CN400
|
config NORTHBRIDGE_VIA_CN400
|
||||||
bool
|
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: Values are from the CX700 datasheet, not sure if this matches CN400.
|
||||||
# TODO: What should be the per-chipset default value here?
|
# TODO: What should be the per-chipset default value here?
|
||||||
choice
|
choice
|
||||||
|
|
|
@ -83,23 +83,6 @@ static void vga_init(device_t dev)
|
||||||
|
|
||||||
mainboard_interrupt_handlers(0x15, &via_cn400_int15_handler);
|
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. */
|
/* Set memory rate to 200 MHz. */
|
||||||
outb(0x3d, CRTM_INDEX);
|
outb(0x3d, CRTM_INDEX);
|
||||||
reg8 = inb(CRTM_DATA);
|
reg8 = inb(CRTM_DATA);
|
||||||
|
@ -138,11 +121,6 @@ static void vga_init(device_t dev)
|
||||||
outb(0x39, SR_INDEX);
|
outb(0x39, SR_INDEX);
|
||||||
outb(reg8, SR_DATA);
|
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
|
#ifdef DEBUG_CN400
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
config NORTHBRIDGE_VIA_CN700
|
config NORTHBRIDGE_VIA_CN700
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
config FALLBACK_SIZE
|
config FALLBACK_SIZE
|
||||||
int
|
int
|
||||||
|
|
|
@ -2,7 +2,6 @@ config NORTHBRIDGE_VIA_CX700
|
||||||
bool
|
bool
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_DEBUG_SMBUS
|
select HAVE_DEBUG_SMBUS
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
select HAVE_HARD_RESET
|
select HAVE_HARD_RESET
|
||||||
select IOAPIC
|
select IOAPIC
|
||||||
select SMP
|
select SMP
|
||||||
|
|
|
@ -1,9 +1,3 @@
|
||||||
config NORTHBRIDGE_VIA_VT8601
|
config NORTHBRIDGE_VIA_VT8601
|
||||||
bool
|
bool
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
config FALLBACK_SIZE
|
|
||||||
int
|
|
||||||
default 0
|
|
||||||
depends on NORTHBRIDGE_VIA_VT8601
|
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,3 @@
|
||||||
config NORTHBRIDGE_VIA_VT8623
|
config NORTHBRIDGE_VIA_VT8623
|
||||||
bool
|
bool
|
||||||
select HAVE_HIGH_TABLES
|
|
||||||
|
|
||||||
config FALLBACK_SIZE
|
|
||||||
int
|
|
||||||
default 0
|
|
||||||
depends on NORTHBRIDGE_VIA_VT8623
|
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,3 @@ config NORTHBRIDGE_VIA_VX800
|
||||||
select HAVE_DEBUG_RAM_SETUP
|
select HAVE_DEBUG_RAM_SETUP
|
||||||
select HAVE_DEBUG_SMBUS
|
select HAVE_DEBUG_SMBUS
|
||||||
|
|
||||||
config FALLBACK_SIZE
|
|
||||||
int
|
|
||||||
default 0
|
|
||||||
depends on NORTHBRIDGE_VIA_VX800
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue