x86: kconfig: Let board select SPI flash

Only a specific type of SPI flash exists on a board, having board
Kconfig to select the SPI flash seems to make more sense. Other
flash types are not necessary except coreboot, which implies all
available flash drivers there.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/board/advantech/som-db5800-som-6867/Kconfig b/board/advantech/som-db5800-som-6867/Kconfig
index 945aa43bd28fff515781b7c22493fc33126ef339..fac562ad4fa5ff8a06829a1159bd49c3c57fd306 100644 (file)
--- a/board/advantech/som-db5800-som-6867/Kconfig
+++ b/board/advantech/som-db5800-som-6867/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
        select BOARD_EARLY_INIT_F
+       select SPI_FLASH_MACRONIX
 
 config PCIE_ECAM_BASE
        default 0xe0000000

diff --git a/board/congatec/conga-qeval20-qa3-e3845/Kconfig b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
index f91ffa1325495a641cc4b05442247c1aaa82233e..c2649d299f1f4028f08445698e2085837040f235 100644 (file)
--- a/board/congatec/conga-qeval20-qa3-e3845/Kconfig
+++ b/board/congatec/conga-qeval20-qa3-e3845/Kconfig
@@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select BOARD_ROMSIZE_KB_8192
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
+       select SPI_FLASH_STMICRO
 
 config PCIE_ECAM_BASE
        default 0xe0000000

diff --git a/board/coreboot/coreboot/Kconfig b/board/coreboot/coreboot/Kconfig
index 3ff64f40844a7782e4a006c7a5a3dd71e2ccbe9e..cfa1d50ee45028a619d7659d19591e481b6e43e7 100644 (file)
--- a/board/coreboot/coreboot/Kconfig
+++ b/board/coreboot/coreboot/Kconfig
@@ -12,6 +12,17 @@ config SYS_SOC
 config SYS_TEXT_BASE
        default 0x01110000
 
+config BOARD_SPECIFIC_OPTIONS # dummy
+       def_bool y
+       imply SPI_FLASH_ATMEL
+       imply SPI_FLASH_EON
+       imply SPI_FLASH_GIGADEVICE
+       imply SPI_FLASH_MACRONIX
+       imply SPI_FLASH_SPANSION
+       imply SPI_FLASH_STMICRO
+       imply SPI_FLASH_SST
+       imply SPI_FLASH_WINBOND
+
 comment "coreboot-specific options"
 
 config SYS_CONFIG_NAME

diff --git a/board/dfi/dfi-bt700/Kconfig b/board/dfi/dfi-bt700/Kconfig
index 59f45efcf795f79a6e05979c8b01b9115fc41caf..81a2575d11da4141bad62631d207d40387177e84 100644 (file)
--- a/board/dfi/dfi-bt700/Kconfig
+++ b/board/dfi/dfi-bt700/Kconfig
@@ -23,6 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select BOARD_ROMSIZE_KB_8192
        select BOARD_EARLY_INIT_F
        select BOARD_LATE_INIT
+       select SPI_FLASH_STMICRO
 
 config PCIE_ECAM_BASE
        default 0xe0000000

diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig
index 8999b5829439d4bd1f928a56a2e124c4fc264794..944716d002c9d0043d81cfa85af2ca9ec19b7c10 100644 (file)
--- a/board/google/chromebook_link/Kconfig
+++ b/board/google/chromebook_link/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select NORTHBRIDGE_INTEL_IVYBRIDGE
        select HAVE_INTEL_ME
        select BOARD_ROMSIZE_KB_8192
+       select SPI_FLASH_WINBOND
 
 config PCIE_ECAM_BASE
        default 0xf0000000

diff --git a/board/google/chromebook_samus/Kconfig b/board/google/chromebook_samus/Kconfig
index f2b94815636ce2ca1ad34181470f0957d1927730..afbfe53deb4d1825f3388996056cf71a2d1b110f 100644 (file)
--- a/board/google/chromebook_samus/Kconfig
+++ b/board/google/chromebook_samus/Kconfig
@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select INTEL_BROADWELL
        select HAVE_INTEL_ME
        select BOARD_ROMSIZE_KB_8192
+       select SPI_FLASH_WINBOND
 
 config PCIE_ECAM_BASE
        default 0xf0000000

diff --git a/board/google/chromebox_panther/Kconfig b/board/google/chromebox_panther/Kconfig
index 2af3aa9e74ab73e48ebce3aa82c14a465284928f..875df9d59ffe4a063ca82a1cc73b9db16c3c0f74 100644 (file)
--- a/board/google/chromebox_panther/Kconfig
+++ b/board/google/chromebox_panther/Kconfig
@@ -22,6 +22,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select NORTHBRIDGE_INTEL_IVYBRIDGE
        select HAVE_INTEL_ME
        select BOARD_ROMSIZE_KB_8192
+       select SPI_FLASH_WINBOND
 
 config SYS_CAR_ADDR
        hex

diff --git a/board/intel/bayleybay/Kconfig b/board/intel/bayleybay/Kconfig
index 597228fdbca198a8ea8d3bb543f3b38fc83c327a..a62249936fa36c617ddbff2dabb96afd654be058 100644 (file)
--- a/board/intel/bayleybay/Kconfig
+++ b/board/intel/bayleybay/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select X86_RESET_VECTOR
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
+       select SPI_FLASH_WINBOND
 
 config PCIE_ECAM_BASE
        default 0xe0000000

diff --git a/board/intel/cougarcanyon2/Kconfig b/board/intel/cougarcanyon2/Kconfig
index 4e7d02161fcc5a9f04f7de915d305d3d19c1596a..ed764485a5108875e061f410827df44c4f6ef268 100644 (file)
--- a/board/intel/cougarcanyon2/Kconfig
+++ b/board/intel/cougarcanyon2/Kconfig
@@ -22,5 +22,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select HAVE_FSP
        select BOARD_ROMSIZE_KB_2048
        select BOARD_EARLY_INIT_F
+       select SPI_FLASH_WINBOND
 
 endif

diff --git a/board/intel/crownbay/Kconfig b/board/intel/crownbay/Kconfig
index 05626a9e9214eb6e88f4e979f52d0cccf66da3a9..1eed227c75f418422d98a1021c30d1456c936c5b 100644 (file)
--- a/board/intel/crownbay/Kconfig
+++ b/board/intel/crownbay/Kconfig
@@ -21,5 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select INTEL_QUEENSBAY
        select BOARD_ROMSIZE_KB_1024
        select BOARD_EARLY_INIT_F
+       select SPI_FLASH_SST
 
 endif

diff --git a/board/intel/galileo/Kconfig b/board/intel/galileo/Kconfig
index 87a0ec4ccc802c749cecf0bf349c9761a00b8f2c..1416c891e86447fb013fb30edd63a9777cce0047 100644 (file)
--- a/board/intel/galileo/Kconfig
+++ b/board/intel/galileo/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select X86_RESET_VECTOR
        select INTEL_QUARK
        select BOARD_ROMSIZE_KB_1024
+       select SPI_FLASH_WINBOND
 
 config SMBIOS_PRODUCT_NAME
        default "GalileoGen2"

diff --git a/board/intel/minnowmax/Kconfig b/board/intel/minnowmax/Kconfig
index 7e975f9c3ae71606459d0316a7521eba43500d12..a8668e4efc3de62ad3337ba92ed56e7a39df2a17 100644 (file)
--- a/board/intel/minnowmax/Kconfig
+++ b/board/intel/minnowmax/Kconfig
@@ -21,6 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        select X86_RESET_VECTOR if !EFI_STUB
        select INTEL_BAYTRAIL
        select BOARD_ROMSIZE_KB_8192
+       select SPI_FLASH_STMICRO
 
 config PCIE_ECAM_BASE
        default 0xe0000000

diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig
index a63e7cf122d96fe3ba6e9b382ff2890ff3d0d570..f12503a3348fe6d87f4d0b1800cb49c3ebe1370e 100644 (file)
--- a/configs/bayleybay_defconfig
+++ b/configs/bayleybay_defconfig
@@ -41,9 +41,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CPU=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_E1000=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/chromebook_link64_defconfig b/configs/chromebook_link64_defconfig
index 9cdd84cd0f874e9b07469f77412f91d335c38655..8da05cd5a4ef8332f256ea505acf5e749b9f7328 100644 (file)
--- a/configs/chromebook_link64_defconfig
+++ b/configs/chromebook_link64_defconfig
@@ -63,9 +63,6 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y

diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index eb272cc5ab685a86a622a3045ee8dab0c2f0a1c4..69cdc6c34939942f2b7a742e86d61d7fb11512d0 100644 (file)
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -45,9 +45,6 @@ CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y

diff --git a/configs/chromebook_samus_defconfig b/configs/chromebook_samus_defconfig
index 297609732e09350c481f73834707431d71abf446..0a2cbb8ad2ecc3511708ca3d94d82bea2f47c8ea 100644 (file)
--- a/configs/chromebook_samus_defconfig
+++ b/configs/chromebook_samus_defconfig
@@ -41,9 +41,6 @@ CONFIG_SYSCON=y
 CONFIG_CPU=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200
 CONFIG_DEBUG_UART_BOARD_INIT=y

diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 12e87d19028f76a08a91b09d7e123de52aa551ea..f325ba4ac88c8835a84f0493dbd7b97379d4e1c2 100644 (file)
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -38,9 +38,6 @@ CONFIG_DM_SCSI=y
 CONFIG_BLK=y
 CONFIG_CROS_EC=y
 CONFIG_CROS_EC_LPC=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_SYS_NS16550=y
 CONFIG_TPM_TIS_LPC=y

diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
index c164f329216a3cc118339d567daa26c6be904e9d..ff058f98c653bb419788797511ea7eb424ad25ad 100644 (file)
--- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
+++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
@@ -46,10 +46,6 @@ CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_E1000=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200

diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig
index e75fae50db2fe18a9f1539d508ee2f2bb559de72..e4f97130fcc7ea80e329630ca79633ef09b2a3d2 100644 (file)
--- a/configs/conga-qeval20-qa3-e3845_defconfig
+++ b/configs/conga-qeval20-qa3-e3845_defconfig
@@ -45,10 +45,6 @@ CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_INTEL=y
 CONFIG_WINBOND_W83627=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_E1000=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200

diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index ef5d75b7cc0e51c309265db906a3d5d4461c0fba..a1379724ec048d7cc13e1fcb9a4d15314c2e9a92 100644 (file)
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -31,9 +31,6 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_TPM_TIS_LPC=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/cougarcanyon2_defconfig b/configs/cougarcanyon2_defconfig
index fabed5318bb44b2d19306333dfa69fdc27b2aba6..d347c0ae18482d0ffcc69772e23c7bcd4a9d5749 100644 (file)
--- a/configs/cougarcanyon2_defconfig
+++ b/configs/cougarcanyon2_defconfig
@@ -27,7 +27,6 @@ CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig
index 1ec8744f3a265b51d88595493a2c9dbc7b350045..a17aa75e8f27b10d234b98ba7350b15cb5874274 100644 (file)
--- a/configs/crownbay_defconfig
+++ b/configs/crownbay_defconfig
@@ -35,10 +35,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CPU=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SST=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_E1000=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig
index 85311bab4d174502c72238cfd55f1972146d8488..13d911c78cb2f8ea698c73bb068f339e0401ccfe 100644 (file)
--- a/configs/dfi-bt700-q7x-151_defconfig
+++ b/configs/dfi-bt700-q7x-151_defconfig
@@ -43,10 +43,6 @@ CONFIG_SYSCON=y
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_NUVOTON_NCT6102D=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_E1000=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200

diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig
index 963ae81fa8eba0996120bbe2266310b903757efd..fb6e84fe5263fbb8ce860cc18149c92f0fa3857b 100644 (file)
--- a/configs/galileo_defconfig
+++ b/configs/galileo_defconfig
@@ -37,8 +37,5 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CPU=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y

diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig
index b7b5ebe17b81397520638eebb5f86b11e42055dd..5a770a9409a8709b7d038c9ef45c0a444ab6f464 100644 (file)
--- a/configs/minnowmax_defconfig
+++ b/configs/minnowmax_defconfig
@@ -43,10 +43,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CPU=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_RTL8169=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200

diff --git a/configs/som-db5800-som-6867_defconfig b/configs/som-db5800-som-6867_defconfig
index 81e31d9f0364532892fd459d037aa21cf9751435..4c60d03772b646367ae371b7b8dc3496c1cbc838 100644 (file)
--- a/configs/som-db5800-som-6867_defconfig
+++ b/configs/som-db5800-som-6867_defconfig
@@ -40,10 +40,6 @@ CONFIG_EFI_PARTITION=y
 CONFIG_REGMAP=y
 CONFIG_SYSCON=y
 CONFIG_CPU=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_E1000=y
 CONFIG_DEBUG_UART_BASE=0x3f8
 CONFIG_DEBUG_UART_CLOCK=1843200

diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig
index 748554d0c2f0fed09431207299027e3c054627cd..29d48b6c53e1d939bb1487355ebafac4dd235853 100644 (file)
--- a/configs/theadorable-x86-dfi-bt700_defconfig
+++ b/configs/theadorable-x86-dfi-bt700_defconfig
@@ -43,11 +43,6 @@ CONFIG_SYSCON=y
 CONFIG_CPU=y
 CONFIG_DM_I2C=y
 CONFIG_NUVOTON_NCT6102D=y
-CONFIG_SPI_FLASH_GIGADEVICE=y
-CONFIG_SPI_FLASH_MACRONIX=y
-CONFIG_SPI_FLASH_SPANSION=y
-CONFIG_SPI_FLASH_STMICRO=y
-CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_E1000=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y