Subrata Banik submitted this change.

View Change

mb/google/rex: Organize models configs alphabetically

This patch ensures the baseboard and variant configs (inside Kconfig
and Kconfig.name) are organized in alphabetic order.

TEST=execute make menuconfig and verify the google/rex variants
order are alphabetically correct.

Change-Id: I0acc2cec21b4607856127b04c400ec416f0c0dd2
Signed-off-by: Subrata Banik <subratabanik@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80206
Reviewed-by: Eric Lai <ericllai@google.com>
Reviewed-by: Jakub Czapiga <czapiga@google.com>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/mainboard/google/rex/Kconfig
M src/mainboard/google/rex/Kconfig.name
2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig
index a253c8c..046f1d9 100644
--- a/src/mainboard/google/rex/Kconfig
+++ b/src/mainboard/google/rex/Kconfig
@@ -30,6 +30,22 @@
 	select SOC_INTEL_CSE_PRE_CPU_RESET_TELEMETRY_V2
 	select SOC_INTEL_CSE_SEND_EOP_ASYNC
 
+config BOARD_GOOGLE_BASEBOARD_OVIS
+	def_bool n
+	select BOARD_GOOGLE_REX_COMMON
+	select DRIVERS_INTEL_PMC
+	select ENABLE_TCSS_DISPLAY_DETECTION if RUN_FSP_GOP
+	select HAVE_SLP_S0_GATE
+	select MAINBOARD_HAS_CHROMEOS
+	select MEMORY_SOLDERDOWN
+	select RT8168_GEN_ACPI_POWER_RESOURCE
+	select RT8168_GET_MAC_FROM_VPD
+	select RT8168_SET_LED_MODE
+	select SOC_INTEL_IOE_DIE_SUPPORT
+	select SOC_INTEL_METEORLAKE_U_H
+	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
+	select TPM_GOOGLE_TI50
+
 config BOARD_GOOGLE_BASEBOARD_REX
 	def_bool n
 	select BOARD_GOOGLE_REX_COMMON
@@ -47,6 +63,19 @@
 	select SYSTEM_TYPE_LAPTOP
 	select TPM_GOOGLE_TI50
 
+config BOARD_GOOGLE_MODEL_DEKU
+	def_bool n
+	select BOARD_GOOGLE_BASEBOARD_OVIS
+
+config BOARD_GOOGLE_MODEL_KARIS
+	def_bool n
+	select BOARD_GOOGLE_BASEBOARD_REX
+	select CHROMEOS_WIFI_SAR if CHROMEOS
+
+config BOARD_GOOGLE_MODEL_OVIS
+	def_bool n
+	select BOARD_GOOGLE_BASEBOARD_OVIS
+
 config BOARD_GOOGLE_MODEL_REX
 	def_bool n
 	select BOARD_GOOGLE_BASEBOARD_REX
@@ -70,44 +99,11 @@
 	select DRIVERS_GENERIC_ALC1015
 	select DRIVERS_GENESYSLOGIC_GL9750
 
-config BOARD_GOOGLE_MODEL_KARIS
-	def_bool n
-	select BOARD_GOOGLE_BASEBOARD_REX
-	select CHROMEOS_WIFI_SAR if CHROMEOS
+config BOARD_GOOGLE_DEKU
+	select BOARD_GOOGLE_MODEL_DEKU
 
-config BOARD_GOOGLE_BASEBOARD_OVIS
-	def_bool n
-	select BOARD_GOOGLE_REX_COMMON
-	select DRIVERS_INTEL_PMC
-	select ENABLE_TCSS_DISPLAY_DETECTION if RUN_FSP_GOP
-	select HAVE_SLP_S0_GATE
-	select MAINBOARD_HAS_CHROMEOS
-	select MEMORY_SOLDERDOWN
-	select RT8168_GEN_ACPI_POWER_RESOURCE
-	select RT8168_GET_MAC_FROM_VPD
-	select RT8168_SET_LED_MODE
-	select SOC_INTEL_IOE_DIE_SUPPORT
-	select SOC_INTEL_METEORLAKE_U_H
-	select SOC_INTEL_ENABLE_USB4_PCIE_RESOURCES
-	select TPM_GOOGLE_TI50
-
-config BOARD_GOOGLE_MODEL_OVIS
-	def_bool n
-	select BOARD_GOOGLE_BASEBOARD_OVIS
-
-config BOARD_GOOGLE_MODEL_DEKU
-	def_bool n
-	select BOARD_GOOGLE_BASEBOARD_OVIS
-
-config BOARD_GOOGLE_REX0
-	select BOARD_GOOGLE_MODEL_REX
-
-config BOARD_GOOGLE_SCREEBO
-	select BOARD_GOOGLE_MODEL_SCREEBO
-
-config BOARD_GOOGLE_SCREEBO4ES
-	select BOARD_GOOGLE_MODEL_SCREEBO
-	select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
+config BOARD_GOOGLE_DEKU4ES
+	select BOARD_GOOGLE_MODEL_DEKU
 
 config BOARD_GOOGLE_KARIS
 	select BOARD_GOOGLE_MODEL_KARIS
@@ -116,22 +112,19 @@
 	select BOARD_GOOGLE_MODEL_KARIS
 	select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
 
-config BOARD_GOOGLE_REX_EC_ISH
-	select BOARD_GOOGLE_MODEL_REX_EC_ISH
-
 config BOARD_GOOGLE_OVIS
 	select BOARD_GOOGLE_MODEL_OVIS
 
-config BOARD_GOOGLE_DEKU
-	select BOARD_GOOGLE_MODEL_DEKU
-
-config BOARD_GOOGLE_DEKU4ES
-	select BOARD_GOOGLE_MODEL_DEKU
-
 config BOARD_GOOGLE_OVIS4ES
 	select BOARD_GOOGLE_MODEL_OVIS
 	select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
 
+config BOARD_GOOGLE_REX0
+	select BOARD_GOOGLE_MODEL_REX
+
+config BOARD_GOOGLE_REX_EC_ISH
+	select BOARD_GOOGLE_MODEL_REX_EC_ISH
+
 config BOARD_GOOGLE_REX4ES
 	select BOARD_GOOGLE_MODEL_REX
 	select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
@@ -140,6 +133,13 @@
 	select BOARD_GOOGLE_MODEL_REX_EC_ISH
 	select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
 
+config BOARD_GOOGLE_SCREEBO
+	select BOARD_GOOGLE_MODEL_SCREEBO
+
+config BOARD_GOOGLE_SCREEBO4ES
+	select BOARD_GOOGLE_MODEL_SCREEBO
+	select SOC_INTEL_METEORLAKE_PRE_PRODUCTION_SILICON
+
 if BOARD_GOOGLE_REX_COMMON
 
 config BASEBOARD_DIR
diff --git a/src/mainboard/google/rex/Kconfig.name b/src/mainboard/google/rex/Kconfig.name
index 7717458..7a17f87 100644
--- a/src/mainboard/google/rex/Kconfig.name
+++ b/src/mainboard/google/rex/Kconfig.name
@@ -1,13 +1,10 @@
 comment "Rex"
 
-config BOARD_GOOGLE_REX0
-	bool "-> Rex 0"
+config BOARD_GOOGLE_DEKU
+	bool "-> Deku"
 
-config BOARD_GOOGLE_SCREEBO
-	bool "->  Screebo"
-
-config BOARD_GOOGLE_SCREEBO4ES
-	bool "->  Screebo4ES"
+config BOARD_GOOGLE_DEKU4ES
+	bool "-> Deku4ES"
 
 config BOARD_GOOGLE_KARIS
 	bool "->  Karis"
@@ -15,23 +12,26 @@
 config BOARD_GOOGLE_KARIS4ES
 	bool "->  Karis4ES"
 
-config BOARD_GOOGLE_REX_EC_ISH
-	bool "-> Rex EC ISH"
-
 config BOARD_GOOGLE_OVIS
 	bool "-> Ovis"
 
 config BOARD_GOOGLE_OVIS4ES
 	bool "-> Ovis4ES"
 
-config BOARD_GOOGLE_DEKU
-	bool "-> Deku"
+config BOARD_GOOGLE_REX0
+	bool "-> Rex 0"
 
-config BOARD_GOOGLE_DEKU4ES
-	bool "-> Deku4ES"
+config BOARD_GOOGLE_REX_EC_ISH
+	bool "-> Rex EC ISH"
 
 config BOARD_GOOGLE_REX4ES
 	bool "-> Rex4ES"
 
 config BOARD_GOOGLE_REX4ES_EC_ISH
 	bool "-> Rex4ES EC ISH"
+
+config BOARD_GOOGLE_SCREEBO
+	bool "->  Screebo"
+
+config BOARD_GOOGLE_SCREEBO4ES
+	bool "->  Screebo4ES"

To view, visit change 80206. To unsubscribe, or for help writing mail filters, visit settings.