From f415834608506d0227e4a007ddf92442b32fb20b Mon Sep 17 00:00:00 2001 From: Vipul Kumar <vipul.kumar@xilinx.com> Date: Fri, 16 Feb 2018 18:02:49 +0530 Subject: [PATCH] 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> --- configs/apf27_defconfig | 1 + configs/astro_mcf5373l_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/x600_defconfig | 1 + drivers/fpga/Kconfig | 5 +++++ include/configs/apf27.h | 1 - include/configs/astro_mcf5373l.h | 1 - include/configs/mt_ventoux.h | 1 - include/configs/x600.h | 1 - 9 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index f001912adf..d77d2b506a 100644 --- 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 2302b1f1f3..dc017242a3 100644 --- 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 2e58ec1771..97bbd8e610 100644 --- 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 b63bf41c24..0aef5b6065 100644 --- 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 6b2c866319..4f9f0d1c4c 100644 --- 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 6b47f4a660..1b52cc33a2 100644 --- 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 8b883ddd62..4a62bce40f 100644 --- 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 e7f5e8d8f9..710994988e 100644 --- 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 485522cd87..bfa6f5e3fb 100644 --- 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 */ -- 2.39.5