Vladimir Serbinenko (phcoder@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7071
-gerrit
commit d4fbd3ec879c045af7a1f7c78cc234ffd2dc8af7 Author: Vladimir Serbinenko phcoder@gmail.com Date: Thu Oct 16 13:21:47 2014 +0200
smbios: Mark laptops as such
Change-Id: I179a4cede2f826f72a400208748798737216c01a Signed-off-by: Vladimir Serbinenko phcoder@gmail.com --- src/Kconfig | 4 ++++ src/arch/x86/boot/smbios.c | 6 +++++- src/mainboard/apple/macbook21/Kconfig | 1 + src/mainboard/getac/p470/Kconfig | 1 + src/mainboard/google/butterfly/Kconfig | 1 + src/mainboard/google/falco/Kconfig | 1 + src/mainboard/google/link/Kconfig | 1 + src/mainboard/google/parrot/Kconfig | 1 + src/mainboard/google/peppy/Kconfig | 1 + src/mainboard/google/stout/Kconfig | 1 + src/mainboard/hp/pavilion_m6_1035dx/Kconfig | 1 + src/mainboard/lenovo/t520/Kconfig | 1 + src/mainboard/lenovo/t530/Kconfig | 1 + src/mainboard/lenovo/t60/Kconfig | 1 + src/mainboard/lenovo/x200/Kconfig | 1 + src/mainboard/lenovo/x201/Kconfig | 1 + src/mainboard/lenovo/x220/Kconfig | 1 + src/mainboard/lenovo/x230/Kconfig | 1 + src/mainboard/lenovo/x60/Kconfig | 1 + src/mainboard/packardbell/ms2290/Kconfig | 1 + src/mainboard/roda/rk886ex/Kconfig | 1 + src/mainboard/roda/rk9/Kconfig | 1 + src/mainboard/samsung/lumpy/Kconfig | 1 + 23 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/src/Kconfig b/src/Kconfig index ecdc929..c08fd27 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -236,6 +236,10 @@ config BOOTBLOCK_NORMAL
endchoice
+config SYSTEM_TYPE_LAPTOP + default n + bool + config BOOTBLOCK_SOURCE string default "bootblock_simple.c" if BOOTBLOCK_SIMPLE diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index f374bd9..724def3 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -253,7 +253,11 @@ static int smbios_write_type3(unsigned long *current, int handle) t->bootup_state = SMBIOS_STATE_SAFE; t->power_supply_state = SMBIOS_STATE_SAFE; t->thermal_state = SMBIOS_STATE_SAFE; - t->_type = SMBIOS_ENCLOSURE_DESKTOP; + if(IS_ENABLED(CONFIG_SYSTEM_TYPE_LAPTOP)) { + t->_type = SMBIOS_ENCLOSURE_NOTEBOOK; + } else { + t->_type = SMBIOS_ENCLOSURE_DESKTOP; + } t->security_status = SMBIOS_STATE_SAFE; len = t->length + smbios_string_table_len(t->eos); *current += len; diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig index a01d6b1..1a491ec 100644 --- a/src/mainboard/apple/macbook21/Kconfig +++ b/src/mainboard/apple/macbook21/Kconfig @@ -2,6 +2,7 @@ if BOARD_APPLE_MACBOOK11 || BOARD_APPLE_MACBOOK21
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select ARCH_X86 select CPU_INTEL_SOCKET_MFCPGA478 select NORTHBRIDGE_INTEL_I945 diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig index 3b34f4a..919a8ef 100644 --- a/src/mainboard/getac/p470/Kconfig +++ b/src/mainboard/getac/p470/Kconfig @@ -20,6 +20,7 @@ if BOARD_GETAC_P470
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_MFCPGA478 select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index 08870fa..ae5ed20 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -2,6 +2,7 @@ if BOARD_GOOGLE_BUTTERFLY
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig index ba39c7d..e89d14e 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -2,6 +2,7 @@ if BOARD_GOOGLE_FALCO
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_HASWELL select SOUTHBRIDGE_INTEL_LYNXPOINT diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index 2512e44..96c3cb4 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -2,6 +2,7 @@ if BOARD_GOOGLE_LINK
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index ad8c620..3d6c378 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -2,6 +2,7 @@ if BOARD_GOOGLE_PARROT
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index f991903..acc23f2 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -2,6 +2,7 @@ if BOARD_GOOGLE_PEPPY
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_HASWELL select SOUTHBRIDGE_INTEL_LYNXPOINT diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index f127a9f..7b7c257 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -2,6 +2,7 @@ if BOARD_GOOGLE_STOUT
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig index 1f3fd8a..d82bfb5 100644 --- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig +++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig @@ -21,6 +21,7 @@ if BOARD_HP_PAVILION_M6_1035DX
config BOARD_SPECIFIC_OPTIONS # dummy 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/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index aa4f0a4..9e280d4 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -2,6 +2,7 @@ if BOARD_LENOVO_T520
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA988B select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index 6d411b8..a8c31c9 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -2,6 +2,7 @@ if BOARD_LENOVO_T530
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index c868e22..14c9488 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -2,6 +2,7 @@ if BOARD_LENOVO_T60
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_MFCPGA478 select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig index 73ed75f..ca6ca4f 100644 --- a/src/mainboard/lenovo/x200/Kconfig +++ b/src/mainboard/lenovo/x200/Kconfig @@ -2,6 +2,7 @@ if BOARD_LENOVO_X200
config BOARD_SPECIFIC_OPTIONS # dummy 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 571f35e..7e4c8f7 100644 --- a/src/mainboard/lenovo/x201/Kconfig +++ b/src/mainboard/lenovo/x201/Kconfig @@ -2,6 +2,7 @@ if BOARD_LENOVO_X201
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select NORTHBRIDGE_INTEL_NEHALEM select SOUTHBRIDGE_INTEL_IBEXPEAK select EC_LENOVO_PMH7 diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 4a05f50..b81afc8 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -2,6 +2,7 @@ if BOARD_LENOVO_X220
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 388a1ad..4012de1 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -2,6 +2,7 @@ if BOARD_LENOVO_X230
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE select SOUTHBRIDGE_INTEL_C216 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 1757327..7f8ccbf 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -2,6 +2,7 @@ if BOARD_LENOVO_X60
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_MFCPGA478 select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/packardbell/ms2290/Kconfig b/src/mainboard/packardbell/ms2290/Kconfig index f0b7538..58053e2 100644 --- a/src/mainboard/packardbell/ms2290/Kconfig +++ b/src/mainboard/packardbell/ms2290/Kconfig @@ -2,6 +2,7 @@ if BOARD_PACKARDBELL_MS2290
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select ARCH_BOOTBLOCK_X86_32 select ARCH_ROMSTAGE_X86_32 select ARCH_RAMSTAGE_X86_32 diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig index bbb5d9b..efe75a3 100644 --- a/src/mainboard/roda/rk886ex/Kconfig +++ b/src/mainboard/roda/rk886ex/Kconfig @@ -2,6 +2,7 @@ if BOARD_RODA_RK886EX
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select CPU_INTEL_SOCKET_MFCPGA478 select NORTHBRIDGE_INTEL_I945 select NORTHBRIDGE_INTEL_SUBTYPE_I945GM diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig index 271b0e4..9477848 100644 --- a/src/mainboard/roda/rk9/Kconfig +++ b/src/mainboard/roda/rk9/Kconfig @@ -2,6 +2,7 @@ if BOARD_RODA_RK9
config BOARD_SPECIFIC_OPTIONS # dummy 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/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index 68f3058..7d03fa0 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -2,6 +2,7 @@ if BOARD_SAMSUNG_LUMPY
config BOARD_SPECIFIC_OPTIONS # dummy def_bool y + select SYSTEM_TYPE_LAPTOP select BOARD_ROMSIZE_KB_8192 select MAINBOARD_HAS_CHROMEOS select CPU_INTEL_SOCKET_RPGA989