Merge branch 'coreboot-configs' of and_who/libreboot into master

26 files changed, 31 insertions, 47 deletions

diff --git a/projects/coreboot/configs/seabios/d510mo/config b/projects/coreboot/configs/seabios/d510mo/config
index 1000508c..cf8d27f6 100644
--- a/projects/coreboot/configs/seabios/d510mo/config
+++ b/projects/coreboot/configs/seabios/d510mo/config
@@ -141,6 +141,7 @@ CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_BOARD_INTEL_D510MO=y
 # CONFIG_BOARD_INTEL_D810E2CB is not set
 # CONFIG_BOARD_INTEL_D945GCLF is not set
+# CONFIG_BOARD_INTEL_DCP847SKE is not set
 # CONFIG_BOARD_INTEL_DG43GT is not set
 # CONFIG_BOARD_INTEL_EAGLEHEIGHTS is not set
 # CONFIG_BOARD_INTEL_EMERALDLAKE2 is not set
@@ -162,6 +163,7 @@ CONFIG_BOARD_INTEL_D510MO=y
 # CONFIG_BOARD_INTEL_TRUXTON is not set
 # CONFIG_BOARD_INTEL_WTM2 is not set
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D510MO"
 # CONFIG_BOARD_INTEL_BASEBOARD_GLKRVP is not set
 CONFIG_CPU_ADDR_BITS=32
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -437,7 +439,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
@@ -580,7 +581,6 @@ CONFIG_COMMON_FADT=y
 # CONFIG_GENERATE_MP_TABLE is not set
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D510MO"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/d945gclf/config b/projects/coreboot/configs/seabios/d945gclf/config
index b009e240..1f2d39b7 100644
--- a/projects/coreboot/configs/seabios/d945gclf/config
+++ b/projects/coreboot/configs/seabios/d945gclf/config
@@ -145,6 +145,7 @@ CONFIG_TTYS0_LCS=3
 # CONFIG_BOARD_INTEL_D510MO is not set
 # CONFIG_BOARD_INTEL_D810E2CB is not set
 CONFIG_BOARD_INTEL_D945GCLF=y
+# CONFIG_BOARD_INTEL_DCP847SKE is not set
 # CONFIG_BOARD_INTEL_DG43GT is not set
 # CONFIG_BOARD_INTEL_EAGLEHEIGHTS is not set
 # CONFIG_BOARD_INTEL_EMERALDLAKE2 is not set
@@ -166,6 +167,7 @@ CONFIG_BOARD_INTEL_D945GCLF=y
 # CONFIG_BOARD_INTEL_TRUXTON is not set
 # CONFIG_BOARD_INTEL_WTM2 is not set
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D945GCLF"
 # CONFIG_BOARD_INTEL_BASEBOARD_GLKRVP is not set
 CONFIG_CPU_ADDR_BITS=32
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
@@ -449,7 +451,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
@@ -608,7 +609,6 @@ CONFIG_COMMON_FADT=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="D945GCLF"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/ga-g41m-es2l/config b/projects/coreboot/configs/seabios/ga-g41m-es2l/config
index 3393ce2a..237f6daa 100644
--- a/projects/coreboot/configs/seabios/ga-g41m-es2l/config
+++ b/projects/coreboot/configs/seabios/ga-g41m-es2l/config
@@ -142,6 +142,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="GA-G41M-ES2L"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
@@ -424,7 +425,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 CONFIG_REALTEK_8168_RESET=y
 CONFIG_REALTEK_8168_MACADDRESS="00:4c:69:62:72:65"
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
@@ -568,7 +568,6 @@ CONFIG_COMMON_FADT=y
 # CONFIG_GENERATE_MP_TABLE is not set
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="GA-G41M-ES2L"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/kcma-d8/config b/projects/coreboot/configs/seabios/kcma-d8/config
index 3e851573..8b78ab25 100644
--- a/projects/coreboot/configs/seabios/kcma-d8/config
+++ b/projects/coreboot/configs/seabios/kcma-d8/config
@@ -130,6 +130,7 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 # CONFIG_BOARD_ASUS_A8N_SLI is not set
 # CONFIG_BOARD_ASUS_A8V_E_DELUXE is not set
 # CONFIG_BOARD_ASUS_A8V_E_SE is not set
+# CONFIG_BOARD_ASUS_AM1I_A is not set
 # CONFIG_BOARD_ASUS_DSBF is not set
 # CONFIG_BOARD_ASUS_F2A85_M is not set
 # CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
@@ -171,6 +172,7 @@ CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KCMA-D8"
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
@@ -471,7 +473,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
@@ -613,7 +614,6 @@ CONFIG_HAVE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KCMA-D8"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/kfsn4-dre/config b/projects/coreboot/configs/seabios/kfsn4-dre/config
index f85275f7..e4435801 100644
--- a/projects/coreboot/configs/seabios/kfsn4-dre/config
+++ b/projects/coreboot/configs/seabios/kfsn4-dre/config
@@ -131,6 +131,7 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 # CONFIG_BOARD_ASUS_A8N_SLI is not set
 # CONFIG_BOARD_ASUS_A8V_E_DELUXE is not set
 # CONFIG_BOARD_ASUS_A8V_E_SE is not set
+# CONFIG_BOARD_ASUS_AM1I_A is not set
 # CONFIG_BOARD_ASUS_DSBF is not set
 # CONFIG_BOARD_ASUS_F2A85_M is not set
 # CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
@@ -174,6 +175,7 @@ CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_TTYS0_LCS=3
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KFSN4-DRE"
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_USBDEBUG=y
@@ -480,7 +482,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
@@ -632,7 +633,6 @@ CONFIG_HAVE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KFSN4-DRE"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/kgpe-d16/config b/projects/coreboot/configs/seabios/kgpe-d16/config
index 5bc73835..7a2eca9c 100644
--- a/projects/coreboot/configs/seabios/kgpe-d16/config
+++ b/projects/coreboot/configs/seabios/kgpe-d16/config
@@ -131,6 +131,7 @@ CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="ASUS"
 # CONFIG_BOARD_ASUS_A8N_SLI is not set
 # CONFIG_BOARD_ASUS_A8V_E_DELUXE is not set
 # CONFIG_BOARD_ASUS_A8V_E_SE is not set
+# CONFIG_BOARD_ASUS_AM1I_A is not set
 # CONFIG_BOARD_ASUS_DSBF is not set
 # CONFIG_BOARD_ASUS_F2A85_M is not set
 # CONFIG_BOARD_ASUS_F2A85_M_PRO is not set
@@ -172,6 +173,7 @@ CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
 CONFIG_UDELAY_LAPIC_FIXED_FSB=200
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 CONFIG_CPU_ADDR_BITS=48
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
@@ -472,7 +474,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
@@ -615,7 +616,6 @@ CONFIG_HAVE_PIRQ_TABLE=y
 CONFIG_GENERATE_MP_TABLE=y
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KGPE-D16"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/macbook21/config b/projects/coreboot/configs/seabios/macbook21/config
index 133db9d0..2fcf83ea 100644
--- a/projects/coreboot/configs/seabios/macbook21/config
+++ b/projects/coreboot/configs/seabios/macbook21/config
@@ -135,6 +135,7 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
 CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
@@ -418,7 +419,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
@@ -561,7 +561,6 @@ CONFIG_COMMON_FADT=y
 CONFIG_GENERATE_MP_TABLE=y
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config b/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
index d648f094..a6110151 100644
--- a/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
+++ b/projects/coreboot/configs/seabios/qemu_i440fx_piix4/config
@@ -135,6 +135,7 @@ CONFIG_POST_DEVICE=y
 CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 i440fx/piix4"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 CONFIG_MAINBOARD_VERSION="1.0"
@@ -390,7 +391,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
@@ -517,7 +517,6 @@ CONFIG_HAVE_PIRQ_TABLE=y
 # CONFIG_GENERATE_MP_TABLE is not set
 CONFIG_GENERATE_PIRQ_TABLE=y
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 i440fx/piix4"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/qemu_q35_ich9/config b/projects/coreboot/configs/seabios/qemu_q35_ich9/config
index aeee9cc9..7c3a47cf 100644
--- a/projects/coreboot/configs/seabios/qemu_q35_ich9/config
+++ b/projects/coreboot/configs/seabios/qemu_q35_ich9/config
@@ -117,14 +117,11 @@ CONFIG_MAINBOARD_SERIAL_NUMBER="123456789"
 CONFIG_DCACHE_RAM_BASE=0xd0000
 CONFIG_DCACHE_RAM_SIZE=0x10000
 CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Emulation"
-CONFIG_HAVE_IFD_BIN=y
-# CONFIG_HAVE_ME_BIN is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xb0000000
 CONFIG_POST_IO=y
 CONFIG_DEVICETREE="devicetree.cb"
 CONFIG_BOOTBLOCK_MAINBOARD_INIT="mainboard/emulation/qemu-q35/bootblock.c"
 CONFIG_MAX_REBOOT_CNT=3
-# CONFIG_HAVE_GBE_BIN is not set
 CONFIG_ID_SECTION_OFFSET=0x80
 # CONFIG_BOARD_EMULATION_QEMU_ARMV7 is not set
 # CONFIG_BOARD_EMULATION_QEMU_X86_I440FX is not set
@@ -138,7 +135,7 @@ CONFIG_POST_DEVICE=y
 CONFIG_FMDFILE=""
 CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
 CONFIG_DRIVERS_UART_8250IO=y
-CONFIG_IFD_BIN_PATH="$(obj)/../ich9gen/ich9fdgbe_8m.bin"
+CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
 CONFIG_CPU_ADDR_BITS=36
 CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8
 # CONFIG_USBDEBUG is not set
@@ -273,7 +270,6 @@ CONFIG_SOUTHBRIDGE_INTEL_COMMON_SMBUS=y
 # CONFIG_SOUTHBRIDGE_INTEL_COMMON_RCBA_PIRQ is not set
 # CONFIG_HAVE_INTEL_CHIPSET_LOCKDOWN is not set
 CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
-# CONFIG_LOCK_MANAGEMENT_ENGINE is not set
 
 #
 # Super I/O
@@ -283,13 +279,6 @@ CONFIG_SOUTHBRIDGE_INTEL_I82801IX=y
 #
 # Embedded Controllers
 #
-CONFIG_HAVE_INTEL_FIRMWARE=y
-
-#
-# Intel Firmware
-#
-# CONFIG_EM100 is not set
-# CONFIG_HAVE_EC_BIN is not set
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
 # CONFIG_GOOGLE_SMBIOS_MAINBOARD_VERSION is not set
 # CONFIG_UEFI_2_4_BINDING is not set
@@ -403,7 +392,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
@@ -529,7 +517,6 @@ CONFIG_HAVE_ACPI_TABLES=y
 # CONFIG_GENERATE_MP_TABLE is not set
 # CONFIG_GENERATE_PIRQ_TABLE is not set
 CONFIG_GENERATE_SMBIOS_TABLES=y
-CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="QEMU x86 q35/ich9"
 
 #
 # Payload
diff --git a/projects/coreboot/configs/seabios/r400_16mb/config b/projects/coreboot/configs/seabios/r400_16mb/config
index 5e18135a..be8209a7 100644
--- a/projects/coreboot/configs/seabios/r400_16mb/config
+++ b/projects/coreboot/configs/seabios/r400_16mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/r400_4mb/config b/projects/coreboot/configs/seabios/r400_4mb/config
index becebc06..d838e8a7 100644
--- a/projects/coreboot/configs/seabios/r400_4mb/config
+++ b/projects/coreboot/configs/seabios/r400_4mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/r400_8mb/config b/projects/coreboot/configs/seabios/r400_8mb/config
index 14eb5497..197e906c 100644
--- a/projects/coreboot/configs/seabios/r400_8mb/config
+++ b/projects/coreboot/configs/seabios/r400_8mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/t400_16mb/config b/projects/coreboot/configs/seabios/t400_16mb/config
index 9368d339..cdda414b 100644
--- a/projects/coreboot/configs/seabios/t400_16mb/config
+++ b/projects/coreboot/configs/seabios/t400_16mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/t400_4mb/config b/projects/coreboot/configs/seabios/t400_4mb/config
index cc66b4bb..62c1f941 100644
--- a/projects/coreboot/configs/seabios/t400_4mb/config
+++ b/projects/coreboot/configs/seabios/t400_4mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/t400_8mb/config b/projects/coreboot/configs/seabios/t400_8mb/config
index cf20d266..045c9d37 100644
--- a/projects/coreboot/configs/seabios/t400_8mb/config
+++ b/projects/coreboot/configs/seabios/t400_8mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/t500_16mb/config b/projects/coreboot/configs/seabios/t500_16mb/config
index 4a691bb4..99dab812 100644
--- a/projects/coreboot/configs/seabios/t500_16mb/config
+++ b/projects/coreboot/configs/seabios/t500_16mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/t500_4mb/config b/projects/coreboot/configs/seabios/t500_4mb/config
index ee8b1527..99908d32 100644
--- a/projects/coreboot/configs/seabios/t500_4mb/config
+++ b/projects/coreboot/configs/seabios/t500_4mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/t500_8mb/config b/projects/coreboot/configs/seabios/t500_8mb/config
index d20cb720..94541069 100644
--- a/projects/coreboot/configs/seabios/t500_8mb/config
+++ b/projects/coreboot/configs/seabios/t500_8mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/t60/config b/projects/coreboot/configs/seabios/t60/config
index 8ccbacd1..04512207 100644
--- a/projects/coreboot/configs/seabios/t60/config
+++ b/projects/coreboot/configs/seabios/t60/config
@@ -320,6 +320,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
@@ -441,7 +442,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y
diff --git a/projects/coreboot/configs/seabios/w500_16mb/config b/projects/coreboot/configs/seabios/w500_16mb/config
index 4a691bb4..99dab812 100644
--- a/projects/coreboot/configs/seabios/w500_16mb/config
+++ b/projects/coreboot/configs/seabios/w500_16mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/w500_4mb/config b/projects/coreboot/configs/seabios/w500_4mb/config
index ee8b1527..99908d32 100644
--- a/projects/coreboot/configs/seabios/w500_4mb/config
+++ b/projects/coreboot/configs/seabios/w500_4mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/w500_8mb/config b/projects/coreboot/configs/seabios/w500_8mb/config
index d20cb720..94541069 100644
--- a/projects/coreboot/configs/seabios/w500_8mb/config
+++ b/projects/coreboot/configs/seabios/w500_8mb/config
@@ -315,6 +315,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
@@ -443,7 +444,6 @@ CONFIG_SUBSYSTEM_DEVICE_ID=0x0000
 # CONFIG_GIC is not set
 # CONFIG_IPMI_KCS is not set
 # CONFIG_DRIVERS_LENOVO_WACOM is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/x200_16mb/config b/projects/coreboot/configs/seabios/x200_16mb/config
index 87e0d4ed..abf25d09 100644
--- a/projects/coreboot/configs/seabios/x200_16mb/config
+++ b/projects/coreboot/configs/seabios/x200_16mb/config
@@ -313,6 +313,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
 
@@ -443,7 +444,6 @@ CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
 CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DIGITIZER_ABSENT is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/x200_4mb/config b/projects/coreboot/configs/seabios/x200_4mb/config
index 214128a1..33b2d886 100644
--- a/projects/coreboot/configs/seabios/x200_4mb/config
+++ b/projects/coreboot/configs/seabios/x200_4mb/config
@@ -313,6 +313,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
 
@@ -443,7 +444,6 @@ CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
 CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DIGITIZER_ABSENT is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/x200_8mb/config b/projects/coreboot/configs/seabios/x200_8mb/config
index 4d9ef0b0..8e2be019 100644
--- a/projects/coreboot/configs/seabios/x200_8mb/config
+++ b/projects/coreboot/configs/seabios/x200_8mb/config
@@ -313,6 +313,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_EC_LENOVO_PMH7=y
 CONFIG_HAVE_INTEL_FIRMWARE=y
 
@@ -443,7 +444,6 @@ CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
 CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DIGITIZER_ABSENT is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 # CONFIG_SPI_FLASH is not set
diff --git a/projects/coreboot/configs/seabios/x60/config b/projects/coreboot/configs/seabios/x60/config
index 952be764..8257be82 100644
--- a/projects/coreboot/configs/seabios/x60/config
+++ b/projects/coreboot/configs/seabios/x60/config
@@ -321,6 +321,7 @@ CONFIG_EC_ACPI=y
 CONFIG_EC_LENOVO_H8=y
 CONFIG_H8_BEEP_ON_DEATH=y
 CONFIG_H8_FLASH_LEDS_ON_DEATH=y
+# CONFIG_H8_SUPPORT_BT_ON_WIFI is not set
 CONFIG_H8_DOCK_EARLY_INIT=y
 CONFIG_EC_LENOVO_PMH7=y
 # CONFIG_MAINBOARD_HAS_CHROMEOS is not set
@@ -445,7 +446,6 @@ CONFIG_DRIVERS_LENOVO_WACOM=y
 # CONFIG_DIGITIZER_AUTODETECT is not set
 CONFIG_DIGITIZER_PRESENT=y
 # CONFIG_DIGITIZER_ABSENT is not set
-# CONFIG_CACHE_MRC_SETTINGS is not set
 # CONFIG_RT8168_GET_MAC_FROM_VPD is not set
 # CONFIG_RT8168_SET_LED_MODE is not set
 CONFIG_SPI_FLASH=y