Skip to contentSkip to conversation

fpga: Convert some options to Kconfig

PATCH Superseded Alexander Dahl 2 participants 5 messages Jun 29, 2022 – Jul 12, 2022 FPGA manager framework

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover fpga: Convert some options to Kconfig

Hei hei,

this is some fallout from migrating some downstream boards with Altera Cyclone FPGAs to recent U-Boot v2022.04. Not entirely sure about that FPGA_COUNT variable in patch 3, which seems to be used in source code in board/astro/mcf5373l/fpga.c only. Maybe that variable can be dropped entirely?

Greets
Alex

Cc Wolfgang Wegner <[email protected]>
Cc Patrick Bruenn <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Chin-Liang See <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Dalon Westergreen <[email protected]>
Cc Humberto Naves <[email protected]>
Cc Anatolij Gustschin <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Wolfgang Grandegger <[email protected]>
Cc Stefan Roese <[email protected]>
Cc Michal Simek <[email protected]>

Alexander Dahl (3):
fpga: Convert SYS_FPGA_CHECK_CTRLC to Kconfig
fpga: Convert SYS_FPGA_PROG_FEEDBACK to Kconfig
fpga: Convert FPGA_COUNT to Kconfig

 README                                  | 11 -----------
 configs/astro_mcf5373l_defconfig        |  2 ++
 configs/mx53cx9020_defconfig            |  1 +
 configs/socfpga_arria10_defconfig       |  1 +
 configs/socfpga_arria5_defconfig        |  1 +
 configs/socfpga_cyclone5_defconfig      |  1 +
 configs/socfpga_dbm_soc1_defconfig      |  1 +
 configs/socfpga_de0_nano_soc_defconfig  |  1 +
 configs/socfpga_de10_nano_defconfig     |  1 +
 configs/socfpga_de10_standard_defconfig |  1 +
 configs/socfpga_de1_soc_defconfig       |  1 +
 configs/socfpga_is1_defconfig           |  1 +
 configs/socfpga_mcvevk_defconfig        |  1 +
 configs/socfpga_sockit_defconfig        |  1 +
 configs/socfpga_socrates_defconfig      |  1 +
 configs/socfpga_sr1500_defconfig        |  1 +
 configs/socfpga_vining_fpga_defconfig   |  1 +
 drivers/fpga/Kconfig                    | 16 ++++++++++++++++
 include/configs/astro_mcf5373l.h        |  2 --
 include/configs/mx53cx9020.h            |  2 --
 include/configs/socfpga_common.h        |  7 -------
 scripts/config_whitelist.txt            |  2 --
 22 files changed, 33 insertions(+), 24 deletions(-)

base-commit: 568a226f87655fd5339514f66413c2ad72f65d6f

Signature · 1 line
2.30.2
#1 lore raw

PATCH 1/3 fpga: Convert SYS_FPGA_CHECK_CTRLC to Kconfig

After commit 8cca60a2cbf2 ("Kconfig: Remove some symbols from the whitelist") downstream builds failed for boards setting this in include/configs/…

Two FPGA drivers consider this definition.

---
 README               | 3 ---
 drivers/fpga/Kconfig | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)
README +0 -3
index b7ab6e5070..3bf7c9dd4e 100644
@@ -1418,9 +1418,6 @@ The following options need to be configured:
 		If defined, a function that provides delays in the FPGA
 		configuration driver.
 
-		CONFIG_SYS_FPGA_CHECK_CTRLC
-		Allow Control-C to interrupt FPGA configuration
-
 		CONFIG_SYS_FPGA_CHECK_ERROR
 
 		Check for configuration errors during FPGA bitfile
drivers/fpga/Kconfig +4 -0
index dc0b3dd31b..ac5641c75a 100644
@@ -85,4 +85,8 @@ config FPGA_ZYNQPL
 	  Enable FPGA driver for loading bitstream in BIT and BIN format
 	  on Xilinx Zynq devices.
 
+config SYS_FPGA_CHECK_CTRLC
+	bool "Allow Control-C to interrupt FPGA configuration"
+	depends on FPGA
+
 endmenu

base-commit: 568a226f87655fd5339514f66413c2ad72f65d6f

Signature · 1 line
2.30.2
#2 lore raw

PATCH 2/3 fpga: Convert SYS_FPGA_PROG_FEEDBACK to Kconfig

In reply to Alexander Dahl
---
 README                           | 4 ----
 configs/astro_mcf5373l_defconfig | 1 +
 drivers/fpga/Kconfig             | 6 ++++++
 include/configs/astro_mcf5373l.h | 1 -
 scripts/config_whitelist.txt     | 1 -
 5 files changed, 7 insertions(+), 6 deletions(-)
README +0 -4
index 3bf7c9dd4e..63c8bd5019 100644
@@ -1402,10 +1402,6 @@ The following options need to be configured:
 
 		Specify the number of FPGA devices to support.
 
-		CONFIG_SYS_FPGA_PROG_FEEDBACK
-
-		Enable printing of hash marks during FPGA configuration.
-
 		CONFIG_SYS_FPGA_CHECK_BUSY
 
 		Enable checks on FPGA configuration interface busy
configs/astro_mcf5373l_defconfig +1 -0
index 1eea56b5ef..fcdc51df91 100644
@@ -31,6 +31,7 @@ CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
+CONFIG_SYS_FPGA_PROG_FEEDBACK=y
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_SYS_FSL_I2C_OFFSET=0x58000
drivers/fpga/Kconfig +6 -0
index ac5641c75a..e2e8c13b22 100644
@@ -89,4 +89,10 @@ config SYS_FPGA_CHECK_CTRLC
 	bool "Allow Control-C to interrupt FPGA configuration"
 	depends on FPGA
 
+config SYS_FPGA_PROG_FEEDBACK
+	bool "Progress output during FPGA configuration"
+	depends on FPGA
+	help
+	  Enable printing of hash marks during FPGA configuration.
+
 endmenu
include/configs/astro_mcf5373l.h +0 -1
index 9d1203f397..4cae942c55 100644
@@ -134,7 +134,6 @@
  */
 
 #define CONFIG_FPGA_COUNT	1
-#define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_WAIT		1000
 
 /* End of user parameters to be customized */
scripts/config_whitelist.txt +0 -1
index cecdda6781..d7c412efae 100644
@@ -939,7 +939,6 @@ CONFIG_SYS_FPGA_FTIM0
 CONFIG_SYS_FPGA_FTIM1
 CONFIG_SYS_FPGA_FTIM2
 CONFIG_SYS_FPGA_FTIM3
-CONFIG_SYS_FPGA_PROG_FEEDBACK
 CONFIG_SYS_FPGA_SIZE
 CONFIG_SYS_FPGA_WAIT
 CONFIG_SYS_FSL_BMAN_ADDR
Signature · 1 line
2.30.2
#3 lore raw

PATCH 3/3 fpga: Convert FPGA_COUNT to Kconfig

In reply to Alexander Dahl

Besides the two obvious defconfigs, the option was set for all defconfigs where corresponding header file includes include/configs/socfpga_common.h

---
 README                                  | 4 ----
 configs/astro_mcf5373l_defconfig        | 1 +
 configs/mx53cx9020_defconfig            | 1 +
 configs/socfpga_arria10_defconfig       | 1 +
 configs/socfpga_arria5_defconfig        | 1 +
 configs/socfpga_cyclone5_defconfig      | 1 +
 configs/socfpga_dbm_soc1_defconfig      | 1 +
 configs/socfpga_de0_nano_soc_defconfig  | 1 +
 configs/socfpga_de10_nano_defconfig     | 1 +
 configs/socfpga_de10_standard_defconfig | 1 +
 configs/socfpga_de1_soc_defconfig       | 1 +
 configs/socfpga_is1_defconfig           | 1 +
 configs/socfpga_mcvevk_defconfig        | 1 +
 configs/socfpga_sockit_defconfig        | 1 +
 configs/socfpga_socrates_defconfig      | 1 +
 configs/socfpga_sr1500_defconfig        | 1 +
 configs/socfpga_vining_fpga_defconfig   | 1 +
 drivers/fpga/Kconfig                    | 6 ++++++
 include/configs/astro_mcf5373l.h        | 1 -
 include/configs/mx53cx9020.h            | 2 --
 include/configs/socfpga_common.h        | 7 -------
 scripts/config_whitelist.txt            | 1 -
 22 files changed, 22 insertions(+), 15 deletions(-)
README +0 -4
index 63c8bd5019..b2d2d9dc3c 100644
@@ -1398,10 +1398,6 @@ The following options need to be configured:
 		Enables support for FPGA family.
 		(SPARTAN2, SPARTAN3, VIRTEX2, CYCLONE2, ACEX1K, ACEX)
 
-		CONFIG_FPGA_COUNT
-
-		Specify the number of FPGA devices to support.
-
 		CONFIG_SYS_FPGA_CHECK_BUSY
 
 		Enable checks on FPGA configuration interface busy
configs/astro_mcf5373l_defconfig +1 -0
index fcdc51df91..3ea4304ba7 100644
@@ -32,6 +32,7 @@ CONFIG_FPGA_CYCLON2=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
 CONFIG_SYS_FPGA_PROG_FEEDBACK=y
+CONFIG_FPGA_COUNT=1
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_SYS_FSL_I2C_OFFSET=0x58000
configs/mx53cx9020_defconfig +1 -0
index f79595db68..11f2e3206b 100644
@@ -23,6 +23,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ARP_TIMEOUT=200
 CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
+CONFIG_FPGA_COUNT=1
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
configs/socfpga_arria10_defconfig +1 -0
index 1be9a2df08..64dc562a0a 100644
@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_FS_LOADER=y
 CONFIG_SPL_FS_LOADER=y
configs/socfpga_arria5_defconfig +1 -0
index dafeafff3e..106a403cc9 100644
@@ -43,6 +43,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_cyclone5_defconfig +1 -0
index b09672d8a2..1211354d0b 100644
@@ -43,6 +43,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_dbm_soc1_defconfig +1 -0
index a8ef2e934a..ca22c77790 100644
@@ -52,6 +52,7 @@ CONFIG_BOOTFILE="fitImage"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_de0_nano_soc_defconfig +1 -0
index 2e5bd80d2e..dbf758097a 100644
@@ -43,6 +43,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_de10_nano_defconfig +1 -0
index 95b4ef638e..ef78cb9169 100644
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_de10_standard_defconfig +1 -0
index 91bd49840d..c73e307fe3 100644
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_de1_soc_defconfig +1 -0
index 75e16be42a..bacbe60a91 100644
@@ -37,6 +37,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_is1_defconfig +1 -0
index 53e9a7296c..c2c15bd97b 100644
@@ -45,6 +45,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_ARP_TIMEOUT=500
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_mcvevk_defconfig +1 -0
index 07ca4bf954..9ab548e6ff 100644
@@ -43,6 +43,7 @@ CONFIG_BOOTFILE="fitImage"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_sockit_defconfig +1 -0
index e245288b92..fc50adcf81 100644
@@ -43,6 +43,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_socrates_defconfig +1 -0
index 7044186469..c16cb59ee4 100644
@@ -43,6 +43,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_sr1500_defconfig +1 -0
index b0be033953..3d6d264bd5 100644
@@ -49,6 +49,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_vining_fpga_defconfig +1 -0
index 331975ad30..dac0f044eb 100644
@@ -62,6 +62,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
drivers/fpga/Kconfig +6 -0
index e2e8c13b22..d89392d9a4 100644
@@ -95,4 +95,10 @@ config SYS_FPGA_PROG_FEEDBACK
 	help
 	  Enable printing of hash marks during FPGA configuration.
 
+config FPGA_COUNT
+	int "Number of FPGA devices to support"
+	depends on FPGA
+	help
+	  Specify the number of FPGA devices to support.
+
 endmenu
include/configs/astro_mcf5373l.h +0 -1
index 4cae942c55..e8065e4a36 100644
@@ -133,7 +133,6 @@
  * it needs non-blocking CFI routines.
  */
 
-#define CONFIG_FPGA_COUNT	1
 #define CONFIG_SYS_FPGA_WAIT		1000
 
 /* End of user parameters to be customized */
include/configs/mx53cx9020.h +0 -2
index fafc5f1adc..3993a35a09 100644
@@ -16,8 +16,6 @@
 
 #define CONFIG_MXC_UART_BASE UART2_BASE
 
-#define CONFIG_FPGA_COUNT 1
-
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_ESDHC_NUM	2
include/configs/socfpga_common.h +0 -7
index 5ecd1e6399..4b8d733cf7 100644
@@ -78,13 +78,6 @@
 #define CONFIG_DW_ALTDESCRIPTOR
 #endif
 
-/*
- * FPGA Driver
- */
-#ifdef CONFIG_CMD_FPGA
-#define CONFIG_FPGA_COUNT		1
-#endif
-
 /*
  * L4 OSC1 Timer 0
  */
scripts/config_whitelist.txt +0 -1
index d7c412efae..37963c2923 100644
@@ -96,7 +96,6 @@ CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
-CONFIG_FPGA_COUNT
 CONFIG_FPGA_STRATIX_V
 CONFIG_FSL_CADMUS
 CONFIG_FSL_CORENET
Signature · 1 line
2.30.2
#4 lore raw

Re: [PATCH 3/3] fpga: Convert FPGA_COUNT to Kconfig

Hello,

Quoted 3 lines · Alexander Dahl

Besides the two obvious defconfigs, the option was set for all defconfigs where corresponding header file includes include/configs/socfpga_common.h

This option has been addressed with commit 60d45642fe0673514aced37e6cc95d4f0fe02a19 ("fpga: Remove CONFIG_FPGA_COUNT") by Tom. I guess I should rebase the series and resend?

Greets
Alex

Quoted 306 lines
---
 README                                  | 4 ----
 configs/astro_mcf5373l_defconfig        | 1 +
 configs/mx53cx9020_defconfig            | 1 +
 configs/socfpga_arria10_defconfig       | 1 +
 configs/socfpga_arria5_defconfig        | 1 +
 configs/socfpga_cyclone5_defconfig      | 1 +
 configs/socfpga_dbm_soc1_defconfig      | 1 +
 configs/socfpga_de0_nano_soc_defconfig  | 1 +
 configs/socfpga_de10_nano_defconfig     | 1 +
 configs/socfpga_de10_standard_defconfig | 1 +
 configs/socfpga_de1_soc_defconfig       | 1 +
 configs/socfpga_is1_defconfig           | 1 +
 configs/socfpga_mcvevk_defconfig        | 1 +
 configs/socfpga_sockit_defconfig        | 1 +
 configs/socfpga_socrates_defconfig      | 1 +
 configs/socfpga_sr1500_defconfig        | 1 +
 configs/socfpga_vining_fpga_defconfig   | 1 +
 drivers/fpga/Kconfig                    | 6 ++++++
 include/configs/astro_mcf5373l.h        | 1 -
 include/configs/mx53cx9020.h            | 2 --
 include/configs/socfpga_common.h        | 7 -------
 scripts/config_whitelist.txt            | 1 -
 22 files changed, 22 insertions(+), 15 deletions(-)
README +0 -4
index 63c8bd5019..b2d2d9dc3c 100644
@@ -1398,10 +1398,6 @@ The following options need to be configured:
 		Enables support for FPGA family.
 		(SPARTAN2, SPARTAN3, VIRTEX2, CYCLONE2, ACEX1K, ACEX)
 
-		CONFIG_FPGA_COUNT
-
-		Specify the number of FPGA devices to support.
-
 		CONFIG_SYS_FPGA_CHECK_BUSY
 
 		Enable checks on FPGA configuration interface busy
configs/astro_mcf5373l_defconfig +1 -0
index fcdc51df91..3ea4304ba7 100644
@@ -32,6 +32,7 @@ CONFIG_FPGA_CYCLON2=y
 CONFIG_FPGA_XILINX=y
 CONFIG_FPGA_SPARTAN3=y
 CONFIG_SYS_FPGA_PROG_FEEDBACK=y
+CONFIG_FPGA_COUNT=1
 CONFIG_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_FSL=y
 CONFIG_SYS_FSL_I2C_OFFSET=0x58000
configs/mx53cx9020_defconfig +1 -0
index f79595db68..11f2e3206b 100644
@@ -23,6 +23,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ARP_TIMEOUT=200
 CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
+CONFIG_FPGA_COUNT=1
 CONFIG_FSL_ESDHC_IMX=y
 CONFIG_MTD=y
 CONFIG_PHYLIB=y
configs/socfpga_arria10_defconfig +1 -0
index 1be9a2df08..64dc562a0a 100644
@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_FS_LOADER=y
 CONFIG_SPL_FS_LOADER=y
configs/socfpga_arria5_defconfig +1 -0
index dafeafff3e..106a403cc9 100644
@@ -43,6 +43,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_cyclone5_defconfig +1 -0
index b09672d8a2..1211354d0b 100644
@@ -43,6 +43,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_dbm_soc1_defconfig +1 -0
index a8ef2e934a..ca22c77790 100644
@@ -52,6 +52,7 @@ CONFIG_BOOTFILE="fitImage"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_de0_nano_soc_defconfig +1 -0
index 2e5bd80d2e..dbf758097a 100644
@@ -43,6 +43,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_de10_nano_defconfig +1 -0
index 95b4ef638e..ef78cb9169 100644
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_de10_standard_defconfig +1 -0
index 91bd49840d..c73e307fe3 100644
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_de1_soc_defconfig +1 -0
index 75e16be42a..bacbe60a91 100644
@@ -37,6 +37,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_is1_defconfig +1 -0
index 53e9a7296c..c2c15bd97b 100644
@@ -45,6 +45,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_ARP_TIMEOUT=500
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_mcvevk_defconfig +1 -0
index 07ca4bf954..9ab548e6ff 100644
@@ -43,6 +43,7 @@ CONFIG_BOOTFILE="fitImage"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_sockit_defconfig +1 -0
index e245288b92..fc50adcf81 100644
@@ -43,6 +43,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_socrates_defconfig +1 -0
index 7044186469..c16cb59ee4 100644
@@ -43,6 +43,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_DFU_MMC=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_sr1500_defconfig +1 -0
index b0be033953..3d6d264bd5 100644
@@ -49,6 +49,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_BOOTCOUNT_LIMIT=y
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
configs/socfpga_vining_fpga_defconfig +1 -0
index 331975ad30..dac0f044eb 100644
@@ -62,6 +62,7 @@ CONFIG_DFU_MMC=y
 CONFIG_DFU_RAM=y
 CONFIG_DFU_SF=y
 CONFIG_SYS_DFU_DATA_BUF_SIZE=0x1000000
+CONFIG_FPGA_COUNT=1
 CONFIG_DWAPB_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_SYS_I2C_DW=y
drivers/fpga/Kconfig +6 -0
index e2e8c13b22..d89392d9a4 100644
@@ -95,4 +95,10 @@ config SYS_FPGA_PROG_FEEDBACK
 	help
 	  Enable printing of hash marks during FPGA configuration.
 
+config FPGA_COUNT
+	int "Number of FPGA devices to support"
+	depends on FPGA
+	help
+	  Specify the number of FPGA devices to support.
+
 endmenu
include/configs/astro_mcf5373l.h +0 -1
index 4cae942c55..e8065e4a36 100644
@@ -133,7 +133,6 @@
  * it needs non-blocking CFI routines.
  */
 
-#define CONFIG_FPGA_COUNT	1
 #define CONFIG_SYS_FPGA_WAIT		1000
 
 /* End of user parameters to be customized */
include/configs/mx53cx9020.h +0 -2
index fafc5f1adc..3993a35a09 100644
@@ -16,8 +16,6 @@
 
 #define CONFIG_MXC_UART_BASE UART2_BASE
 
-#define CONFIG_FPGA_COUNT 1
-
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR	0
 #define CONFIG_SYS_FSL_ESDHC_NUM	2
include/configs/socfpga_common.h +0 -7
index 5ecd1e6399..4b8d733cf7 100644
@@ -78,13 +78,6 @@
 #define CONFIG_DW_ALTDESCRIPTOR
 #endif
 
-/*
- * FPGA Driver
- */
-#ifdef CONFIG_CMD_FPGA
-#define CONFIG_FPGA_COUNT		1
-#endif
-
 /*
  * L4 OSC1 Timer 0
  */
scripts/config_whitelist.txt +0 -1
index d7c412efae..37963c2923 100644
@@ -96,7 +96,6 @@ CONFIG_FLASH_SHOW_PROGRESS
 CONFIG_FLASH_SPANSION_S29WS_N
 CONFIG_FLASH_VERIFY
 CONFIG_FM_PLAT_CLK_DIV
-CONFIG_FPGA_COUNT
 CONFIG_FPGA_STRATIX_V
 CONFIG_FSL_CADMUS
 CONFIG_FSL_CORENET
Signature · 1 line
2.30.2
Signature · 4 lines
/"\ ASCII RIBBON | »With the first link, the chain is forged. The first
\ / CAMPAIGN     | speech censured, the first thought forbidden, the
 X  AGAINST      | first freedom denied, chains us all irrevocably.«
/ \ HTML MAIL    | (Jean-Luc Picard, quoting Judge Aaron Satie)