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 <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86454
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Eric Lai <ericllai@google.com>
Reviewed-by: Andy Ebrahiem <ahmet.ebrahiem@9elements.com>
This commit is contained in:
Matt DeVillier 2025-02-16 13:00:15 -06:00
commit 2988beac8e
3 changed files with 23 additions and 9 deletions

View file

@ -652,18 +652,11 @@ endmenu
# 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 @@ config SYSTEM_TYPE_DETACHABLE
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

View file

@ -99,6 +99,12 @@ __weak smbios_enclosure_type smbios_mainboard_enclosure_type(void)
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;
}

View file

@ -97,7 +97,7 @@ config BOARD_GOOGLE_BASEBOARD_NISSA
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_CROTA
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