diff options
23 files changed, 128 insertions, 87 deletions
diff --git a/src/Kconfig b/src/Kconfig index b53a2daa22..2e2bb25d1a 100644 --- 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 1bfd2d289b..96084f95b2 100644 --- 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 86208cef6d..dcc56fa184 100644 --- 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 d1dde20ec1..693fa7baaf 100644 --- 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 05db9dec6f..0dce8af9cf 100644 --- 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 909532c765..74b101a9eb 100644 --- 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 ac0403ff50..6890f1a45e 100644 --- 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 f857153def..8fe55b86c3 100644 --- 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 e4e686639e..95a0924d8e 100644 --- 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 5e417a4c94..7da2d77d80 100644 --- 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 785c49b306..175c6958da 100644 --- 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 5768330fe1..e3381a8596 100644 --- 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 f14a67f26f..0dda275922 100644 --- 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 3e1c75a138..3a41216292 100644 --- 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 832b7e7d39..284e425c45 100644 --- 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 4328e6e1b8..f711987ba0 100644 --- 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 13446cc227..229655a149 100644 --- 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 a7d1eeb079..4f9a2bae57 100644 --- 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 d55ed25cf4..dc939b42d2 100644 --- 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 3c57a2e96d..21072a1c39 100644 --- 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 c210d934a1..67703c9ebe 100644 --- 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 09c1c963f8..8795d770b2 100644 --- 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 292e55f698..8023954337 100755 --- 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 |