Home Explore Help
Sign In
coolsoul
/
u-boot
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Bin Meng 7 years ago
parent
31ba86e8d0
commit
1df7f0b6a0
27 changed files with 22 additions and 51 deletions
Split View Show Diff Stats
  1. 1 0
      board/advantech/som-db5800-som-6867/Kconfig
  2. 1 0
      board/congatec/conga-qeval20-qa3-e3845/Kconfig
  3. 11 0
      board/coreboot/coreboot/Kconfig
  4. 1 0
      board/dfi/dfi-bt700/Kconfig
  5. 1 0
      board/google/chromebook_link/Kconfig
  6. 1 0
      board/google/chromebook_samus/Kconfig
  7. 1 0
      board/google/chromebox_panther/Kconfig
  8. 1 0
      board/intel/bayleybay/Kconfig
  9. 1 0
      board/intel/cougarcanyon2/Kconfig
  10. 1 0
      board/intel/crownbay/Kconfig
  11. 1 0
      board/intel/galileo/Kconfig
  12. 1 0
      board/intel/minnowmax/Kconfig
  13. 0 3
      configs/bayleybay_defconfig
  14. 0 3
      configs/chromebook_link64_defconfig
  15. 0 3
      configs/chromebook_link_defconfig
  16. 0 3
      configs/chromebook_samus_defconfig
  17. 0 3
      configs/chromebox_panther_defconfig
  18. 0 4
      configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
  19. 0 4
      configs/conga-qeval20-qa3-e3845_defconfig
  20. 0 3
      configs/coreboot-x86_defconfig
  21. 0 1
      configs/cougarcanyon2_defconfig
  22. 0 4
      configs/crownbay_defconfig
  23. 0 4
      configs/dfi-bt700-q7x-151_defconfig
  24. 0 3
      configs/galileo_defconfig
  25. 0 4
      configs/minnowmax_defconfig
  26. 0 4
      configs/som-db5800-som-6867_defconfig
  27. 0 5
      configs/theadorable-x86-dfi-bt700_defconfig

+ 1 - 0
board/advantech/som-db5800-som-6867/Kconfig
View File 

@@ -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

+ 1 - 0
board/congatec/conga-qeval20-qa3-e3845/Kconfig
View File 

@@ -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

+ 11 - 0
board/coreboot/coreboot/Kconfig
View File 

@@ -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

+ 1 - 0
board/dfi/dfi-bt700/Kconfig
View File 

@@ -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

+ 1 - 0
board/google/chromebook_link/Kconfig
View File 

@@ -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

+ 1 - 0
board/google/chromebook_samus/Kconfig
View File 

@@ -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

+ 1 - 0
board/google/chromebox_panther/Kconfig
View File 

@@ -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

+ 1 - 0
board/intel/bayleybay/Kconfig
View File 

@@ -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

+ 1 - 0
board/intel/cougarcanyon2/Kconfig
View File 

@@ -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

+ 1 - 0
board/intel/crownbay/Kconfig
View File 

@@ -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

+ 1 - 0
board/intel/galileo/Kconfig
View File 

@@ -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"

+ 1 - 0
board/intel/minnowmax/Kconfig
View File 

@@ -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

+ 0 - 3
configs/bayleybay_defconfig
View File 

@@ -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

+ 0 - 3
configs/chromebook_link64_defconfig
View File 

@@ -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

+ 0 - 3
configs/chromebook_link_defconfig
View File 

@@ -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

+ 0 - 3
configs/chromebook_samus_defconfig
View File 

@@ -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

+ 0 - 3
configs/chromebox_panther_defconfig
View File 

@@ -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

+ 0 - 4
configs/conga-qeval20-qa3-e3845-internal-uart_defconfig
View File 

@@ -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

+ 0 - 4
configs/conga-qeval20-qa3-e3845_defconfig
View File 

@@ -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

+ 0 - 3
configs/coreboot-x86_defconfig
View File 

@@ -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

+ 0 - 1
configs/cougarcanyon2_defconfig
View File 

@@ -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

+ 0 - 4
configs/crownbay_defconfig
View File 

@@ -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

+ 0 - 4
configs/dfi-bt700-q7x-151_defconfig
View File 

@@ -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

+ 0 - 3
configs/galileo_defconfig
View File 

@@ -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

+ 0 - 4
configs/minnowmax_defconfig
View File 

@@ -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

+ 0 - 4
configs/som-db5800-som-6867_defconfig
View File 

@@ -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

+ 0 - 5
configs/theadorable-x86-dfi-bt700_defconfig
View File 

@@ -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