GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SMBIOS: Remove Kconfig SYSTEM_ENCLOSURE_TYPE 

This gets rid of the magic numbers in Kconfig.

Change-Id: Ibee033b6c99e3131bb323f0d86d306dcd82f9b45
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42139
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
This commit is contained in:
Kyösti Mälkki 2020-06-07 12:50:57 +03:00 committed by Patrick Georgi
parent 8770954b99
commit be242788c2
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Kconfig
View File

@ -734,20 +734,6 @@ config MAINBOARD_SMBIOS_PRODUCT_NAME
help help
Override the default Product name stored in SMBIOS structures. Override the default Product name stored in SMBIOS structures.
config SMBIOS_ENCLOSURE_TYPE
hex
depends on GENERATE_SMBIOS_TABLES
default 0x09 if SYSTEM_TYPE_LAPTOP
default 0x1e if SYSTEM_TYPE_TABLET
default 0x1f if SYSTEM_TYPE_CONVERTIBLE
default 0x20 if SYSTEM_TYPE_DETACHABLE
default 0x03
help
System Enclosure or Chassis Types as defined in SMBIOS specification.
The default value is SMBIOS_ENCLOSURE_DESKTOP (0x03) but laptop,
convertible, or tablet enclosure will be used if the appropriate
system type is selected.
endmenu endmenu
source "payloads/Kconfig" source "payloads/Kconfig"

17
src/arch/x86/smbios.c
View File

@ -479,9 +479,24 @@ smbios_board_type __weak smbios_mainboard_board_type(void)
return SMBIOS_BOARD_TYPE_UNKNOWN; return SMBIOS_BOARD_TYPE_UNKNOWN;
} }
/*
* System Enclosure or Chassis Types as defined in SMBIOS specification.
* The default value is SMBIOS_ENCLOSURE_DESKTOP (0x03) but laptop,
* convertible, or tablet enclosure will be used if the appropriate
* system type is selected.
*/
smbios_enclosure_type __weak smbios_mainboard_enclosure_type(void) smbios_enclosure_type __weak smbios_mainboard_enclosure_type(void)
{ {
return CONFIG_SMBIOS_ENCLOSURE_TYPE; if (CONFIG(SYSTEM_TYPE_LAPTOP))
return SMBIOS_ENCLOSURE_LAPTOP;
else if (CONFIG(SYSTEM_TYPE_TABLET))
return SMBIOS_ENCLOSURE_TABLET;
else if (CONFIG(SYSTEM_TYPE_CONVERTIBLE))
return SMBIOS_ENCLOSURE_CONVERTIBLE;
else if (CONFIG(SYSTEM_TYPE_DETACHABLE))
return SMBIOS_ENCLOSURE_DETACHABLE;
else
return SMBIOS_ENCLOSURE_DESKTOP;
} }
const char *__weak smbios_system_serial_number(void) const char *__weak smbios_system_serial_number(void)