Change in coreboot[master]: mb/siemens/chili: Rework Kconfig

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/49063 )

Change subject: mb/siemens/chili: Rework Kconfig
......................................................................

mb/siemens/chili: Rework Kconfig

Rework Kconfig file so that each variant has its own config option with
their specific selects / configuration and move common selects to a
seperate config option, which is used as base for each variant.

Built chili/base with BUILD_TIMELESS=1, coreboot.rom remains the same.

Change-Id: I5e2a09db80232457b2f78ad9b100c468d281f753
Signed-off-by: Felix Singer 
---
M src/mainboard/siemens/chili/Kconfig
M src/mainboard/siemens/chili/Kconfig.name
2 files changed, 20 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/49063/1

diff --git a/src/mainboard/siemens/chili/Kconfig b/src/mainboard/siemens/chili/Kconfig
index fda571d..10133d0 100644
--- a/src/mainboard/siemens/chili/Kconfig
+++ b/src/mainboard/siemens/chili/Kconfig
@@ -1,29 +1,37 @@
 # SPDX-License-Identifier: GPL-2.0-only

-if BOARD_SIEMENS_CHILI_BASE || BOARD_SIEMENS_CHILI_CHILI
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
+config BOARD_SIEMENS_CHILI_COMMON
+	def_bool n
    select BOARD_ROMSIZE_KB_32768
    select DRIVERS_I2C_GENERIC
    select DRIVERS_I2C_HID
-	select DRIVERS_I2C_LM96000 if BOARD_SIEMENS_CHILI_CHILI
-	select DRIVERS_UART_8250IO if BOARD_SIEMENS_CHILI_BASE
    select EC_ACPI
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
    select HAVE_OPTION_TABLE
    select INTEL_GMA_HAVE_VBT
-	select INTEL_LPSS_UART_FOR_CONSOLE if BOARD_SIEMENS_CHILI_CHILI
    select MAINBOARD_HAS_LIBGFXINIT
    select MAINBOARD_HAS_LPC_TPM
    select MAINBOARD_HAS_TPM2
    select MAINBOARD_USES_IFD_GBE_REGION
-	select SMBIOS_PROVIDED_BY_MOBO if BOARD_SIEMENS_CHILI_CHILI
    select SOC_INTEL_CANNONLAKE_PCH_H
    select SOC_INTEL_COFFEELAKE
-	select SOC_INTEL_COMMON_BLOCK_HDA_VERB if BOARD_SIEMENS_CHILI_CHILI
-	select SECUNET_DMI if BOARD_SIEMENS_CHILI_CHILI
+
+config BOARD_SIEMENS_CHILI_BASE_OPTIONS
+	bool
+	select BOARD_SIEMENS_CHILI_COMMON
+	select DRIVERS_UART_8250IO
+
+config BOARD_SIEMENS_CHILI_CHILI_OPTIONS
+	bool
+	select BOARD_SIEMENS_CHILI_COMMON
+	select DRIVERS_I2C_LM96000
+	select INTEL_LPSS_UART_FOR_CONSOLE
+	select SMBIOS_PROVIDED_BY_MOBO
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+	select SECUNET_DMI
+
+if BOARD_SIEMENS_CHILI_COMMON

config MAINBOARD_DIR
    string
diff --git a/src/mainboard/siemens/chili/Kconfig.name b/src/mainboard/siemens/chili/Kconfig.name
index ac4e31e..1c8dab5 100644
--- a/src/mainboard/siemens/chili/Kconfig.name
+++ b/src/mainboard/siemens/chili/Kconfig.name
@@ -4,6 +4,8 @@

config BOARD_SIEMENS_CHILI_BASE
    bool "-> Base board"
+	select BOARD_SIEMENS_CHILI_BASE_OPTIONS

config BOARD_SIEMENS_CHILI_CHILI
    bool "-> Chili (AiO)"
+	select BOARD_SIEMENS_CHILI_CHILI_OPTIONS

[Daniel Maslowski (Code Review)]

Daniel Maslowski has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49063 )

Change subject: mb/siemens/chili: Rework Kconfig
......................................................................

Patch Set 1: Code-Review+1

Really nice, this is much more declarative. :)

[Felix Singer (Code Review)]

Hello build bot (Jenkins), Nico Huber, Daniel Maslowski,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/49063

to look at the new patch set (#2).

Change subject: mb/siemens/chili: Rework Kconfig
......................................................................

mb/siemens/chili: Rework Kconfig

Rework Kconfig file so that each variant has its own config option with
their specific selects / configuration and move common selects to a
seperate config option, which is used as base for each variant.

Built chili/base with BUILD_TIMELESS=1, coreboot.rom remains the same.

Change-Id: I5e2a09db80232457b2f78ad9b100c468d281f753
Signed-off-by: Felix Singer 
---
M src/mainboard/siemens/chili/Kconfig
M src/mainboard/siemens/chili/Kconfig.name
2 files changed, 20 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/63/49063/2

[Nico Huber (Code Review)]

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/49063 )

Change subject: mb/siemens/chili: Rework Kconfig
......................................................................

Patch Set 2: Code-Review+2

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/coreboot/+/49063 )

Change subject: mb/siemens/chili: Rework Kconfig
......................................................................

mb/siemens/chili: Rework Kconfig

Rework Kconfig file so that each variant has its own config option with
their specific selects / configuration and move common selects to a
seperate config option, which is used as base for each variant.

Built chili/base with BUILD_TIMELESS=1, coreboot.rom remains the same.

Change-Id: I5e2a09db80232457b2f78ad9b100c468d281f753
Signed-off-by: Felix Singer 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49063
Tested-by: build bot (Jenkins) 
Reviewed-by: Nico Huber 
---
M src/mainboard/siemens/chili/Kconfig
M src/mainboard/siemens/chili/Kconfig.name
2 files changed, 20 insertions(+), 10 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, approved

diff --git a/src/mainboard/siemens/chili/Kconfig b/src/mainboard/siemens/chili/Kconfig
index fda571d..a261abc 100644
--- a/src/mainboard/siemens/chili/Kconfig
+++ b/src/mainboard/siemens/chili/Kconfig
@@ -1,29 +1,37 @@
 # SPDX-License-Identifier: GPL-2.0-only

-if BOARD_SIEMENS_CHILI_BASE || BOARD_SIEMENS_CHILI_CHILI
-
-config BOARD_SPECIFIC_OPTIONS
-	def_bool y
+config BOARD_SIEMENS_CHILI_COMMON
+	def_bool n
    select BOARD_ROMSIZE_KB_32768
    select DRIVERS_I2C_GENERIC
    select DRIVERS_I2C_HID
-	select DRIVERS_I2C_LM96000 if BOARD_SIEMENS_CHILI_CHILI
-	select DRIVERS_UART_8250IO if BOARD_SIEMENS_CHILI_BASE
    select EC_ACPI
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
    select HAVE_OPTION_TABLE
    select INTEL_GMA_HAVE_VBT
-	select INTEL_LPSS_UART_FOR_CONSOLE if BOARD_SIEMENS_CHILI_CHILI
    select MAINBOARD_HAS_LIBGFXINIT
    select MAINBOARD_HAS_LPC_TPM
    select MAINBOARD_HAS_TPM2
    select MAINBOARD_USES_IFD_GBE_REGION
-	select SMBIOS_PROVIDED_BY_MOBO if BOARD_SIEMENS_CHILI_CHILI
    select SOC_INTEL_CANNONLAKE_PCH_H
    select SOC_INTEL_COFFEELAKE
-	select SOC_INTEL_COMMON_BLOCK_HDA_VERB if BOARD_SIEMENS_CHILI_CHILI
-	select SECUNET_DMI if BOARD_SIEMENS_CHILI_CHILI
+
+config BOARD_SIEMENS_CHILI_BASE_OPTIONS
+	bool
+	select BOARD_SIEMENS_CHILI_COMMON
+	select DRIVERS_UART_8250IO
+
+config BOARD_SIEMENS_CHILI_CHILI_OPTIONS
+	bool
+	select BOARD_SIEMENS_CHILI_COMMON
+	select DRIVERS_I2C_LM96000
+	select INTEL_LPSS_UART_FOR_CONSOLE
+	select SECUNET_DMI
+	select SMBIOS_PROVIDED_BY_MOBO
+	select SOC_INTEL_COMMON_BLOCK_HDA_VERB
+
+if BOARD_SIEMENS_CHILI_COMMON

config MAINBOARD_DIR
    string
diff --git a/src/mainboard/siemens/chili/Kconfig.name b/src/mainboard/siemens/chili/Kconfig.name
index ac4e31e..1c8dab5 100644
--- a/src/mainboard/siemens/chili/Kconfig.name
+++ b/src/mainboard/siemens/chili/Kconfig.name
@@ -4,6 +4,8 @@

config BOARD_SIEMENS_CHILI_BASE
    bool "-> Base board"
+	select BOARD_SIEMENS_CHILI_BASE_OPTIONS

config BOARD_SIEMENS_CHILI_CHILI
    bool "-> Chili (AiO)"
+	select BOARD_SIEMENS_CHILI_CHILI_OPTIONS