From ae69f518b672c648ee46863f2cd6b4358ee69c66 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 17 Dec 2021 05:50:56 +0100 Subject: mb/google/poppy: Move selects from Kconfig.name to Kconfig Move selects from Kconfig.name to Kconfig so that the configuration is at one place and not distributed over two files. Change-Id: I462426f2ef4a0ff62c0a7c1eb2a4946fba68c4a9 Signed-off-by: Felix Singer Reviewed-on: https://review.coreboot.org/c/coreboot/+/60188 Tested-by: build bot (Jenkins) Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/poppy/Kconfig | 28 ++++++++++++++++++++++++++++ src/mainboard/google/poppy/Kconfig.name | 14 -------------- 2 files changed, 28 insertions(+), 14 deletions(-) (limited to 'src/mainboard/google/poppy') diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 462b6943bf15..dce2ecc4cfc9 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -17,6 +17,34 @@ config BOARD_GOOGLE_BASEBOARD_POPPY select MAINBOARD_HAS_TPM2 select SOC_INTEL_KABYLAKE +config BOARD_GOOGLE_ATLAS + select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_ATLAS + +config BOARD_GOOGLE_POPPY + select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_POPPY + +config BOARD_GOOGLE_NAMI + select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_NAMI + +config BOARD_GOOGLE_NAUTILUS + select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_NAUTILUS + +config BOARD_GOOGLE_NOCTURNE + select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_NOCTURNE + +config BOARD_GOOGLE_RAMMUS + select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_RAMMUS + +config BOARD_GOOGLE_SORAKA + select BOARD_GOOGLE_BASEBOARD_POPPY + select VARIANT_SPECIFIC_OPTIONS_SORAKA + if BOARD_GOOGLE_BASEBOARD_POPPY config CHROMEOS_WIFI_SAR diff --git a/src/mainboard/google/poppy/Kconfig.name b/src/mainboard/google/poppy/Kconfig.name index fe0dd17a7009..4b1fe69d8325 100644 --- a/src/mainboard/google/poppy/Kconfig.name +++ b/src/mainboard/google/poppy/Kconfig.name @@ -2,18 +2,12 @@ comment "Poppy" config BOARD_GOOGLE_ATLAS bool "-> Atlas (Google Pixelbook Go)" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_ATLAS config BOARD_GOOGLE_POPPY bool "-> Poppy" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_POPPY config BOARD_GOOGLE_NAMI bool "-> Nami" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_NAMI help The Nami board supports the following devices: - Acer Chromebook 13 / Spin 13 (Akali) @@ -24,18 +18,12 @@ config BOARD_GOOGLE_NAMI config BOARD_GOOGLE_NAUTILUS bool "-> Nautilus (Samsung Chromebook Plus V2, V2 LTE)" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_NAUTILUS config BOARD_GOOGLE_NOCTURNE bool "-> Nocturne (Google Pixel Slate)" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_NOCTURNE config BOARD_GOOGLE_RAMMUS bool "-> Rammus" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_RAMMUS help The Rammus board supports the following devices: - Asus Chromebook C425 (Leona) @@ -43,5 +31,3 @@ config BOARD_GOOGLE_RAMMUS config BOARD_GOOGLE_SORAKA bool "-> Soraka (HP Chromebook x2)" - select BOARD_GOOGLE_BASEBOARD_POPPY - select VARIANT_SPECIFIC_OPTIONS_SORAKA -- cgit v1.2.3