fpga: Added Kconfig support for FPGA_SPARTAN3

This patch added Kconfig support for FPGA_SPARTAN3 and migrates the
values over to the defconfigs.

Signed-off-by: Vipul Kumar <vipulk@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <sivadur@xilinx.com>

diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index f001912adf18b314fee53f051085112e21c08ce6..d77d2b506a5e431bcfffed52e4eecb492f05c319 100644 (file)
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -40,6 +40,7 @@ CONFIG_BOOTP_GATEWAY=y
 CONFIG_BOOTP_HOSTNAME=y
 CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
 CONFIG_MXC_GPIO=y
 CONFIG_MMC_MXC=y
 CONFIG_NAND=y

diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index 2302b1f1f3a379c97005d00b039968933b86ab39..dc017242a30a8575318d2a1e164de4a436dd831c 100644 (file)
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -19,4 +19,5 @@ CONFIG_CMD_JFFS2=y
 CONFIG_FPGA_ALTERA=y
 CONFIG_FPGA_CYCLON2=y
 CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
 CONFIG_MTD_NOR_FLASH=y

diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 2e58ec177101df7da681c4f0c262c45ba6e01f19..97bbd8e610357a2af5578b0daa94c62ebd8a11d4 100644 (file)
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -32,6 +32,7 @@ CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_BOOTP_DNS=y
 CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index b63bf41c24520b087d55e18ade7162ce2c31953d..0aef5b60657c21bff5b84d48d67b264efb7fb9b3 100644 (file)
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_SYS_BOOTCOUNT_ADDR=0xD2801FF8
 CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 6b2c866319c76742f30977e6e256020bf87596f2..4f9f0d1c4cb5430b1a866c41c5d5de3716fe6601 100644 (file)
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -45,4 +45,9 @@ config FPGA_ZYNQMPPL
          Enable FPGA driver for loading bitstream in BIT and BIN format
          on Xilinx Zynq UltraScale+ (ZynqMP) device.
 
+config FPGA_SPARTAN3
+       bool "Enable Spartan3 FPGA driver"
+       help
+         Enable Spartan3 FPGA driver for loading in BIT format.
+
 endmenu

diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 6b47f4a660b95270740bf053443be2a96c04c818..1b52cc33a234799c3d585dde5f71fa2034f6b758 100644 (file)
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -200,7 +200,6 @@
  * FPGA
  */
 #define CONFIG_FPGA_COUNT              1
-#define CONFIG_FPGA_SPARTAN3
 #define CONFIG_SYS_FPGA_WAIT           250 /* 250 ms */
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_CHECK_CTRLC

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 8b883ddd62ce4354e850140e106256118098a085..4a62bce40fb9288054c3a25ceac382ccbc98ac2a 100644 (file)
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -171,7 +171,6 @@
 #define CONFIG_SYS_LOAD_ADDR   0x20000
 
 #define CONFIG_FPGA_COUNT      1
-#define        CONFIG_FPGA_SPARTAN3
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_WAIT           1000
 

diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index e7f5e8d8f9fd790e70a896b6756c72c08cd67d0d..710994988e7eac1055082b34883e2f794c586749 100644 (file)
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -32,7 +32,6 @@
 /*
  * FPGA
  */
-#define CONFIG_FPGA_SPARTAN3
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_WAIT   10000
 #define CONFIG_MAX_FPGA_DEVICES        1

diff --git a/include/configs/x600.h b/include/configs/x600.h
index 485522cd872912bb9cd20fad0f07dc3ed5eb17d8..bfa6f5e3fb85f42ee415f6a7bdbb4dc5103d3885 100644 (file)
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -85,7 +85,6 @@
 #define CONFIG_SYS_I2C_RTC_ADDR        0x68
 
 /* FPGA config options */
-#define CONFIG_FPGA_SPARTAN3
 #define CONFIG_FPGA_COUNT      1
 
 /* USB EHCI options */