[coreboot-gerrit] [S] Change in coreboot[main]: Kconfig: Rework SYSTEM_TYPE_XX to better map to SMBIOS

[Matt DeVillier (Code Review)]

Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86454?usp=email )

Change subject: Kconfig: Rework SYSTEM_TYPE_XX to better map to SMBIOS
......................................................................

Kconfig: Rework SYSTEM_TYPE_XX to better map to SMBIOS

Add SYSTEM_TYPE_SERVER and SYSTEM_TYPE_ALL_INE_ONE; rename
SYSTEM_TYPE_BOX to SYSTEM_TYPE_MINIPC. Map these entries to the
analogous SMBIOS enclosure types.

Follow-on patches will have mainboards select these new SYSTEM_TYPE
entries as appropriate.

Change-Id: I2a35101ccc60daf4863568216ef145c9c701140b
Signed-off-by: Matt DeVillier 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86454
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
Reviewed-by: Eric Lai 
Reviewed-by: Andy Ebrahiem 
---
M src/Kconfig
M src/lib/smbios_defaults.c
M src/mainboard/google/brya/Kconfig
3 files changed, 26 insertions(+), 12 deletions(-)

Approvals:
  Eric Lai: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified
  Andy Ebrahiem: Looks good to me, but someone else must approve
  Subrata Banik: Looks good to me, approved

diff --git a/src/Kconfig b/src/Kconfig
index 1d71840..e4c8467 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -652,18 +652,11 @@
 # load site-local kconfig to allow user specific defaults and overrides
 source "site-local/Kconfig"

-config SYSTEM_TYPE_BOX
-	default n
-	bool
-	help
-	  For devices like chromebox, mac-mini etc. These devices
-	  without built-in display and operates on AC supply alone.
-
-config SYSTEM_TYPE_LAPTOP
+config SYSTEM_TYPE_ALL_IN_ONE
    default n
    bool

-config SYSTEM_TYPE_TABLET
+config SYSTEM_TYPE_CONVERTIBLE
    default n
    bool

@@ -671,7 +664,22 @@
    default n
    bool

-config SYSTEM_TYPE_CONVERTIBLE
+config SYSTEM_TYPE_LAPTOP
+	default n
+	bool
+
+config SYSTEM_TYPE_MINIPC
+	default n
+	bool
+	help
+	  For devices like chromebox, mac-mini etc. These devices
+	  without built-in display and operates on AC supply alone.
+
+config SYSTEM_TYPE_SERVER
+	default n
+	bool
+
+config SYSTEM_TYPE_TABLET
    default n
    bool

diff --git a/src/lib/smbios_defaults.c b/src/lib/smbios_defaults.c
index 0ad6442..ba6b231 100644
--- a/src/lib/smbios_defaults.c
+++ b/src/lib/smbios_defaults.c
@@ -99,6 +99,12 @@
    	return SMBIOS_ENCLOSURE_CONVERTIBLE;
    else if (CONFIG(SYSTEM_TYPE_DETACHABLE))
    	return SMBIOS_ENCLOSURE_DETACHABLE;
+	else if (CONFIG(SYSTEM_TYPE_SERVER))
+		return SMBIOS_ENCLOSURE_MAIN_SERVER_CHASSIS;
+	else if (CONFIG(SYSTEM_TYPE_MINIPC))
+		return SMBIOS_ENCLOSURE_MINI_PC;
+	else if (CONFIG(SYSTEM_TYPE_ALL_IN_ONE))
+		return SMBIOS_ENCLOSURE_ALL_IN_ONE;
    else
    	return SMBIOS_ENCLOSURE_DESKTOP;
 }
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index fc18f8f..31948fbd 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -97,7 +97,7 @@
    select SOC_INTEL_ALDERLAKE_PCH_N
    select SOC_INTEL_CSE_LITE_COMPRESS_ME_RW
    select SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE
-	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_BOX
+	select SYSTEM_TYPE_LAPTOP if !SYSTEM_TYPE_MINIPC
    select TPM_GOOGLE_TI50
    select SOC_INTEL_COMMON_MMC_OVERRIDE

@@ -223,7 +223,7 @@
 config BOARD_GOOGLE_DIRKS
    select BOARD_GOOGLE_BASEBOARD_NISSA
    select SOC_INTEL_TWINLAKE
-	select SYSTEM_TYPE_BOX
+	select SYSTEM_TYPE_MINIPC

config BOARD_GOOGLE_DOCHI
    select BOARD_GOOGLE_BASEBOARD_BRYA