From 869bbc46166bdfe0b785b5a64ebcea2f167e1b0c Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Wed, 7 Oct 2009 16:29:12 +0000 Subject: Convert all "default y" options to "select FOO" (shorter). Also, drop per-board CONSOLE_VGA/PCI_ROM_RUN while I'm at it, they're global options in kconfig. Signed-off-by: Uwe Hermann Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4735 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/amd/serengeti_cheetah/Kconfig | 56 ++++------------------------- src/mainboard/intel/xe7501devkit/Kconfig | 6 +--- src/mainboard/msi/ms7135/Kconfig | 12 ++----- src/mainboard/msi/ms9185/Kconfig | 22 ++---------- src/mainboard/newisys/khepri/Kconfig | 22 ++---------- src/mainboard/sunw/ultra40/Kconfig | 22 ++---------- src/mainboard/supermicro/h8dme/Kconfig | 22 ++---------- src/mainboard/tyan/s2881/Kconfig | 12 ++----- src/mainboard/tyan/s2891/Kconfig | 13 ++----- src/mainboard/tyan/s2892/Kconfig | 13 ++----- src/mainboard/tyan/s2895/Kconfig | 13 ++----- src/mainboard/via/epia-n/Kconfig | 5 +-- 12 files changed, 29 insertions(+), 189 deletions(-) diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index e04c01922d..bae96ecd73 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -11,6 +11,12 @@ config BOARD_AMD_SERENGETI_CHEETAH select HAVE_PIRQ_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM + select HAVE_HARD_RESET + select IOAPIC + select MEM_TRAIN_SEQ + select AP_CODE_IN_CAR + select SB_HT_CHAIN_UNITID_OFFSET_ONLY + select WAIT_BEFORE_CPUS_INIT config MAINBOARD_DIR string @@ -37,16 +43,6 @@ config APIC_ID_OFFSET default 0x8 depends on BOARD_AMD_SERENGETI_CHEETAH -config HAVE_HARD_RESET - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - -config IOAPIC - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - config LB_CKS_RANGE_END int default 122 @@ -67,11 +63,6 @@ config HW_MEM_HOLE_SIZEK default 0x100000 depends on BOARD_AMD_SERENGETI_CHEETAH -config MEM_TRAIN_SEQ - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - config MAX_CPUS int default 8 @@ -82,26 +73,11 @@ config MAX_PHYSICAL_CPUS default 4 depends on BOARD_AMD_SERENGETI_CHEETAH -config MEM_TRAIN_SEQ - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - -config AP_CODE_IN_CAR - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - config HW_MEM_HOLE_SIZE_AUTO_INC bool default n depends on BOARD_AMD_SERENGETI_CHEETAH -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - config SB_HT_CHAIN_ON_BUS0 int default 2 @@ -127,26 +103,6 @@ config SERIAL_CPU_INIT default n depends on BOARD_AMD_SERENGETI_CHEETAH -config AP_CODE_IN_CAR - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - -config WAIT_BEFORE_CPUS_INIT - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - -config CONSOLE_VGA - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - -config PCI_ROM_RUN - bool - default y - depends on BOARD_AMD_SERENGETI_CHEETAH - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig index 13f8dd337f..bdae9adebb 100644 --- a/src/mainboard/intel/xe7501devkit/Kconfig +++ b/src/mainboard/intel/xe7501devkit/Kconfig @@ -8,6 +8,7 @@ config BOARD_INTEL_XE7501DEVKIT select SUPERIO_SMSC_LPC47B272 select HAVE_PIRQ_TABLE select UDELAY_TSC + select HAVE_OPTION_TABLE config MAINBOARD_DIR string @@ -34,11 +35,6 @@ config MAINBOARD_PART_NUMBER default "EIDXE7501DEVKIT" depends on BOARD_INTEL_XE7501DEVKIT -config HAVE_OPTION_TABLE - bool - default y - depends on BOARD_INTEL_XE7501DEVKIT - config IRQ_SLOT_COUNT int default 12 diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig index 18a902f96a..fef2cf0aac 100644 --- a/src/mainboard/msi/ms7135/Kconfig +++ b/src/mainboard/msi/ms7135/Kconfig @@ -10,6 +10,8 @@ config BOARD_MSI_MS7135 select PIRQ_TABLE select USE_DCACHE_RAM select USE_PRINTK_IN_CAR + select SERIAL_CPU_INIT + select AP_CODE_IN_CAR config MAINBOARD_DIR string @@ -96,16 +98,6 @@ config USE_INIT default n depends on BOARD_MSI_MS7135 -config SERIAL_CPU_INIT - bool - default y - depends on BOARD_MSI_MS7135 - -config AP_CODE_IN_CAR - bool - default y - depends on BOARD_MSI_MS7135 - config WAIT_BEFORE_CPUS_INIT bool default n diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig index ab440ba2e7..4cfda645b3 100644 --- a/src/mainboard/msi/ms9185/Kconfig +++ b/src/mainboard/msi/ms9185/Kconfig @@ -11,6 +11,8 @@ config BOARD_MSI_MS9185 select HAVE_PIRQ_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM + select HAVE_HARD_RESET + select IOAPIC config MAINBOARD_DIR string @@ -37,16 +39,6 @@ config APIC_ID_OFFSET default 0x10 depends on BOARD_MSI_MS9185 -config HAVE_HARD_RESET - bool - default y - depends on BOARD_MSI_MS9185 - -config IOAPIC - bool - default y - depends on BOARD_MSI_MS9185 - config SB_HT_CHAIN_ON_BUS0 int default 2 @@ -107,16 +99,6 @@ config SB_HT_CHAIN_ON_BUS0 default 2 depends on BOARD_MSI_MS9185 -config CONSOLE_VGA - bool - default y - depends on BOARD_MSI_MS9185 - -config PCI_ROM_RUN - bool - default y - depends on BOARD_MSI_MS9185 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig index 312a85764c..84285ff322 100644 --- a/src/mainboard/newisys/khepri/Kconfig +++ b/src/mainboard/newisys/khepri/Kconfig @@ -11,6 +11,8 @@ config BOARD_NEWISYS_KHEPRI select HAVE_PIRQ_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM + select HAVE_HARD_RESET + select IOAPIC config MAINBOARD_DIR string @@ -32,16 +34,6 @@ config APIC_ID_OFFSET default 0x10 depends on BOARD_NEWISYS_KHEPRI -config HAVE_HARD_RESET - bool - default y - depends on BOARD_NEWISYS_KHEPRI - -config IOAPIC - bool - default y - depends on BOARD_NEWISYS_KHEPRI - config K8_REV_F_SUPPORT bool default n @@ -107,16 +99,6 @@ config SB_HT_CHAIN_ON_BUS0 default 2 depends on BOARD_NEWISYS_KHEPRI -config CONSOLE_VGA - bool - default y - depends on BOARD_NEWISYS_KHEPRI - -config PCI_ROM_RUN - bool - default y - depends on BOARD_NEWISYS_KHEPRI - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig index 89fa61971d..bc4513b09a 100644 --- a/src/mainboard/sunw/ultra40/Kconfig +++ b/src/mainboard/sunw/ultra40/Kconfig @@ -10,6 +10,8 @@ config BOARD_SUNW_ULTRA40 select HAVE_PIRQ_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM + select HAVE_HARD_RESET + select IOAPIC config MAINBOARD_DIR string @@ -31,16 +33,6 @@ config APIC_ID_OFFSET default 0x10 depends on BOARD_SUNW_ULTRA40 -config HAVE_HARD_RESET - bool - default y - depends on BOARD_SUNW_ULTRA40 - -config IOAPIC - bool - default y - depends on BOARD_SUNW_ULTRA40 - config K8_REV_F_SUPPORT bool default n @@ -106,16 +98,6 @@ config SB_HT_CHAIN_ON_BUS0 default 2 depends on BOARD_SUNW_ULTRA40 -config CONSOLE_VGA - bool - default y - depends on BOARD_SUNW_ULTRA40 - -config PCI_ROM_RUN - bool - default y - depends on BOARD_SUNW_ULTRA40 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig index 38e1d9b048..7e5da69149 100644 --- a/src/mainboard/supermicro/h8dme/Kconfig +++ b/src/mainboard/supermicro/h8dme/Kconfig @@ -10,6 +10,8 @@ config BOARD_SUPERMICRO_H8DME select HAVE_PIRQ_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM + select HAVE_HARD_RESET + select IOAPIC config MAINBOARD_DIR string @@ -36,16 +38,6 @@ config APIC_ID_OFFSET default 0x10 depends on BOARD_SUPERMICRO_H8DME -config HAVE_HARD_RESET - bool - default y - depends on BOARD_SUPERMICRO_H8DME - -config IOAPIC - bool - default y - depends on BOARD_SUPERMICRO_H8DME - config SB_HT_CHAIN_ON_BUS0 int default 2 @@ -106,16 +98,6 @@ config SB_HT_CHAIN_ON_BUS0 default 2 depends on BOARD_SUPERMICRO_H8DME -config CONSOLE_VGA - bool - default y - depends on BOARD_SUPERMICRO_H8DME - -config PCI_ROM_RUN - bool - default y - depends on BOARD_SUPERMICRO_H8DME - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig index 1a88ee3961..c1944e55d8 100644 --- a/src/mainboard/tyan/s2881/Kconfig +++ b/src/mainboard/tyan/s2881/Kconfig @@ -9,6 +9,8 @@ config BOARD_TYAN_S2881 select SOUTHBRIDGE_AMD_AMD8111 select SUPERIO_WINBOND_W83627HF select PIRQ_TABLE + select SERIAL_CPU_INIT + select AP_CODE_IN_CAR config MAINBOARD_DIR string @@ -95,16 +97,6 @@ config USE_INIT default n depends on BOARD_TYAN_S2881 -config SERIAL_CPU_INIT - bool - default y - depends on BOARD_TYAN_S2881 - -config AP_CODE_IN_CAR - bool - default y - depends on BOARD_TYAN_S2881 - config WAIT_BEFORE_CPUS_INIT bool default n diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig index 13222f3cf5..3bda3df368 100644 --- a/src/mainboard/tyan/s2891/Kconfig +++ b/src/mainboard/tyan/s2891/Kconfig @@ -9,6 +9,8 @@ config BOARD_TYAN_S2891 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF select PIRQ_TABLE + select SERIAL_CPU_INIT + select AP_CODE_IN_CAR config MAINBOARD_DIR string @@ -95,16 +97,6 @@ config USE_INIT default n depends on BOARD_TYAN_S2891 -config SERIAL_CPU_INIT - bool - default y - depends on BOARD_TYAN_S2891 - -config AP_CODE_IN_CAR - bool - default y - depends on BOARD_TYAN_S2891 - config WAIT_BEFORE_CPUS_INIT bool default n @@ -120,6 +112,7 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY default n depends on BOARD_TYAN_S2891 +# TODO: Should be "select". And not user-visible. config HAVE_ACPI_TABLES bool "Generate ACPI tables" default y diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig index ee19983f43..bb9436dc66 100644 --- a/src/mainboard/tyan/s2892/Kconfig +++ b/src/mainboard/tyan/s2892/Kconfig @@ -9,6 +9,8 @@ config BOARD_TYAN_S2892 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF select PIRQ_TABLE + select SERIAL_CPU_INIT + select AP_CODE_IN_CAR config MAINBOARD_DIR string @@ -95,16 +97,6 @@ config USE_INIT default n depends on BOARD_TYAN_S2892 -config SERIAL_CPU_INIT - bool - default y - depends on BOARD_TYAN_S2892 - -config AP_CODE_IN_CAR - bool - default y - depends on BOARD_TYAN_S2892 - config WAIT_BEFORE_CPUS_INIT bool default n @@ -120,6 +112,7 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY default n depends on BOARD_TYAN_S2892 +# TODO config HAVE_ACPI_TABLES bool "Generate ACPI tables" default y diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig index 84dc1b14a1..c6e0b0683e 100644 --- a/src/mainboard/tyan/s2895/Kconfig +++ b/src/mainboard/tyan/s2895/Kconfig @@ -9,6 +9,8 @@ config BOARD_TYAN_S2895 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_SMSC_LPC47B397 select PIRQ_TABLE + select SERIAL_CPU_INIT + select AP_CODE_IN_CAR config MAINBOARD_DIR string @@ -95,16 +97,6 @@ config USE_INIT default n depends on BOARD_TYAN_S2895 -config SERIAL_CPU_INIT - bool - default y - depends on BOARD_TYAN_S2895 - -config AP_CODE_IN_CAR - bool - default y - depends on BOARD_TYAN_S2895 - config WAIT_BEFORE_CPUS_INIT bool default n @@ -120,6 +112,7 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY default n depends on BOARD_TYAN_S2895 +# TODO config HAVE_ACPI_TABLES bool "Generate ACPI tables" default y diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig index 399d182725..1866d707af 100644 --- a/src/mainboard/via/epia-n/Kconfig +++ b/src/mainboard/via/epia-n/Kconfig @@ -6,6 +6,7 @@ config BOARD_VIA_EPIA_N select SOUTHBRIDGE_VIA_VT8237R select SUPERIO_WINBOND_W83697HF select HAVE_PIRQ_TABLE + select EPIA_VT8237R_INIT config MAINBOARD_DIR string @@ -42,7 +43,3 @@ config IRQ_SLOT_COUNT default 7 depends on BOARD_VIA_EPIA_N -config EPIA_VT8237R_INIT - bool - default y - depends on BOARD_VIA_EPIA_N -- cgit v1.2.3