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

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

diff --git a/src/devices/Kconfig b/src/devices/Kconfig
index 1bfd2d289bfc51950a0df5fc716ddf7041a2d05b..96084f95b2c3806038b2752572c7ce9b8ec0a0ca 100644 (file)
--- a/src/devices/Kconfig
+++ b/src/devices/Kconfig
@@ -18,8 +18,6 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-menu "Devices"
-
 config VGA_BRIDGE_SETUP
        bool "Setup bridges on path to VGA adapter"
        default y
@@ -82,8 +80,6 @@ config YABEL_DEBUG_FLAGS
        help
          See debug.h for values 0 is no debug output, 0x31ff is _verbose_.
 
-endmenu
-
 config CONSOLE_VGA_MULTI
        bool
        default n

diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index 86208cef6d237bb21d402412a4c41db4ff250771..dcc56fa1844e61bbebfad3d91dbee3137fa066fc 100644 (file)
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -50,8 +50,3 @@ config IRQ_SLOT_COUNT
        default 8
        depends on BOARD_ASUS_MEW_AM
 
-config VIDEO_MB
-       int
-       default 1
-       depends on BOARD_ASUS_MEW_AM
-

diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index d1dde20ec1be414082c61aa7a340a899d4050f47..693fa7baaf7e9b0f8820eea3b4d4f89c902c607d 100644 (file)
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -45,8 +45,3 @@ config IRQ_SLOT_COUNT
        default 11
        depends on BOARD_ASUS_MEW_VM
 
-config VIDEO_MB
-       int
-       default 1
-       depends on BOARD_ASUS_MEW_VM
-

diff --git a/src/mainboard/bcom/winnetp680/Kconfig b/src/mainboard/bcom/winnetp680/Kconfig
index 05db9dec6fde2d3ed93e21a5d9467ab98028d841..0dce8af9cf54b4330fcc873a2b2b4613a7b5434d 100644 (file)
--- a/src/mainboard/bcom/winnetp680/Kconfig
+++ b/src/mainboard/bcom/winnetp680/Kconfig
@@ -25,11 +25,6 @@ config IRQ_SLOT_COUNT
        default 10
        depends on BOARD_BCOM_WINNETP680
 
-config VIDEO_MB
-       int
-       default 32
-       depends on BOARD_BCOM_WINNETP680
-
 config RAMBASE
        hex
        default 0x4000

diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig
index 909532c7651cb6a2e552ce2c82f9307a728b3d76..74b101a9ebef03f4f9e3e117c850115c3d0041be 100644 (file)
--- a/src/mainboard/hp/e_vectra_p2706t/Kconfig
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig
@@ -53,8 +53,3 @@ config IRQ_SLOT_COUNT
        default 3
        depends on BOARD_HP_E_VECTRA_P2706T
 
-config VIDEO_MB
-       int
-       default 1
-       depends on BOARD_HP_E_VECTRA_P2706T
-

diff --git a/src/mainboard/jetway/j7f24/Kconfig b/src/mainboard/jetway/j7f24/Kconfig
index ac0403ff504a7749364792d3e62527a33551a988..6890f1a45eade43de7ac9319a3e1132a4420b177 100644 (file)
--- a/src/mainboard/jetway/j7f24/Kconfig
+++ b/src/mainboard/jetway/j7f24/Kconfig
@@ -29,11 +29,6 @@ config MAINBOARD_PART_NUMBER
        default "J7f24"
        depends on BOARD_JETWAY_J7F24
 
-config VIDEO_MB
-       int
-       default 32
-       depends on BOARD_JETWAY_J7F24
-
 config RAMBASE
        hex
        default 0x4000

diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index f857153def870af3dee992065b3cc6228d87b285..8fe55b86c32664538ccc4fc770da253328049935 100644 (file)
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -44,11 +44,6 @@ config APIC_ID_OFFSET
        default 0x0
        depends on BOARD_KONTRON_KT690
 
-config VIDEO_MB
-       int
-       default 1
-       depends on BOARD_KONTRON_KT690
-
 config LB_CKS_RANGE_END
        int
        default 122

diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig
index e4e686639e5f0459644778f4495f3552bcf8f5db..95a0924d8ea08466026218d85cca6998db4bdceb 100644 (file)
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -50,8 +50,3 @@ config IRQ_SLOT_COUNT
        default 8
        depends on BOARD_MITAC_6513WU
 
-config VIDEO_MB
-       int
-       default 1
-       depends on BOARD_MITAC_6513WU
-

diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index 5e417a4c94606032d555201e5e4e6ac3c75e1a64..7da2d77d802cdbaa401a51c4d5e83c8249a4968e 100644 (file)
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/Kconfig
@@ -49,8 +49,3 @@ config IRQ_SLOT_COUNT
        default 4
        depends on BOARD_MSI_MS_6178
 
-config VIDEO_MB
-       int
-       default 1
-       depends on BOARD_MSI_MS_6178
-

diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 785c49b30677dd6cd824a4efeed6d79f413a2049..175c6958da4c46eedaddf7784cfdc41e7f69280c 100644 (file)
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -50,8 +50,3 @@ config IRQ_SLOT_COUNT
        default 5
        depends on BOARD_NEC_POWERMATE_2000
 
-config VIDEO_MB
-       int
-       default 1
-       depends on BOARD_NEC_POWERMATE_2000
-

diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig
index 5768330fe102a406327a357528070ac6d3033269..e3381a8596b9dfca98b959ab69096451a1166bdb 100644 (file)
--- a/src/mainboard/rca/rm4100/Kconfig
+++ b/src/mainboard/rca/rm4100/Kconfig
@@ -30,8 +30,3 @@ config IRQ_SLOT_COUNT
        default 7
        depends on BOARD_RCA_RM4100
 
-config VIDEO_MB
-       int
-       default 0
-       depends on BOARD_RCA_RM4100
-

diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig
index f14a67f26f0063bb18297f9207443f3e64574bda..0dda2759228120a26d112f36f9e4c790f8fa94e7 100644 (file)
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -129,11 +129,6 @@ config RAMBASE
        default 0x4000
        depends on BOARD_TECHNEXION_TIM5690
 
-config VIDEO_MB
-       int
-       default 1
-       depends on BOARD_TECHNEXION_TIM5690
-
 config HAVE_OPTION_TABLE
        bool
        default n

diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index 3e1c75a1385ef4b4f8e8860ab19d9c7e8cc9308d..3a41216292dca48113d94ecd37458b6f8200f71f 100644 (file)
--- a/src/mainboard/thomson/ip1000/Kconfig
+++ b/src/mainboard/thomson/ip1000/Kconfig
@@ -29,8 +29,3 @@ config IRQ_SLOT_COUNT
        default 7
        depends on BOARD_THOMSON_IP1000
 
-config VIDEO_MB
-       int
-       default 0
-       depends on BOARD_THOMSON_IP1000
-

diff --git a/src/mainboard/via/epia-cn/Kconfig b/src/mainboard/via/epia-cn/Kconfig
index 832b7e7d399d730dbf4d51a1d9fe552950a39ebe..284e425c45bfd45abe3efd28976d8124cc1a7f32 100644 (file)
--- a/src/mainboard/via/epia-cn/Kconfig
+++ b/src/mainboard/via/epia-cn/Kconfig
@@ -28,11 +28,6 @@ config MAINBOARD_PART_NUMBER
        default "EPIA-CN"
        depends on BOARD_VIA_EPIA_CN
 
-config VIDEO_MB
-       int
-       default 32
-       depends on BOARD_VIA_EPIA_CN
-
 config RAMBASE
        hex
        default 0x4000

diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig
index 4328e6e1b89c6295905d66ad46965e5e08fc98c1..f711987ba0099903ffac101adb651559a61f15a5 100644 (file)
--- a/src/mainboard/via/epia-m700/Kconfig
+++ b/src/mainboard/via/epia-m700/Kconfig
@@ -27,11 +27,6 @@ config MAINBOARD_PART_NUMBER
        default "EPIA-M700"
        depends on BOARD_VIA_EPIA_M700
 
-config VIDEO_MB
-       int
-       default 64
-       depends on BOARD_VIA_EPIA_M700
-
 config RAMBASE
        hex
        default 0x4000

diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig
index 13446cc2277bea57273d87df6288f4ac1fd65221..229655a149c9a74e17b76e3154a5b823f991120e 100644 (file)
--- a/src/mainboard/via/epia-n/Kconfig
+++ b/src/mainboard/via/epia-n/Kconfig
@@ -31,11 +31,6 @@ config MAINBOARD_PART_NUMBER
        default "EPIA-N"
        depends on BOARD_VIA_EPIA_N
 
-config VIDEO_MB
-       int
-       default 32
-       depends on BOARD_VIA_EPIA_N
-
 config RAMBASE
        hex
        default 0x4000

diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index a7d1eeb079826c959dcc980fe4fc61cd5dfcfd8b..4f9a2bae573be0a66a1461ef0da92fec2f20e5bf 100644 (file)
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -22,11 +22,6 @@ config MAINBOARD_PART_NUMBER
        default "pc2500e"
        depends on BOARD_VIA_PC2500E
 
-config VIDEO_MB
-       int
-       default 32
-       depends on BOARD_VIA_PC2500E
-
 config RAMBASE
        hex
        default 0x4000

diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig
index d55ed25cf47225cf70ee0f08556881ab56f79206..dc939b42d2b18efbd40dd1725407213f25cb7ca4 100644 (file)
--- a/src/northbridge/intel/i82810/Kconfig
+++ b/src/northbridge/intel/i82810/Kconfig
@@ -22,3 +22,24 @@ config NORTHBRIDGE_INTEL_I82810
        bool
        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
+

diff --git a/src/northbridge/intel/i82830/Kconfig b/src/northbridge/intel/i82830/Kconfig
index 3c57a2e96d752aa11f454828d886a945c1abfd9e..21072a1c393419c4126db61bbd0c1617a5353ac7 100644 (file)
--- a/src/northbridge/intel/i82830/Kconfig
+++ b/src/northbridge/intel/i82830/Kconfig
@@ -2,3 +2,27 @@ config NORTHBRIDGE_INTEL_I82830
        bool
        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
+

diff --git a/src/northbridge/via/cn400/Kconfig b/src/northbridge/via/cn400/Kconfig
index c210d934a1e8032ab84c59653e3c0a1dcba8eb49..67703c9ebe86bb17d565c7b37201067b8702a933 100644 (file)
--- a/src/northbridge/via/cn400/Kconfig
+++ b/src/northbridge/via/cn400/Kconfig
@@ -17,3 +17,36 @@ config PCI_ROM_RUN
        default n
        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
+

diff --git a/src/northbridge/via/cn700/Kconfig b/src/northbridge/via/cn700/Kconfig
index 09c1c963f88a4e75490b88b511876a6336e1943a..8795d770b292c538620da33df5b8432a1cd1bde5 100644 (file)
--- a/src/northbridge/via/cn700/Kconfig
+++ b/src/northbridge/via/cn700/Kconfig
@@ -17,3 +17,37 @@ config PCI_ROM_RUN
        bool
        default n
        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
+

diff --git a/util/compareboard/compareboard b/util/compareboard/compareboard
index 292e55f698f6f6ec8591a036cb5cd3c2704e4c48..802395433781407dbd62046fd0b900b3027ff32a 100755 (executable)
--- a/util/compareboard/compareboard
+++ b/util/compareboard/compareboard
@@ -44,6 +44,7 @@ sed \
        -e "/^CONFIG_ROM_IMAGE_SIZE / d" \
        -e "/^CONFIG_STACK_SIZE / d" \
        -e "/^CONFIG_GDB_STUB / d" \
+       -e "/^CONFIG_VIDEO_MB / d" \
        $A/old > $A/old.filtered
 sed \
        -e "/^CONFIG_VENDOR_/ d" \
@@ -67,6 +68,7 @@ sed \
        -e "/^CONFIG_ROM_IMAGE_SIZE / d" \
        -e "/^CONFIG_STACK_SIZE / d" \
        -e "/^CONFIG_GDB_STUB / d" \
+       -e "/^CONFIG_VIDEO_MB / d" \
        $A/new > $A/new.filtered
 
 normalize $A/old.filtered > $A/old.normalized