Convert CONFIG_SYS_FPGA_CHECK_BUSY to Kconfig

This converts the following to Kconfig:
    CONFIG_SYS_FPGA_CHECK_BUSY

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 813d6a836d97a5c04d49f135474be4239ff354b8..11b742eeebfe8e267c805e8d586f84341091f75c 100644 (file)
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -96,6 +96,10 @@ config FPGA_VIRTEX2
          Enable Virtex-II FPGA driver for loading in BIT format. This driver
          also supports many newer Xilinx FPGA families.
 
+config SYS_FPGA_CHECK_BUSY
+       bool "Perform busy check during load from FPGA"
+       depends on FPGA_SPARTAN2 || FPGA_SPARTAN3 || FPGA_VIRTEX2
+
 config FPGA_ZYNQPL
        bool "Enable Xilinx FPGA for Zynq"
        depends on ARCH_ZYNQ

diff --git a/drivers/fpga/spartan2.c b/drivers/fpga/spartan2.c
index 57a4532f736e56230dfaaf36b9384b87d2789ba4..68971d93470285a67b93ccf5ef77da721b9558dd 100644 (file)
--- a/drivers/fpga/spartan2.c
+++ b/drivers/fpga/spartan2.c
@@ -10,8 +10,6 @@
 #include <log.h>
 #include <spartan2.h>          /* Spartan-II device family */
 
-#undef CONFIG_SYS_FPGA_CHECK_BUSY
-
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
  * If there is a need to operate slower, define CONFIG_FPGA_DELAY in

diff --git a/drivers/fpga/spartan3.c b/drivers/fpga/spartan3.c
index fdec89bb815f8f2b29e6071db88229b36ef9bd7c..1d5073cb59d414c15e38101236ded3f2c68a2f79 100644 (file)
--- a/drivers/fpga/spartan3.c
+++ b/drivers/fpga/spartan3.c
@@ -15,8 +15,6 @@
 #include <log.h>
 #include <spartan3.h>          /* Spartan-II device family */
 
-#undef CONFIG_SYS_FPGA_CHECK_BUSY
-
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
  * If there is a need to operate slower, define CONFIG_FPGA_DELAY in

diff --git a/drivers/fpga/virtex2.c b/drivers/fpga/virtex2.c
index 8871deaea6f6031c4366e6313859b2537730cce3..ed2a4163f6eb6cef0405776a3bd6cb3d6b97fe66 100644 (file)
--- a/drivers/fpga/virtex2.c
+++ b/drivers/fpga/virtex2.c
@@ -21,14 +21,11 @@
 #include <linux/delay.h>
 
 /*
- * If the SelectMap interface can be overrun by the processor, define
- * CONFIG_SYS_FPGA_CHECK_BUSY and/or CONFIG_FPGA_DELAY in the board
+ * If the SelectMap interface can be overrun by the processor, enable
+ * CONFIG_SYS_FPGA_CHECK_BUSY and/or define CONFIG_FPGA_DELAY in the board
  * configuration file and add board-specific support for checking BUSY status.
  * By default, assume that the SelectMap interface cannot be overrun.
  */
-#ifndef CONFIG_SYS_FPGA_CHECK_BUSY
-#undef CONFIG_SYS_FPGA_CHECK_BUSY
-#endif
 
 #ifndef CONFIG_FPGA_DELAY
 #define CONFIG_FPGA_DELAY()