coreboot configs: don't enable wifi during early init

71 files changed, 81 insertions, 232 deletions

diff --git a/resources/coreboot/d510mo/config/libgfxinit_txtmode b/resources/coreboot/d510mo/config/libgfxinit_txtmode
index c881a60c..4d242084 100644
--- a/resources/coreboot/d510mo/config/libgfxinit_txtmode
+++ b/resources/coreboot/d510mo/config/libgfxinit_txtmode
@@ -132,7 +132,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=256
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_BOARD_INTEL_ADLRVP_P is not set
 # CONFIG_BOARD_INTEL_ADLRVP_P_EXT_EC is not set
@@ -415,7 +415,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode b/resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode
index 452f1881..3d385d17 100644
--- a/resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/d510mo_16mb/config/libgfxinit_txtmode
@@ -132,7 +132,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=256
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_BOARD_INTEL_ADLRVP_P is not set
 # CONFIG_BOARD_INTEL_ADLRVP_P_EXT_EC is not set
@@ -415,7 +415,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/d945gclf/config/libgfxinit_txtmode b/resources/coreboot/d945gclf/config/libgfxinit_txtmode
index f2536586..95ff9976 100644
--- a/resources/coreboot/d945gclf/config/libgfxinit_txtmode
+++ b/resources/coreboot/d945gclf/config/libgfxinit_txtmode
@@ -133,7 +133,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_BOARD_INTEL_ADLRVP_P is not set
 # CONFIG_BOARD_INTEL_ADLRVP_P_EXT_EC is not set
@@ -418,7 +418,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode b/resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode
index 3ffb9783..544f8d61 100644
--- a/resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/d945gclf_16mb/config/libgfxinit_txtmode
@@ -133,7 +133,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 # CONFIG_BOARD_INTEL_ADLRVP_P is not set
 # CONFIG_BOARD_INTEL_ADLRVP_P_EXT_EC is not set
@@ -418,7 +418,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/g43t-am3/config/libgfxinit_txtmode b/resources/coreboot/g43t-am3/config/libgfxinit_txtmode
index 9b7ba991..83bc9770 100644
--- a/resources/coreboot/g43t-am3/config/libgfxinit_txtmode
+++ b/resources/coreboot/g43t-am3/config/libgfxinit_txtmode
@@ -135,7 +135,7 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -401,7 +401,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode b/resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode
index 70d637f6..2d8bf557 100644
--- a/resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/g43t-am3_16mb/config/libgfxinit_txtmode
@@ -135,7 +135,7 @@ CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="G43T-AM3"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -401,7 +401,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode b/resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode
index b9be17a0..b52295a4 100644
--- a/resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode
+++ b/resources/coreboot/ga-g41m-es2l/config/libgfxinit_txtmode
@@ -133,7 +133,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_BOARD_GIGABYTE_GA_945GCM_S2L is not set
 # CONFIG_BOARD_GIGABYTE_GA_945GCM_S2C is not set
 # CONFIG_BOARD_GIGABYTE_GA_B75M_D3H is not set
@@ -401,7 +401,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode b/resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
index 20e2cfef..e0609b6c 100644
--- a/resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kcma-d8-rdimm_16mb/config/libgfxinit_txtmode
@@ -147,7 +147,7 @@ CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KCMA-D8"
@@ -472,8 +472,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
@@ -551,14 +550,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode b/resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
index c195191e..a6abaaa3 100644
--- a/resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kcma-d8-rdimm_2mb/config/libgfxinit_txtmode
@@ -147,7 +147,7 @@ CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KCMA-D8"
@@ -472,8 +472,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
@@ -551,14 +550,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode b/resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
index 20e2cfef..e0609b6c 100644
--- a/resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kcma-d8-udimm_16mb/config/libgfxinit_txtmode
@@ -147,7 +147,7 @@ CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KCMA-D8"
@@ -472,8 +472,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
@@ -551,14 +550,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode b/resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
index c195191e..a6abaaa3 100644
--- a/resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kcma-d8-udimm_2mb/config/libgfxinit_txtmode
@@ -147,7 +147,7 @@ CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KCMA-D8"
@@ -472,8 +472,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
@@ -551,14 +550,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode b/resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
index 992cfdd0..a255e678 100644
--- a/resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kfsn4-dre_1mb/config/libgfxinit_txtmode
@@ -145,7 +145,7 @@ CONFIG_FMDFILE=""
 # CONFIG_VBOOT is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KFSN4-DRE"
@@ -454,8 +454,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
@@ -533,14 +532,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode b/resources/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode
index 6dcb9ebd..fdc62644 100644
--- a/resources/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kfsn4-dre_2mb/config/libgfxinit_txtmode
@@ -145,7 +145,7 @@ CONFIG_FMDFILE=""
 # CONFIG_VBOOT is not set
 CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="KFSN4-DRE"
@@ -454,8 +454,7 @@ CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
 CONFIG_HAVE_USBDEBUG=y
 # CONFIG_HAVE_USBDEBUG_OPTIONS is not set
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 # CONFIG_DRIVERS_I2C_MAX98373 is not set
 # CONFIG_DRIVERS_I2C_MAX98927 is not set
@@ -533,14 +532,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode b/resources/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
index e8c710c7..881651a9 100644
--- a/resources/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kgpe-d16-rdimm_16mb/config/libgfxinit_txtmode
@@ -148,7 +148,7 @@ CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_TPM_PIRQ=0x0
@@ -475,8 +475,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
@@ -558,14 +557,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode b/resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
index 1de4d9cb..dc78002b 100644
--- a/resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kgpe-d16-rdimm_2mb/config/libgfxinit_txtmode
@@ -148,7 +148,7 @@ CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_TPM_PIRQ=0x0
@@ -475,8 +475,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
@@ -558,14 +557,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode b/resources/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
index e8c710c7..881651a9 100644
--- a/resources/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kgpe-d16-udimm_16mb/config/libgfxinit_txtmode
@@ -148,7 +148,7 @@ CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_TPM_PIRQ=0x0
@@ -475,8 +475,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
@@ -558,14 +557,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode b/resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
index 1de4d9cb..dc78002b 100644
--- a/resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/kgpe-d16-udimm_2mb/config/libgfxinit_txtmode
@@ -148,7 +148,7 @@ CONFIG_MMCONF_BASE_ADDRESS=0xc0000000
 CONFIG_POST_DEVICE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 # CONFIG_DRIVERS_UART_8250IO is not set
 CONFIG_DIMM_MAX=4
 CONFIG_TPM_PIRQ=0x0
@@ -475,8 +475,7 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_HAVE_USBDEBUG=y
 CONFIG_HAVE_USBDEBUG_OPTIONS=y
 # CONFIG_VPD is not set
-CONFIG_DRIVERS_GENERIC_WIFI=y
-# CONFIG_USE_SAR is not set
+# CONFIG_DRIVERS_GENERIC_WIFI is not set
 # CONFIG_DRIVERS_AMD_PI is not set
 CONFIG_DRIVERS_ASPEED_AST2050=y
 CONFIG_DRIVERS_ASPEED_AST_COMMON=y
@@ -558,14 +557,6 @@ CONFIG_BOOT_DEVICE_MEMORY_MAPPED=y
 # Console
 #
 CONFIG_SQUELCH_EARLY_SMP=y
-# CONFIG_CONSOLE_SERIAL_921600 is not set
-# CONFIG_CONSOLE_SERIAL_460800 is not set
-# CONFIG_CONSOLE_SERIAL_230400 is not set
-# CONFIG_CONSOLE_SERIAL_115200 is not set
-# CONFIG_CONSOLE_SERIAL_57600 is not set
-# CONFIG_CONSOLE_SERIAL_38400 is not set
-# CONFIG_CONSOLE_SERIAL_19200 is not set
-# CONFIG_CONSOLE_SERIAL_9600 is not set
 # CONFIG_SPKMODEM is not set
 # CONFIG_CONSOLE_NE2K is not set
 CONFIG_CONSOLE_CBMEM=y
diff --git a/resources/coreboot/macbook11/config/libgfxinit_corebootfb b/resources/coreboot/macbook11/config/libgfxinit_corebootfb
index bdf59974..5420a959 100644
--- a/resources/coreboot/macbook11/config/libgfxinit_corebootfb
+++ b/resources/coreboot/macbook11/config/libgfxinit_corebootfb
@@ -135,7 +135,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Macbook1,1"
 CONFIG_PS2K_EISAID="PNP0303"
@@ -382,7 +382,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/macbook11/config/libgfxinit_txtmode b/resources/coreboot/macbook11/config/libgfxinit_txtmode
index 5336caec..db8140fe 100644
--- a/resources/coreboot/macbook11/config/libgfxinit_txtmode
+++ b/resources/coreboot/macbook11/config/libgfxinit_txtmode
@@ -135,7 +135,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Macbook1,1"
 CONFIG_PS2K_EISAID="PNP0303"
@@ -380,7 +380,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/macbook11_16mb/config/libgfxinit_corebootfb b/resources/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
index d2217026..98bd4197 100644
--- a/resources/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/macbook11_16mb/config/libgfxinit_corebootfb
@@ -134,7 +134,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Macbook1,1"
 CONFIG_PS2K_EISAID="PNP0303"
@@ -381,7 +381,6 @@ CONFIG_DRIVERS_MC146818=y
 CONFIG_USE_PC_CMOS_ALTCENTURY=y
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/macbook11_16mb/config/libgfxinit_txtmode b/resources/coreboot/macbook11_16mb/config/libgfxinit_txtmode
index efe64d35..9ae50a48 100644
--- a/resources/coreboot/macbook11_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/macbook11_16mb/config/libgfxinit_txtmode
@@ -134,7 +134,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="Macbook1,1"
 CONFIG_PS2K_EISAID="PNP0303"
@@ -379,7 +379,6 @@ CONFIG_DRIVERS_MC146818=y
 CONFIG_USE_PC_CMOS_ALTCENTURY=y
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/macbook21/config/libgfxinit_corebootfb b/resources/coreboot/macbook21/config/libgfxinit_corebootfb
index 71ddfb4d..5deacf1c 100644
--- a/resources/coreboot/macbook21/config/libgfxinit_corebootfb
+++ b/resources/coreboot/macbook21/config/libgfxinit_corebootfb
@@ -135,7 +135,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 CONFIG_PS2K_EISAID="PNP0303"
@@ -382,7 +382,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/macbook21/config/libgfxinit_txtmode b/resources/coreboot/macbook21/config/libgfxinit_txtmode
index 127d03c4..079207e5 100644
--- a/resources/coreboot/macbook21/config/libgfxinit_txtmode
+++ b/resources/coreboot/macbook21/config/libgfxinit_txtmode
@@ -135,7 +135,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 CONFIG_PS2K_EISAID="PNP0303"
@@ -380,7 +380,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/macbook21_16mb/config/libgfxinit_corebootfb b/resources/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
index 38a50d5a..ff5266fd 100644
--- a/resources/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/macbook21_16mb/config/libgfxinit_corebootfb
@@ -134,7 +134,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 CONFIG_PS2K_EISAID="PNP0303"
@@ -381,7 +381,6 @@ CONFIG_DRIVERS_MC146818=y
 CONFIG_USE_PC_CMOS_ALTCENTURY=y
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/macbook21_16mb/config/libgfxinit_txtmode b/resources/coreboot/macbook21_16mb/config/libgfxinit_txtmode
index 7e917405..67167c0e 100644
--- a/resources/coreboot/macbook21_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/macbook21_16mb/config/libgfxinit_txtmode
@@ -134,7 +134,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="MacBook2,1"
 CONFIG_PS2K_EISAID="PNP0303"
@@ -379,7 +379,6 @@ CONFIG_DRIVERS_MC146818=y
 CONFIG_USE_PC_CMOS_ALTCENTURY=y
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb
index 8a1e5768..7b550cae 100644
--- a/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/r400_16mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/r400_16mb/config/libgfxinit_txtmode b/resources/coreboot/r400_16mb/config/libgfxinit_txtmode
index 36184374..81b31b95 100644
--- a/resources/coreboot/r400_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/r400_16mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb
index a2fc9469..e024b7c1 100644
--- a/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/r400_4mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/r400_4mb/config/libgfxinit_txtmode b/resources/coreboot/r400_4mb/config/libgfxinit_txtmode
index b387fb4d..9a85d382 100644
--- a/resources/coreboot/r400_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/r400_4mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb b/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb
index 2bd21464..3df366be 100644
--- a/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/r400_8mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/r400_8mb/config/libgfxinit_txtmode b/resources/coreboot/r400_8mb/config/libgfxinit_txtmode
index c10fd951..6ead5156 100644
--- a/resources/coreboot/r400_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/r400_8mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb
index 6b18694a..c88824dd 100644
--- a/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/r500_4mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -440,7 +440,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/r500_4mb/config/libgfxinit_txtmode b/resources/coreboot/r500_4mb/config/libgfxinit_txtmode
index 547da870..fa328cc2 100644
--- a/resources/coreboot/r500_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/r500_4mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad R500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -436,7 +436,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb
index 9087e4af..6c12f83d 100644
--- a/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t400_16mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t400_16mb/config/libgfxinit_txtmode b/resources/coreboot/t400_16mb/config/libgfxinit_txtmode
index 75add2d2..074c950b 100644
--- a/resources/coreboot/t400_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t400_16mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb
index 23384aaa..ff430791 100644
--- a/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t400_4mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t400_4mb/config/libgfxinit_txtmode b/resources/coreboot/t400_4mb/config/libgfxinit_txtmode
index a278bc48..520e7bb5 100644
--- a/resources/coreboot/t400_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t400_4mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb
index aedf8eac..65553571 100644
--- a/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t400_8mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t400_8mb/config/libgfxinit_txtmode b/resources/coreboot/t400_8mb/config/libgfxinit_txtmode
index c2a3f70e..76bc6d0c 100644
--- a/resources/coreboot/t400_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t400_8mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T400"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb
index 6af0ac6a..2765241b 100644
--- a/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t500_16mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t500_16mb/config/libgfxinit_txtmode b/resources/coreboot/t500_16mb/config/libgfxinit_txtmode
index 010505ff..b8259b65 100644
--- a/resources/coreboot/t500_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t500_16mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb
index 1483530f..351b7417 100644
--- a/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t500_4mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t500_4mb/config/libgfxinit_txtmode b/resources/coreboot/t500_4mb/config/libgfxinit_txtmode
index 072fdd56..96c21f59 100644
--- a/resources/coreboot/t500_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t500_4mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb b/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb
index 5519b7e6..c728c43b 100644
--- a/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t500_8mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t500_8mb/config/libgfxinit_txtmode b/resources/coreboot/t500_8mb/config/libgfxinit_txtmode
index 5375442e..abb1726f 100644
--- a/resources/coreboot/t500_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/t500_8mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb b/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
index 9fa8fb5b..18ef1f4f 100644
--- a/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_corebootfb
@@ -134,7 +134,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -428,7 +428,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode b/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
index 9d493f5b..a9f208e2 100644
--- a/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
+++ b/resources/coreboot/t60_16mb_intelgpu/config/libgfxinit_txtmode
@@ -134,7 +134,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -426,7 +426,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb b/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
index 05f76e53..5f5ab3a6 100644
--- a/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
+++ b/resources/coreboot/t60_intelgpu/config/libgfxinit_corebootfb
@@ -134,7 +134,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -428,7 +428,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode b/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
index 89284fd6..34b0bbd3 100644
--- a/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
+++ b/resources/coreboot/t60_intelgpu/config/libgfxinit_txtmode
@@ -134,7 +134,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad T60"
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -426,7 +426,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb
index 4d466d50..4e3fb5bc 100644
--- a/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/w500_16mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/w500_16mb/config/libgfxinit_txtmode b/resources/coreboot/w500_16mb/config/libgfxinit_txtmode
index 7d72fea7..f084703f 100644
--- a/resources/coreboot/w500_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/w500_16mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb
index 823e7619..a2d5e6e8 100644
--- a/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/w500_4mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/w500_4mb/config/libgfxinit_txtmode b/resources/coreboot/w500_4mb/config/libgfxinit_txtmode
index 1010a502..9036bf8c 100644
--- a/resources/coreboot/w500_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/w500_4mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb b/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb
index 8c96dda7..4e13a537 100644
--- a/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/w500_8mb/config/libgfxinit_corebootfb
@@ -140,7 +140,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/w500_8mb/config/libgfxinit_txtmode b/resources/coreboot/w500_8mb/config/libgfxinit_txtmode
index 7fbed8d8..79ae1301 100644
--- a/resources/coreboot/w500_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/w500_8mb/config/libgfxinit_txtmode
@@ -138,7 +138,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad W500"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb
index 0de9f837..dbd6b1ff 100644
--- a/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x200_16mb/config/libgfxinit_corebootfb
@@ -139,7 +139,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x200_16mb/config/libgfxinit_txtmode b/resources/coreboot/x200_16mb/config/libgfxinit_txtmode
index dbeef704..5e95103c 100644
--- a/resources/coreboot/x200_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x200_16mb/config/libgfxinit_txtmode
@@ -137,7 +137,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb
index c492ff0c..5bbf561f 100644
--- a/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x200_4mb/config/libgfxinit_corebootfb
@@ -139,7 +139,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x200_4mb/config/libgfxinit_txtmode b/resources/coreboot/x200_4mb/config/libgfxinit_txtmode
index 33cebd45..e05cddb0 100644
--- a/resources/coreboot/x200_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x200_4mb/config/libgfxinit_txtmode
@@ -137,7 +137,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb b/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb
index 49f6c5cd..6f60fd23 100644
--- a/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x200_8mb/config/libgfxinit_corebootfb
@@ -139,7 +139,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -441,7 +441,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x200_8mb/config/libgfxinit_txtmode b/resources/coreboot/x200_8mb/config/libgfxinit_txtmode
index 008a5370..658b2777 100644
--- a/resources/coreboot/x200_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x200_8mb/config/libgfxinit_txtmode
@@ -137,7 +137,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X200"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -437,7 +437,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb
index 8f7e90f6..f0ab3673 100644
--- a/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x301_16mb/config/libgfxinit_corebootfb
@@ -139,7 +139,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -447,7 +447,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x301_16mb/config/libgfxinit_txtmode b/resources/coreboot/x301_16mb/config/libgfxinit_txtmode
index 929e8855..a94c0d8c 100644
--- a/resources/coreboot/x301_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x301_16mb/config/libgfxinit_txtmode
@@ -137,7 +137,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -443,7 +443,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb
index 9a877383..94b32fc0 100644
--- a/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x301_4mb/config/libgfxinit_corebootfb
@@ -139,7 +139,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -447,7 +447,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x301_4mb/config/libgfxinit_txtmode b/resources/coreboot/x301_4mb/config/libgfxinit_txtmode
index 1bdc6ecd..2ebdca4f 100644
--- a/resources/coreboot/x301_4mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x301_4mb/config/libgfxinit_txtmode
@@ -137,7 +137,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -443,7 +443,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb b/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb
index ac074165..7de302aa 100644
--- a/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x301_8mb/config/libgfxinit_corebootfb
@@ -139,7 +139,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -447,7 +447,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x301_8mb/config/libgfxinit_txtmode b/resources/coreboot/x301_8mb/config/libgfxinit_txtmode
index a0212221..023611e1 100644
--- a/resources/coreboot/x301_8mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x301_8mb/config/libgfxinit_txtmode
@@ -137,7 +137,7 @@ CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_HAVE_INTEL_FIRMWARE=y
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X301"
 # CONFIG_HAVE_IFD_BIN is not set
@@ -443,7 +443,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x60/config/libgfxinit_corebootfb b/resources/coreboot/x60/config/libgfxinit_corebootfb
index 7045581f..1eb79025 100644
--- a/resources/coreboot/x60/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x60/config/libgfxinit_corebootfb
@@ -136,7 +136,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -435,7 +435,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x60/config/libgfxinit_txtmode b/resources/coreboot/x60/config/libgfxinit_txtmode
index 4e7d68a6..df82766c 100644
--- a/resources/coreboot/x60/config/libgfxinit_txtmode
+++ b/resources/coreboot/x60/config/libgfxinit_txtmode
@@ -136,7 +136,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -433,7 +433,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x60_16mb/config/libgfxinit_corebootfb b/resources/coreboot/x60_16mb/config/libgfxinit_corebootfb
index 482609e3..42b1df8e 100644
--- a/resources/coreboot/x60_16mb/config/libgfxinit_corebootfb
+++ b/resources/coreboot/x60_16mb/config/libgfxinit_corebootfb
@@ -136,7 +136,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -435,7 +435,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #
diff --git a/resources/coreboot/x60_16mb/config/libgfxinit_txtmode b/resources/coreboot/x60_16mb/config/libgfxinit_txtmode
index 91a42d13..1a39a55b 100644
--- a/resources/coreboot/x60_16mb/config/libgfxinit_txtmode
+++ b/resources/coreboot/x60_16mb/config/libgfxinit_txtmode
@@ -136,7 +136,7 @@ CONFIG_ECAM_MMCONF_BUS_NUMBER=64
 CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
 CONFIG_SPI_FLASH_INCLUDE_ALL_DRIVERS=y
 CONFIG_SPI_FLASH_WINBOND=y
-CONFIG_DRIVERS_INTEL_WIFI=y
+# CONFIG_DRIVERS_INTEL_WIFI is not set
 CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
 CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="ThinkPad X60"
 # CONFIG_BOARD_LENOVO_G505S is not set
@@ -433,7 +433,6 @@ CONFIG_DRIVERS_MC146818=y
 # CONFIG_USE_PC_CMOS_ALTCENTURY is not set
 CONFIG_VGA=y
 # CONFIG_DRIVERS_SIL_3114 is not set
-CONFIG_DRIVERS_WIFI_GENERIC=y
 # end of Generic Drivers
 
 #