fpga: Resync various CONFIG_FPGA_* symbols

These are declared in Kconfig, but some #defines have crept in. CONFIG_FPGA CONFIG_FPGA_ALTERA CONFIG_FPGA_CYCLON2 CONFIG_FPGA_SOCFPGA CONFIG_FPGA_XILINX CONFIG_FPGA_ZYNQMPPL Signed-off-by: Tuomas Tynkkynen <tuomas@tuxera.com>
7 years ago · 86c2f1e75b
parent a4d403290e
commit 86c2f1e75b
9 changed files with 5 additions and 11 deletions
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@ -31,6 +31,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=mxc_nand.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand.0:1M(u-boot)ro,512K(env),512K(env2),512K(firmware),512K(dtb),5M(kernel),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_FPGA_XILINX=y
 CONFIG_MMC_MXC=y
 CONFIG_NAND=y
 CONFIG_NAND_MXC=y
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@ -16,4 +16,6 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_DATE=y
 CONFIG_CMD_JFFS2=y
 CONFIG_FPGA_ALTERA=y
+CONFIG_FPGA_CYCLON2=y
+CONFIG_FPGA_XILINX=y
 CONFIG_MTD_NOR_FLASH=y
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@ -32,6 +32,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),2
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_OMAP24_I2C_SPEED=400000
+CONFIG_FPGA_XILINX=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
 CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@ -37,6 +37,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:64M(ubi0),64M(ubi1)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_FPGA_XILINX=y
 CONFIG_SYS_I2C_DW=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@ -182,7 +182,6 @@

 /* FPGA - Spartan 2 */
 /* experiment
-#define CONFIG_FPGA
 #define CONFIG_FPGA_COUNT	1
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_CHECK_CTRLC
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@ -215,11 +215,7 @@
 /*
 * FPGA
 */
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_FPGA
-#endif
 #define CONFIG_FPGA_COUNT		1
-#define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_SPARTAN3
 #define CONFIG_SYS_FPGA_WAIT		250 /* 250 ms */
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@ -177,9 +177,7 @@
 #define CONFIG_SYS_LONGHELP

 #define CONFIG_FPGA_COUNT	1
-#define	CONFIG_FPGA_XILINX
 #define	CONFIG_FPGA_SPARTAN3
-#define CONFIG_FPGA_CYCLON2
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_WAIT		1000

--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@ -33,8 +33,6 @@
 /*
 * FPGA
 */
-#define CONFIG_FPGA
-#define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_SPARTAN3
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 #define CONFIG_SYS_FPGA_WAIT	10000
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@ -86,8 +86,6 @@
 #define CONFIG_SYS_I2C_RTC_ADDR	0x68

 /* FPGA config options */
-#define CONFIG_FPGA
-#define CONFIG_FPGA_XILINX
 #define CONFIG_FPGA_SPARTAN3
 #define CONFIG_FPGA_COUNT	1