This converts the following to Kconfig: CONFIG_SYS_FPGA_CHECK_BUSY
Signed-off-by: Tom Rini trini@konsulko.com --- drivers/fpga/Kconfig | 4 ++++ drivers/fpga/spartan2.c | 2 -- drivers/fpga/spartan3.c | 2 -- drivers/fpga/virtex2.c | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 813d6a836d97..11b742eeebfe 100644 --- 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 57a4532f736e..68971d934702 100644 --- 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 fdec89bb815f..1d5073cb59d4 100644 --- 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 8871deaea6f6..ed2a4163f6eb 100644 --- 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()