fpga: Convert SYS_FPGA_PROG_FEEDBACK to Kconfig

This converts the following to Kconfig: SYS_FPGA_PROG_FEEDBACK

Signed-off-by: Alexander Dahl <ada@thorsis.com>
Link: https://lore.kernel.org/r/20220721133122.32428-3-ada@thorsis.com
Signed-off-by: Michal Simek <michal.simek@amd.com>

diff --git a/README b/README
index 8c31e5c..2c4bde0 100644 (file)
--- a/README
+++ b/README
@@ -1330,10 +1330,6 @@ The following options need to be configured:
                Enables support for FPGA family.
                (SPARTAN2, SPARTAN3, VIRTEX2, CYCLONE2, ACEX1K, ACEX)
 
-               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

diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index 3a44c7e..9f5cb87 100644 (file)
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -33,6 +33,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

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 78d9588..696ea92 100644 (file)
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -97,4 +97,11 @@ config SYS_FPGA_CHECK_CTRLC
        help
          User can interrupt FPGA configuration by pressing CTRL+C.
 
+config SYS_FPGA_PROG_FEEDBACK
+       bool "Progress output during FPGA configuration"
+       depends on FPGA
+       default y if FPGA_VIRTEX2
+       help
+         Enable printing of hash marks during FPGA configuration.
+
 endmenu

diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 3435400..fe37752 100644 (file)
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -15,7 +15,6 @@
 #endif
 
 #undef CONFIG_SYS_FPGA_CHECK_BUSY
-#undef CONFIG_SYS_FPGA_PROG_FEEDBACK
 
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).

diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index 0fd2290..2e764bd 100644 (file)
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -41,10 +41,6 @@
 #define CONFIG_FPGA_DELAY()
 #endif
 
-#ifndef CONFIG_SYS_FPGA_PROG_FEEDBACK
-#define CONFIG_SYS_FPGA_PROG_FEEDBACK
-#endif
-
 /*
  * Check for errors during configuration by default
  */

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index a8265e9..da4d497 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -131,7 +131,6 @@
  * it needs non-blocking CFI routines.
  */
 
-#define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_WAIT           1000
 
 /* End of user parameters to be customized */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index efc2f3b..fc07c5d 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -743,7 +743,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