Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
[RFC] Move SYSTEM_TYPE_xxx to devicetree.cb
This makes the entire range of SMBIOS_ENCLOSURE_xx enums usable.
Change-Id: Ib546706d04fede6c14ac57280ae72dca4fb7085b Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/Kconfig M src/arch/x86/smbios.c M src/mainboard/51nb/x210/Kconfig M src/mainboard/apple/macbook21/Kconfig M src/mainboard/apple/macbookair4_2/Kconfig M src/mainboard/compulab/intense_pc/Kconfig M src/mainboard/getac/p470/Kconfig M src/mainboard/google/auron/Kconfig M src/mainboard/google/butterfly/Kconfig M src/mainboard/google/cyan/Kconfig M src/mainboard/google/dedede/Kconfig M src/mainboard/google/deltaur/Kconfig M src/mainboard/google/drallion/Kconfig M src/mainboard/google/eve/Kconfig M src/mainboard/google/glados/Kconfig M src/mainboard/google/hatch/Kconfig M src/mainboard/google/kahlee/Kconfig M src/mainboard/google/link/Kconfig M src/mainboard/google/octopus/Kconfig M src/mainboard/google/parrot/Kconfig M src/mainboard/google/poppy/Kconfig M src/mainboard/google/rambi/Kconfig M src/mainboard/google/reef/Kconfig M src/mainboard/google/sarien/Kconfig M src/mainboard/google/slippy/Kconfig M src/mainboard/google/stout/Kconfig M src/mainboard/google/veyron/Kconfig.name M src/mainboard/google/zork/Kconfig M src/mainboard/hp/pavilion_m6_1035dx/Kconfig M src/mainboard/hp/snb_ivb_laptops/Kconfig M src/mainboard/intel/glkrvp/Kconfig M src/mainboard/lenovo/g505s/Kconfig M src/mainboard/lenovo/l520/Kconfig M src/mainboard/lenovo/s230u/Kconfig M src/mainboard/lenovo/t400/Kconfig M src/mainboard/lenovo/t410/Kconfig M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t430/Kconfig M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t440p/Kconfig M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/t60/Kconfig M src/mainboard/lenovo/x131e/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x200/Kconfig M src/mainboard/lenovo/x201/Kconfig M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x230/Kconfig M src/mainboard/lenovo/x60/Kconfig M src/mainboard/packardbell/ms2290/Kconfig M src/mainboard/purism/librem_bdw/Kconfig M src/mainboard/purism/librem_skl/Kconfig M src/mainboard/razer/blade_stealth_kbl/Kconfig M src/mainboard/roda/rk886ex/Kconfig M src/mainboard/roda/rk9/Kconfig M src/mainboard/roda/rv11/Kconfig M src/mainboard/samsung/lumpy/Kconfig M src/mainboard/system76/lemp9/Kconfig 60 files changed, 1 insertion(+), 90 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/42142/1
diff --git a/src/Kconfig b/src/Kconfig index 63ecd0a..b38923d 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -443,22 +443,6 @@ # load site-local kconfig to allow user specific defaults and overrides source "site-local/Kconfig"
-config SYSTEM_TYPE_LAPTOP - default n - bool - -config SYSTEM_TYPE_TABLET - default n - bool - -config SYSTEM_TYPE_DETACHABLE - default n - bool - -config SYSTEM_TYPE_CONVERTIBLE - default n - bool - config CBFS_AUTOGEN_ATTRIBUTES default n bool diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c index ee69408..12e7be3 100644 --- a/src/arch/x86/smbios.c +++ b/src/arch/x86/smbios.c @@ -487,16 +487,7 @@ */ smbios_enclosure_type __weak smbios_mainboard_enclosure_type(void) { - 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; + return SMBIOS_ENCLOSURE_UNKNOWN; }
const char *__weak smbios_system_serial_number(void) diff --git a/src/mainboard/51nb/x210/Kconfig b/src/mainboard/51nb/x210/Kconfig index 44c0f862..45c5755 100644 --- a/src/mainboard/51nb/x210/Kconfig +++ b/src/mainboard/51nb/x210/Kconfig @@ -10,7 +10,6 @@ select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SOC_INTEL_KABYLAKE select SPD_READ_BY_WORD - select SYSTEM_TYPE_LAPTOP
config MAINBOARD_FAMILY string diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig index 9eb06ff..0bff36e 100644 --- a/src/mainboard/apple/macbook21/Kconfig +++ b/src/mainboard/apple/macbook21/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_M select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig index 2f48e50..4975a7f 100644 --- a/src/mainboard/apple/macbookair4_2/Kconfig +++ b/src/mainboard/apple/macbookair4_2/Kconfig @@ -11,7 +11,6 @@ select USE_NATIVE_RAMINIT select SERIRQ_CONTINUOUS_MODE select SOUTHBRIDGE_INTEL_BD82X6X - select SYSTEM_TYPE_LAPTOP select GFX_GMA_PANEL_1_ON_EDP select MAINBOARD_HAS_LIBGFXINIT select HAVE_CMOS_DEFAULT diff --git a/src/mainboard/compulab/intense_pc/Kconfig b/src/mainboard/compulab/intense_pc/Kconfig index 68a01f1..0ada3ce 100644 --- a/src/mainboard/compulab/intense_pc/Kconfig +++ b/src/mainboard/compulab/intense_pc/Kconfig @@ -10,7 +10,6 @@ select NORTHBRIDGE_INTEL_SANDYBRIDGE select SERIRQ_CONTINUOUS_MODE select SOUTHBRIDGE_INTEL_C216 - select SYSTEM_TYPE_LAPTOP select USE_NATIVE_RAMINIT select SUPERIO_SMSC_SIO1007 select MAINBOARD_HAS_LIBGFXINIT diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig index 283ff65..5b27af2 100644 --- a/src/mainboard/getac/p470/Kconfig +++ b/src/mainboard/getac/p470/Kconfig @@ -4,7 +4,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_M select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 20d2e44..f46c38a 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -14,7 +14,6 @@ select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select INTEL_INT15 - select SYSTEM_TYPE_LAPTOP if !BOARD_GOOGLE_BUDDY
if BOARD_GOOGLE_BASEBOARD_AURON
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index 4e01455..e8aac2e 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_C216 select EC_QUANTA_ENE_KB3940Q diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 92bafee..2835dd8 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -15,7 +15,6 @@ select SOC_INTEL_BRASWELL select HAVE_ACPI_RESUME select PCIEXP_L1_SUB_STATE if !BOARD_GOOGLE_CYAN - select SYSTEM_TYPE_LAPTOP select USE_GOOGLE_FSP
if BOARD_GOOGLE_BASEBOARD_CYAN diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 1ec4941..b3dbc33 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -21,7 +21,6 @@
config BASEBOARD_DEDEDE_LAPTOP def_bool n - select SYSTEM_TYPE_LAPTOP
config CHROMEOS bool diff --git a/src/mainboard/google/deltaur/Kconfig b/src/mainboard/google/deltaur/Kconfig index ddcdb26..b15bec8 100644 --- a/src/mainboard/google/deltaur/Kconfig +++ b/src/mainboard/google/deltaur/Kconfig @@ -15,7 +15,6 @@ select MAINBOARD_HAS_TPM2 select MAINBOARD_USES_IFD_EC_REGION select SOC_INTEL_TIGERLAKE - select SYSTEM_TYPE_LAPTOP select MAINBOARD_USES_IFD_GBE_REGION if BOARD_GOOGLE_DELTAN select SOC_INTEL_COMMON_BLOCK_HDA_VERB
diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig index c61a5b3..9ff354a 100644 --- a/src/mainboard/google/drallion/Kconfig +++ b/src/mainboard/google/drallion/Kconfig @@ -19,7 +19,6 @@ select SOC_INTEL_COMETLAKE select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE - select SYSTEM_TYPE_LAPTOP select TPM2 select MAINBOARD_USES_IFD_EC_REGION
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig index dcc5b38..31ff6e9 100644 --- a/src/mainboard/google/eve/Kconfig +++ b/src/mainboard/google/eve/Kconfig @@ -21,7 +21,6 @@ select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_HAS_TPM2 select SOC_INTEL_KABYLAKE - select SYSTEM_TYPE_CONVERTIBLE
config VBOOT select EC_GOOGLE_CHROMEEC_SWITCHES diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index 5e3545a..eda91c5 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -18,7 +18,6 @@ select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 select SOC_INTEL_SKYLAKE - select SYSTEM_TYPE_LAPTOP select MAINBOARD_HAS_LIBGFXINIT select MAINBOARD_NO_FSP_GOP if !BOARD_GOOGLE_GLADOS
diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index 46aa4d1..3b9fc5e 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -2,7 +2,6 @@ config BOARD_GOOGLE_BASEBOARD_HATCH def_bool n select BOARD_GOOGLE_HATCH_COMMON - select SYSTEM_TYPE_LAPTOP select VBOOT_LID_SWITCH
config BOARD_GOOGLE_BASEBOARD_PUFF diff --git a/src/mainboard/google/kahlee/Kconfig b/src/mainboard/google/kahlee/Kconfig index 07eb585..df9337f 100644 --- a/src/mainboard/google/kahlee/Kconfig +++ b/src/mainboard/google/kahlee/Kconfig @@ -33,7 +33,6 @@ select PCIEXP_COMMON_CLOCK select PCIEXP_L1_SUB_STATE select HAVE_EM100_SUPPORT - select SYSTEM_TYPE_LAPTOP
if BOARD_GOOGLE_BASEBOARD_KAHLEE
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index 2c2a05d..3a6c27b 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_C216 select BOARD_ROMSIZE_KB_8192 diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig index 7d9e1e8..9a258e2 100644 --- a/src/mainboard/google/octopus/Kconfig +++ b/src/mainboard/google/octopus/Kconfig @@ -39,7 +39,6 @@
config BASEBOARD_OCTOPUS_LAPTOP def_bool n - select SYSTEM_TYPE_LAPTOP
config CHROMEOS bool diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 4afd761..6d1f1e5 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_C216 select EC_COMPAL_ENE932 diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 8553821..20181a7 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -182,7 +182,6 @@ select EXCLUDE_NATIVE_SD_INTERFACE select MAINBOARD_HAS_SPI_TPM_CR50 select NO_FADT_8042 - select SYSTEM_TYPE_DETACHABLE select VARIANT_HAS_CAMERA_ACPI select GEO_SAR_ENABLE if CHROMEOS_WIFI_SAR
@@ -200,7 +199,6 @@ def_bool n select DRIVERS_I2C_MAX98927 select NO_FADT_8042 - select SYSTEM_TYPE_DETACHABLE select VARIANT_HAS_CAMERA_ACPI select MAINBOARD_HAS_I2C_TPM_CR50
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 3cb5e26..f54f131 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -13,7 +13,6 @@ select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select MAINBOARD_HAS_TPM1 - select SYSTEM_TYPE_LAPTOP if !BOARD_GOOGLE_NINJA && !BOARD_GOOGLE_SUMO
if BOARD_GOOGLE_BASEBOARD_RAMBI
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 25d02cd..2a169ea 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -27,7 +27,6 @@
config BASEBOARD_REEF_LAPTOP def_bool n - select SYSTEM_TYPE_LAPTOP
config DRIVER_TPM_I2C_BUS hex diff --git a/src/mainboard/google/sarien/Kconfig b/src/mainboard/google/sarien/Kconfig index 3cd4965..9af4a7d 100644 --- a/src/mainboard/google/sarien/Kconfig +++ b/src/mainboard/google/sarien/Kconfig @@ -20,8 +20,6 @@ select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SOC_INTEL_COMMON_BLOCK_SMM_ESPI_DISABLE select SPD_READ_BY_WORD - select SYSTEM_TYPE_LAPTOP if BOARD_GOOGLE_SARIEN - select SYSTEM_TYPE_CONVERTIBLE if BOARD_GOOGLE_ARCADA select TPM2 select MAINBOARD_USES_IFD_EC_REGION select MAINBOARD_USES_IFD_GBE_REGION if BOARD_GOOGLE_SARIEN diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 21659ab..13857f4 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -1,6 +1,5 @@ config BOARD_GOOGLE_BASEBOARD_SLIPPY def_bool n - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_HASWELL select NORTHBRIDGE_INTEL_HASWELL select SOUTHBRIDGE_INTEL_LYNXPOINT diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index b0ab7f9..6586bb0 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_C216 select EC_QUANTA_IT8518 diff --git a/src/mainboard/google/veyron/Kconfig.name b/src/mainboard/google/veyron/Kconfig.name index bf734cc..f7b30fe 100644 --- a/src/mainboard/google/veyron/Kconfig.name +++ b/src/mainboard/google/veyron/Kconfig.name @@ -3,24 +3,19 @@ config BOARD_GOOGLE_VEYRON_JAQ bool "-> Veyron_Jaq (Haier Chromebook 11)" select BOARD_GOOGLE_VEYRON - select SYSTEM_TYPE_LAPTOP
config BOARD_GOOGLE_VEYRON_JERRY bool "-> Veyron_Jerry (Hisense Chromebook 11)" select BOARD_GOOGLE_VEYRON - select SYSTEM_TYPE_LAPTOP
config BOARD_GOOGLE_VEYRON_MIGHTY bool "-> Veyron_Mighty (Haier Chromebook 11(edu))" select BOARD_GOOGLE_VEYRON - select SYSTEM_TYPE_LAPTOP
config BOARD_GOOGLE_VEYRON_MINNIE bool "-> Veyron_Minnie (ASUS Chromebook Flip C100)" select BOARD_GOOGLE_VEYRON - select SYSTEM_TYPE_LAPTOP
config BOARD_GOOGLE_VEYRON_SPEEDY bool "-> Veyron_Speedy (ASUS C201 Chromebook)" select BOARD_GOOGLE_VEYRON - select SYSTEM_TYPE_LAPTOP diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig index 9a2e373..8a44ddf 100644 --- a/src/mainboard/google/zork/Kconfig +++ b/src/mainboard/google/zork/Kconfig @@ -34,7 +34,6 @@ select PCIEXP_COMMON_CLOCK select PCIEXP_L1_SUB_STATE select HAVE_EM100_SUPPORT - select SYSTEM_TYPE_LAPTOP select DRIVERS_GENERIC_MAX98357A select HAVE_ACPI_RESUME select DRIVERS_USB_ACPI diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig index 77c929f..bf51d33 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig +++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig @@ -4,7 +4,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_AMD_AGESA_FAMILY15_TN select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN select SOUTHBRIDGE_AMD_AGESA_HUDSON diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig index c4cd3a4..8155807 100644 --- a/src/mainboard/hp/snb_ivb_laptops/Kconfig +++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig @@ -9,7 +9,6 @@ select HAVE_OPTION_TABLE select NORTHBRIDGE_INTEL_SANDYBRIDGE select SERIRQ_CONTINUOUS_MODE - select SYSTEM_TYPE_LAPTOP select USE_NATIVE_RAMINIT
if BOARD_HP_SNB_IVB_LAPTOPS diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig index 8ed2aff..0e1d3b9 100644 --- a/src/mainboard/intel/glkrvp/Kconfig +++ b/src/mainboard/intel/glkrvp/Kconfig @@ -18,7 +18,6 @@
config BASEBOARD_GLKRVP_LAPTOP def_bool n - select SYSTEM_TYPE_LAPTOP
choice prompt "ON BOARD EC" diff --git a/src/mainboard/lenovo/g505s/Kconfig b/src/mainboard/lenovo/g505s/Kconfig index 65201ab..b85bf47 100644 --- a/src/mainboard/lenovo/g505s/Kconfig +++ b/src/mainboard/lenovo/g505s/Kconfig @@ -4,7 +4,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_AMD_AGESA_FAMILY15_TN select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN select SOUTHBRIDGE_AMD_AGESA_HUDSON diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig index 5b9344a..626f450 100644 --- a/src/mainboard/lenovo/l520/Kconfig +++ b/src/mainboard/lenovo/l520/Kconfig @@ -15,7 +15,6 @@ select GFX_GMA_PANEL_1_ON_LVDS select SERIRQ_CONTINUOUS_MODE select SOUTHBRIDGE_INTEL_BD82X6X - select SYSTEM_TYPE_LAPTOP select USE_NATIVE_RAMINIT
config MAINBOARD_DIR diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig index 64f4b29..a00b471 100644 --- a/src/mainboard/lenovo/s230u/Kconfig +++ b/src/mainboard/lenovo/s230u/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/t400/Kconfig b/src/mainboard/lenovo/t400/Kconfig index e6f5631..20d4d73 100644 --- a/src/mainboard/lenovo/t400/Kconfig +++ b/src/mainboard/lenovo/t400/Kconfig @@ -3,7 +3,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_P select NORTHBRIDGE_INTEL_GM45 select SOUTHBRIDGE_INTEL_I82801IX diff --git a/src/mainboard/lenovo/t410/Kconfig b/src/mainboard/lenovo/t410/Kconfig index e939234..d462159 100644 --- a/src/mainboard/lenovo/t410/Kconfig +++ b/src/mainboard/lenovo/t410/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_IRONLAKE select SOUTHBRIDGE_INTEL_IBEXPEAK select EC_LENOVO_PMH7 diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig index 182ca46..c2b5af1 100644 --- a/src/mainboard/lenovo/t420/Kconfig +++ b/src/mainboard/lenovo/t420/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_BD82X6X diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index e2fd824..35c9f64 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_BD82X6X diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig index 6139452..7fc7280 100644 --- a/src/mainboard/lenovo/t430/Kconfig +++ b/src/mainboard/lenovo/t430/Kconfig @@ -18,7 +18,6 @@ select NORTHBRIDGE_INTEL_SANDYBRIDGE select SERIRQ_CONTINUOUS_MODE select SOUTHBRIDGE_INTEL_C216 - select SYSTEM_TYPE_LAPTOP select USE_NATIVE_RAMINIT select DRIVERS_LENOVO_HYBRID_GRAPHICS select MAINBOARD_HAS_LIBGFXINIT diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 81b87c8..02e5e47 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/t440p/Kconfig b/src/mainboard/lenovo/t440p/Kconfig index adb1722..a313eae 100644 --- a/src/mainboard/lenovo/t440p/Kconfig +++ b/src/mainboard/lenovo/t440p/Kconfig @@ -20,7 +20,6 @@ select NORTHBRIDGE_INTEL_HASWELL select SERIRQ_CONTINUOUS_MODE select SOUTHBRIDGE_INTEL_LYNXPOINT - select SYSTEM_TYPE_LAPTOP select MAINBOARD_USES_IFD_GBE_REGION select H8_HAS_BAT_TRESHOLDS_IMPL
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index 3529367..0cfa6e4 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -1,6 +1,5 @@ config BOARD_LENOVO_BASEBOARD_T520 def_bool n - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_BD82X6X diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 4dc77e9..fb1089f 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -1,6 +1,5 @@ config BOARD_LENOVO_BASEBOARD_T530 def_bool n - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index 57172ca..4380a6d 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_M select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/lenovo/x131e/Kconfig b/src/mainboard/lenovo/x131e/Kconfig index 06c5d83..276f7c0 100644 --- a/src/mainboard/lenovo/x131e/Kconfig +++ b/src/mainboard/lenovo/x131e/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig index 246e1db..33d568a 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig +++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig index 731f4cb..b4446db 100644 --- a/src/mainboard/lenovo/x200/Kconfig +++ b/src/mainboard/lenovo/x200/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_BGA956 select NORTHBRIDGE_INTEL_GM45 select SOUTHBRIDGE_INTEL_I82801IX diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig index d73eac3..4b50e48 100644 --- a/src/mainboard/lenovo/x201/Kconfig +++ b/src/mainboard/lenovo/x201/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_IRONLAKE select SOUTHBRIDGE_INTEL_IBEXPEAK select EC_LENOVO_PMH7 diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 33e15a8..14ded19 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_C216 select EC_LENOVO_PMH7 diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index f134bc8..097242a 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select USE_NATIVE_RAMINIT select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 5083fd5..1ceb085 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_M select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/packardbell/ms2290/Kconfig b/src/mainboard/packardbell/ms2290/Kconfig index 4fc971f..7e00e9c 100644 --- a/src/mainboard/packardbell/ms2290/Kconfig +++ b/src/mainboard/packardbell/ms2290/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_IRONLAKE select SOUTHBRIDGE_INTEL_IBEXPEAK select HAVE_OPTION_TABLE diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig index 202a35d..78aa0d6 100644 --- a/src/mainboard/purism/librem_bdw/Kconfig +++ b/src/mainboard/purism/librem_bdw/Kconfig @@ -1,6 +1,5 @@ config BOARD_PURISM_BASEBOARD_LIBREM_BDW def_bool n - select SYSTEM_TYPE_LAPTOP select BOARD_ROMSIZE_KB_8192 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES diff --git a/src/mainboard/purism/librem_skl/Kconfig b/src/mainboard/purism/librem_skl/Kconfig index c86ebf1..d55bc73 100644 --- a/src/mainboard/purism/librem_skl/Kconfig +++ b/src/mainboard/purism/librem_skl/Kconfig @@ -14,7 +14,6 @@ select SOC_INTEL_KABYLAKE if BOARD_PURISM_LIBREM13_V4 || BOARD_PURISM_LIBREM15_V4 select SOC_INTEL_SKYLAKE if BOARD_PURISM_LIBREM13_V2 || BOARD_PURISM_LIBREM15_V3 select SPD_READ_BY_WORD - select SYSTEM_TYPE_LAPTOP
if BOARD_PURISM_BASEBOARD_LIBREM_SKL
diff --git a/src/mainboard/razer/blade_stealth_kbl/Kconfig b/src/mainboard/razer/blade_stealth_kbl/Kconfig index 532bd76..4b6a338 100644 --- a/src/mainboard/razer/blade_stealth_kbl/Kconfig +++ b/src/mainboard/razer/blade_stealth_kbl/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select BOARD_ROMSIZE_KB_8192 select SUPERIO_ITE_IT8528E select SOC_INTEL_KABYLAKE diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig index 9d08c96..742e818 100644 --- a/src/mainboard/roda/rk886ex/Kconfig +++ b/src/mainboard/roda/rk886ex/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_M select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig index 7516255..4342d34 100644 --- a/src/mainboard/roda/rk9/Kconfig +++ b/src/mainboard/roda/rk9/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_BGA956 select NORTHBRIDGE_INTEL_GM45 select SOUTHBRIDGE_INTEL_I82801IX diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig index 70c383f..af71965 100644 --- a/src/mainboard/roda/rv11/Kconfig +++ b/src/mainboard/roda/rv11/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_C216 select BOARD_ROMSIZE_KB_16384 diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 6e72921..5a5006c 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS def_bool y - select SYSTEM_TYPE_LAPTOP select BOARD_ROMSIZE_KB_8192 select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM diff --git a/src/mainboard/system76/lemp9/Kconfig b/src/mainboard/system76/lemp9/Kconfig index cc21ca9..849b30d 100644 --- a/src/mainboard/system76/lemp9/Kconfig +++ b/src/mainboard/system76/lemp9/Kconfig @@ -18,7 +18,6 @@ select SOC_INTEL_COMMON_BLOCK_HDA select SOC_INTEL_COMMON_BLOCK_HDA_VERB select SPD_READ_BY_WORD - select SYSTEM_TYPE_LAPTOP select USE_LEGACY_8254_TIMER # Fix failure to boot GRUB
config MAINBOARD_DIR
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Patch Set 1:
I noticed google/zork pushes fadt_pm_profile into devicetree.cb. I think it would be useful to somehow introduce a top-level config structure, such that we would have a place for some global configuration bytes, independent of soc/chip.h.
Some of these things that end up in FADT at least are just constant values but can vary between variants.
Raul Rangel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Patch Set 1:
Maybe you deprecate it for now and make sure it's announced in the release notes that it's going away. This way people have a chance to update their devicetree with the correct value.
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Patch Set 1:
Patch Set 1:
Maybe you deprecate it for now and make sure it's announced in the release notes that it's going away. This way people have a chance to update their devicetree with the correct value.
It wasn't clear from my message, but I would rather use one of SMBIOS_ENCLOSURE_xxx enums directly. I think we could make the change in bulk if we find a compact way to put this into devicetrees in the first place.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Patch Set 1: Code-Review+1
Hello build bot (Jenkins), Raul Rangel, Nico Huber, Furquan Shaikh, Duncan Laurie, Angel Pons, Alexander Couzens, Evgeny Zinoviev, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/42142
to look at the new patch set (#2).
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
[RFC] Move SYSTEM_TYPE_xxx to devicetree.cb
This makes the entire range of SMBIOS_ENCLOSURE_xx enums usable.
Change-Id: Ib546706d04fede6c14ac57280ae72dca4fb7085b Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/Kconfig M src/arch/x86/smbios.c M src/mainboard/51nb/x210/Kconfig M src/mainboard/apple/macbook21/Kconfig M src/mainboard/apple/macbookair4_2/Kconfig M src/mainboard/compulab/intense_pc/Kconfig M src/mainboard/getac/p470/Kconfig M src/mainboard/google/auron/Kconfig M src/mainboard/google/butterfly/Kconfig M src/mainboard/google/cyan/Kconfig M src/mainboard/google/dedede/Kconfig M src/mainboard/google/deltaur/Kconfig M src/mainboard/google/drallion/Kconfig M src/mainboard/google/eve/Kconfig M src/mainboard/google/glados/Kconfig M src/mainboard/google/hatch/Kconfig M src/mainboard/google/kahlee/Kconfig M src/mainboard/google/link/Kconfig M src/mainboard/google/octopus/Kconfig M src/mainboard/google/parrot/Kconfig M src/mainboard/google/poppy/Kconfig M src/mainboard/google/rambi/Kconfig M src/mainboard/google/reef/Kconfig M src/mainboard/google/sarien/Kconfig M src/mainboard/google/slippy/Kconfig M src/mainboard/google/stout/Kconfig M src/mainboard/google/veyron/Kconfig.name M src/mainboard/google/zork/Kconfig M src/mainboard/hp/pavilion_m6_1035dx/Kconfig M src/mainboard/hp/snb_ivb_laptops/Kconfig M src/mainboard/intel/glkrvp/Kconfig M src/mainboard/lenovo/g505s/Kconfig M src/mainboard/lenovo/l520/Kconfig M src/mainboard/lenovo/s230u/Kconfig M src/mainboard/lenovo/t400/Kconfig M src/mainboard/lenovo/t410/Kconfig M src/mainboard/lenovo/t420/Kconfig M src/mainboard/lenovo/t420s/Kconfig M src/mainboard/lenovo/t430/Kconfig M src/mainboard/lenovo/t430s/Kconfig M src/mainboard/lenovo/t440p/Kconfig M src/mainboard/lenovo/t520/Kconfig M src/mainboard/lenovo/t530/Kconfig M src/mainboard/lenovo/t60/Kconfig M src/mainboard/lenovo/x131e/Kconfig M src/mainboard/lenovo/x1_carbon_gen1/Kconfig M src/mainboard/lenovo/x200/Kconfig M src/mainboard/lenovo/x201/Kconfig M src/mainboard/lenovo/x220/Kconfig M src/mainboard/lenovo/x230/Kconfig M src/mainboard/lenovo/x60/Kconfig M src/mainboard/packardbell/ms2290/Kconfig M src/mainboard/purism/librem_bdw/Kconfig M src/mainboard/purism/librem_skl/Kconfig M src/mainboard/razer/blade_stealth_kbl/Kconfig M src/mainboard/roda/rk886ex/Kconfig M src/mainboard/roda/rk9/Kconfig M src/mainboard/roda/rv11/Kconfig M src/mainboard/samsung/lumpy/Kconfig M src/mainboard/system76/lemp9/Kconfig 60 files changed, 2 insertions(+), 90 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/42142/2
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42142/3/src/mainboard/google/hatch/... File src/mainboard/google/hatch/Kconfig:
https://review.coreboot.org/c/coreboot/+/42142/3/src/mainboard/google/hatch/... PS3, Line 5: select VBOOT_LID_SWITCH Is this change intentional?
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42142/3/src/mainboard/google/hatch/... File src/mainboard/google/hatch/Kconfig:
https://review.coreboot.org/c/coreboot/+/42142/3/src/mainboard/google/hatch/... PS3, Line 5: select VBOOT_LID_SWITCH
Is this change intentional?
No, rebase error.
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Abandoned
Kyösti Mälkki has restored this change. ( https://review.coreboot.org/c/coreboot/+/42142 )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Restored
Kyösti Mälkki has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/42142?usp=email )
Change subject: [RFC] Move SYSTEM_TYPE_xxx to devicetree.cb ......................................................................
Abandoned
-
Angel Pons (Code Review) -
Kyösti Mälkki (Code Review)
-
Paul Menzel (Code Review)
-
Raul Rangel (Code Review)