Add kconfig menus for most chipset VIDEO_MB values.

VIDEO_MB is a variable that defines how many MB of RAM will be used
for onboard graphics frame buffer. It's northbridge-dependent which
values for CONFIG_MB are valid (but not board-dependent).

This patch adds choices for menuconfig to select the VIDEO_MB value for:

 - Intel 82810
 - Intel 82830
 - VIA CN400
 - VIA CN700

Note: CN400 and CN700 are based on the CX700 datasheet, not sure if they're
correct. If somebody has CN400 and CN700 datasheets, please verify.

We drop all per-board VIDEO_MB variables in per-board Kconfig files as
there's a northbridge-specific option/default now (plus the user can override
the value if needed in menuconfig).

As CONFIG_MB is chipset-specific but not board-specific (and never was), filter
it in util/compareboard/compareboard, we don't need to match those values.

Finally, put "CPU", "Northbridge", "Southbridge", "Super I/O", and
"Devices" sections into the "Chipset" menu, where NB-specific
options will appear if you select a board using a certain NB,
SB-specific options would appear in the "Southbridge" section etc.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Myles Watson <mylesgw@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4866 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2009-10-26 21:42:13 +00:00
parent 123a684ce6
commit 63a8f2a7c2
23 changed files with 130 additions and 89 deletions

View File

@ -52,11 +52,21 @@ endmenu
source src/mainboard/Kconfig source src/mainboard/Kconfig
source src/arch/i386/Kconfig source src/arch/i386/Kconfig
source src/arch/ppc/Kconfig source src/arch/ppc/Kconfig
source src/northbridge/Kconfig
source src/devices/Kconfig menu "Chipset"
source src/southbridge/Kconfig
source src/superio/Kconfig comment "CPU"
source src/cpu/Kconfig source src/cpu/Kconfig
comment "Northbridge"
source src/northbridge/Kconfig
comment "Southbridge"
source src/southbridge/Kconfig
comment "Super I/O"
source src/superio/Kconfig
comment "Devices"
source src/devices/Kconfig
endmenu
config PCI_BUS_SEGN_BITS config PCI_BUS_SEGN_BITS
int int
@ -211,9 +221,10 @@ config IOAPIC
bool bool
default n default n
# TODO: Can probably be removed once all chipsets have kconfig options for it.
config VIDEO_MB config VIDEO_MB
default 0
int int
default 0
config USE_WATCHDOG_ON_BOOT config USE_WATCHDOG_ON_BOOT
bool bool

View File

@ -18,8 +18,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
menu "Devices"
config VGA_BRIDGE_SETUP config VGA_BRIDGE_SETUP
bool "Setup bridges on path to VGA adapter" bool "Setup bridges on path to VGA adapter"
default y default y
@ -82,8 +80,6 @@ config YABEL_DEBUG_FLAGS
help help
See debug.h for values 0 is no debug output, 0x31ff is _verbose_. See debug.h for values 0 is no debug output, 0x31ff is _verbose_.
endmenu
config CONSOLE_VGA_MULTI config CONSOLE_VGA_MULTI
bool bool
default n default n

View File

@ -50,8 +50,3 @@ config IRQ_SLOT_COUNT
default 8 default 8
depends on BOARD_ASUS_MEW_AM depends on BOARD_ASUS_MEW_AM
config VIDEO_MB
int
default 1
depends on BOARD_ASUS_MEW_AM

View File

@ -45,8 +45,3 @@ config IRQ_SLOT_COUNT
default 11 default 11
depends on BOARD_ASUS_MEW_VM depends on BOARD_ASUS_MEW_VM
config VIDEO_MB
int
default 1
depends on BOARD_ASUS_MEW_VM

View File

@ -25,11 +25,6 @@ config IRQ_SLOT_COUNT
default 10 default 10
depends on BOARD_BCOM_WINNETP680 depends on BOARD_BCOM_WINNETP680
config VIDEO_MB
int
default 32
depends on BOARD_BCOM_WINNETP680
config RAMBASE config RAMBASE
hex hex
default 0x4000 default 0x4000

View File

@ -53,8 +53,3 @@ config IRQ_SLOT_COUNT
default 3 default 3
depends on BOARD_HP_E_VECTRA_P2706T depends on BOARD_HP_E_VECTRA_P2706T
config VIDEO_MB
int
default 1
depends on BOARD_HP_E_VECTRA_P2706T

View File

@ -29,11 +29,6 @@ config MAINBOARD_PART_NUMBER
default "J7f24" default "J7f24"
depends on BOARD_JETWAY_J7F24 depends on BOARD_JETWAY_J7F24
config VIDEO_MB
int
default 32
depends on BOARD_JETWAY_J7F24
config RAMBASE config RAMBASE
hex hex
default 0x4000 default 0x4000

View File

@ -44,11 +44,6 @@ config APIC_ID_OFFSET
default 0x0 default 0x0
depends on BOARD_KONTRON_KT690 depends on BOARD_KONTRON_KT690
config VIDEO_MB
int
default 1
depends on BOARD_KONTRON_KT690
config LB_CKS_RANGE_END config LB_CKS_RANGE_END
int int
default 122 default 122

View File

@ -50,8 +50,3 @@ config IRQ_SLOT_COUNT
default 8 default 8
depends on BOARD_MITAC_6513WU depends on BOARD_MITAC_6513WU
config VIDEO_MB
int
default 1
depends on BOARD_MITAC_6513WU

View File

@ -49,8 +49,3 @@ config IRQ_SLOT_COUNT
default 4 default 4
depends on BOARD_MSI_MS_6178 depends on BOARD_MSI_MS_6178
config VIDEO_MB
int
default 1
depends on BOARD_MSI_MS_6178

View File

@ -50,8 +50,3 @@ config IRQ_SLOT_COUNT
default 5 default 5
depends on BOARD_NEC_POWERMATE_2000 depends on BOARD_NEC_POWERMATE_2000
config VIDEO_MB
int
default 1
depends on BOARD_NEC_POWERMATE_2000

View File

@ -30,8 +30,3 @@ config IRQ_SLOT_COUNT
default 7 default 7
depends on BOARD_RCA_RM4100 depends on BOARD_RCA_RM4100
config VIDEO_MB
int
default 0
depends on BOARD_RCA_RM4100

View File

@ -129,11 +129,6 @@ config RAMBASE
default 0x4000 default 0x4000
depends on BOARD_TECHNEXION_TIM5690 depends on BOARD_TECHNEXION_TIM5690
config VIDEO_MB
int
default 1
depends on BOARD_TECHNEXION_TIM5690
config HAVE_OPTION_TABLE config HAVE_OPTION_TABLE
bool bool
default n default n

View File

@ -29,8 +29,3 @@ config IRQ_SLOT_COUNT
default 7 default 7
depends on BOARD_THOMSON_IP1000 depends on BOARD_THOMSON_IP1000
config VIDEO_MB
int
default 0
depends on BOARD_THOMSON_IP1000

View File

@ -28,11 +28,6 @@ config MAINBOARD_PART_NUMBER
default "EPIA-CN" default "EPIA-CN"
depends on BOARD_VIA_EPIA_CN depends on BOARD_VIA_EPIA_CN
config VIDEO_MB
int
default 32
depends on BOARD_VIA_EPIA_CN
config RAMBASE config RAMBASE
hex hex
default 0x4000 default 0x4000

View File

@ -27,11 +27,6 @@ config MAINBOARD_PART_NUMBER
default "EPIA-M700" default "EPIA-M700"
depends on BOARD_VIA_EPIA_M700 depends on BOARD_VIA_EPIA_M700
config VIDEO_MB
int
default 64
depends on BOARD_VIA_EPIA_M700
config RAMBASE config RAMBASE
hex hex
default 0x4000 default 0x4000

View File

@ -31,11 +31,6 @@ config MAINBOARD_PART_NUMBER
default "EPIA-N" default "EPIA-N"
depends on BOARD_VIA_EPIA_N depends on BOARD_VIA_EPIA_N
config VIDEO_MB
int
default 32
depends on BOARD_VIA_EPIA_N
config RAMBASE config RAMBASE
hex hex
default 0x4000 default 0x4000

View File

@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
default "pc2500e" default "pc2500e"
depends on BOARD_VIA_PC2500E depends on BOARD_VIA_PC2500E
config VIDEO_MB
int
default 32
depends on BOARD_VIA_PC2500E
config RAMBASE config RAMBASE
hex hex
default 0x4000 default 0x4000

View File

@ -22,3 +22,24 @@ config NORTHBRIDGE_INTEL_I82810
bool bool
select HAVE_HIGH_TABLES select HAVE_HIGH_TABLES
choice
prompt "Onboard graphics"
default I810_VIDEO_MB_1MB
depends on NORTHBRIDGE_INTEL_I82810
config I810_VIDEO_MB_OFF
bool "Disabled, 0KB"
config I810_VIDEO_MB_512KB
bool "Enabled, 512KB"
config I810_VIDEO_MB_1MB
bool "Enabled, 1MB"
endchoice
config VIDEO_MB
int
default 0 if I810_VIDEO_MB_OFF
default 512 if I810_VIDEO_MB_512KB
default 1 if I810_VIDEO_MB_1MB
depends on NORTHBRIDGE_INTEL_I82810

View File

@ -2,3 +2,27 @@ config NORTHBRIDGE_INTEL_I82830
bool bool
select HAVE_HIGH_TABLES select HAVE_HIGH_TABLES
choice
prompt "Onboard graphics"
default I830_VIDEO_MB_8MB
depends on NORTHBRIDGE_INTEL_I82830
config I830_VIDEO_MB_OFF
bool "Disabled, 0KB"
config I830_VIDEO_MB_512KB
bool "Enabled, 512KB"
config I830_VIDEO_MB_1MB
bool "Enabled, 1MB"
config I830_VIDEO_MB_8MB
bool "Enabled, 8MB"
endchoice
config VIDEO_MB
int
default 0 if I830_VIDEO_MB_OFF
default 512 if I830_VIDEO_MB_512KB
default 1 if I830_VIDEO_MB_1MB
default 8 if I830_VIDEO_MB_8MB
depends on NORTHBRIDGE_INTEL_I82830

View File

@ -17,3 +17,36 @@ config PCI_ROM_RUN
default n default n
depends on NORTHBRIDGE_VIA_CN400 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
prompt "Onboard graphics"
default CN400_VIDEO_MB_32MB
depends on NORTHBRIDGE_VIA_CN400
# TODO: Disabling onboard graphics is not yet supported in the source code.
config CN400_VIDEO_MB_OFF
bool "Disabled, 0KB"
config CN400_VIDEO_MB_8MB
bool "Enabled, 8MB"
config CN400_VIDEO_MB_16MB
bool "Enabled, 16MB"
config CN400_VIDEO_MB_32MB
bool "Enabled, 32MB"
config CN400_VIDEO_MB_64MB
bool "Enabled, 64MB"
config CN400_VIDEO_MB_128MB
bool "Enabled, 128MB"
endchoice
config VIDEO_MB
int
default 0 if CN400_VIDEO_MB_OFF
default 8 if CN400_VIDEO_MB_8MB
default 16 if CN400_VIDEO_MB_16MB
default 32 if CN400_VIDEO_MB_32MB
default 64 if CN400_VIDEO_MB_64MB
default 128 if CN400_VIDEO_MB_128MB
depends on NORTHBRIDGE_VIA_CN400

View File

@ -17,3 +17,37 @@ config PCI_ROM_RUN
bool bool
default n default n
depends on NORTHBRIDGE_VIA_CN700 depends on NORTHBRIDGE_VIA_CN700
# TODO: Values are from the CX700 datasheet, not sure if this matches CN700.
# TODO: What should be the per-chipset default value here?
choice
prompt "Onboard graphics"
default CN700_VIDEO_MB_32MB
depends on NORTHBRIDGE_VIA_CN700
# TODO: Disabling onboard graphics is not yet supported in the code.
config CN700_VIDEO_MB_OFF
bool "Disabled, 0KB"
config CN700_VIDEO_MB_8MB
bool "Enabled, 8MB"
config CN700_VIDEO_MB_16MB
bool "Enabled, 16MB"
config CN700_VIDEO_MB_32MB
bool "Enabled, 32MB"
config CN700_VIDEO_MB_64MB
bool "Enabled, 64MB"
config CN700_VIDEO_MB_128MB
bool "Enabled, 128MB"
endchoice
config VIDEO_MB
int
default 0 if CN700_VIDEO_MB_OFF
default 8 if CN700_VIDEO_MB_8MB
default 16 if CN700_VIDEO_MB_16MB
default 32 if CN700_VIDEO_MB_32MB
default 64 if CN700_VIDEO_MB_64MB
default 128 if CN700_VIDEO_MB_128MB
depends on NORTHBRIDGE_VIA_CN700

View File

@ -44,6 +44,7 @@ sed \
-e "/^CONFIG_ROM_IMAGE_SIZE / d" \ -e "/^CONFIG_ROM_IMAGE_SIZE / d" \
-e "/^CONFIG_STACK_SIZE / d" \ -e "/^CONFIG_STACK_SIZE / d" \
-e "/^CONFIG_GDB_STUB / d" \ -e "/^CONFIG_GDB_STUB / d" \
-e "/^CONFIG_VIDEO_MB / d" \
$A/old > $A/old.filtered $A/old > $A/old.filtered
sed \ sed \
-e "/^CONFIG_VENDOR_/ d" \ -e "/^CONFIG_VENDOR_/ d" \
@ -67,6 +68,7 @@ sed \
-e "/^CONFIG_ROM_IMAGE_SIZE / d" \ -e "/^CONFIG_ROM_IMAGE_SIZE / d" \
-e "/^CONFIG_STACK_SIZE / d" \ -e "/^CONFIG_STACK_SIZE / d" \
-e "/^CONFIG_GDB_STUB / d" \ -e "/^CONFIG_GDB_STUB / d" \
-e "/^CONFIG_VIDEO_MB / d" \
$A/new > $A/new.filtered $A/new > $A/new.filtered
normalize $A/old.filtered > $A/old.normalized normalize $A/old.filtered > $A/old.normalized