mb/asus/h61-series: Move selects from Kconfig.name to Kconfig
Selects should be done in the Kconfig file instead of Kconfig.name and
not mixed over both files.
Change-Id: I6a78efa4be2ee34e7dac06a8b8014da12b21fbdc
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78130
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
diff --git a/src/mainboard/asus/h61-series/Kconfig b/src/mainboard/asus/h61-series/Kconfig
index eeec4e7..2f34719 100644
--- a/src/mainboard/asus/h61-series/Kconfig
+++ b/src/mainboard/asus/h61-series/Kconfig
@@ -12,6 +12,54 @@
select SOUTHBRIDGE_INTEL_BD82X6X
select USE_NATIVE_RAMINIT
+config BOARD_ASUS_H61M_CS
+ select BOARD_ASUS_H61_SERIES
+ select BOARD_ROMSIZE_KB_8192
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
+ select NO_UART_ON_SUPERIO
+ select SUPERIO_NUVOTON_NCT6779D
+
+config BOARD_ASUS_P8H61_M_LX
+ select BOARD_ASUS_H61_SERIES
+ select BOARD_ROMSIZE_KB_4096
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
+ select REALTEK_8168_RESET
+ select RT8168_SET_LED_MODE
+ select SUPERIO_NUVOTON_COMMON_COM_A
+ select SUPERIO_NUVOTON_NCT6776
+
+config BOARD_ASUS_P8H61_M_LX3_R2_0
+ select BOARD_ASUS_H61_SERIES
+ select BOARD_ROMSIZE_KB_8192
+ select NO_UART_ON_SUPERIO
+ select REALTEK_8168_RESET
+ select RT8168_SET_LED_MODE
+ select SUPERIO_NUVOTON_NCT6779D
+
+config BOARD_ASUS_P8H61_M_PRO
+ select BOARD_ASUS_H61_SERIES
+ select BOARD_ROMSIZE_KB_4096
+ select DRIVERS_ASMEDIA_ASPM_BLACKLIST
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
+ select MEMORY_MAPPED_TPM
+ select REALTEK_8168_RESET
+ select RT8168_SET_LED_MODE
+ select SUPERIO_NUVOTON_NCT6776
+
+config BOARD_ASUS_P8H61_M_PRO_CM6630
+ select BOARD_ASUS_H61_SERIES
+ select BOARD_ROMSIZE_KB_4096
+ select DRIVERS_ASMEDIA_ASPM_BLACKLIST
+ select HAVE_CMOS_DEFAULT
+ select HAVE_OPTION_TABLE
+ select MEMORY_MAPPED_TPM
+ select REALTEK_8168_RESET
+ select RT8168_SET_LED_MODE
+ select SUPERIO_NUVOTON_NCT6776
+
if BOARD_ASUS_H61_SERIES
config MAINBOARD_DIR
diff --git a/src/mainboard/asus/h61-series/Kconfig.name b/src/mainboard/asus/h61-series/Kconfig.name
index d2175a8..471d268 100644
--- a/src/mainboard/asus/h61-series/Kconfig.name
+++ b/src/mainboard/asus/h61-series/Kconfig.name
@@ -1,52 +1,14 @@
config BOARD_ASUS_H61M_CS
bool "H61M-CS"
- select BOARD_ASUS_H61_SERIES
- select BOARD_ROMSIZE_KB_8192
- select HAVE_CMOS_DEFAULT
- select HAVE_OPTION_TABLE
- select NO_UART_ON_SUPERIO
- select SUPERIO_NUVOTON_NCT6779D
config BOARD_ASUS_P8H61_M_LX
bool "P8H61-M LX"
- select BOARD_ASUS_H61_SERIES
- select BOARD_ROMSIZE_KB_4096
- select HAVE_CMOS_DEFAULT
- select HAVE_OPTION_TABLE
- select REALTEK_8168_RESET
- select RT8168_SET_LED_MODE
- select SUPERIO_NUVOTON_COMMON_COM_A
- select SUPERIO_NUVOTON_NCT6776
config BOARD_ASUS_P8H61_M_LX3_R2_0
bool "P8H61-M LX3 R2.0"
- select BOARD_ASUS_H61_SERIES
- select BOARD_ROMSIZE_KB_8192
- select NO_UART_ON_SUPERIO
- select REALTEK_8168_RESET
- select RT8168_SET_LED_MODE
- select SUPERIO_NUVOTON_NCT6779D
config BOARD_ASUS_P8H61_M_PRO
bool "P8H61-M PRO"
- select BOARD_ASUS_H61_SERIES
- select BOARD_ROMSIZE_KB_4096
- select DRIVERS_ASMEDIA_ASPM_BLACKLIST
- select HAVE_CMOS_DEFAULT
- select HAVE_OPTION_TABLE
- select MEMORY_MAPPED_TPM
- select REALTEK_8168_RESET
- select RT8168_SET_LED_MODE
- select SUPERIO_NUVOTON_NCT6776
config BOARD_ASUS_P8H61_M_PRO_CM6630
bool "P8H61-M PRO CM6630"
- select BOARD_ASUS_H61_SERIES
- select BOARD_ROMSIZE_KB_4096
- select DRIVERS_ASMEDIA_ASPM_BLACKLIST
- select HAVE_CMOS_DEFAULT
- select HAVE_OPTION_TABLE
- select MEMORY_MAPPED_TPM
- select REALTEK_8168_RESET
- select RT8168_SET_LED_MODE
- select SUPERIO_NUVOTON_NCT6776