| Message ID | 20180127182840.12791-1-tuomas@tuxera.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/2] fpga: Resync various CONFIG_FPGA_* symbols | expand |
On Sat, Jan 27, 2018 at 08:28:39PM +0200, Tuomas Tynkkynen wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig index f09c5a828b..6949b711fd 100644 --- 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 diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index cababcf990..1e3708fcb5 100644 --- 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 diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 3dd8adb5ce..c059a49576 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -31,6 +31,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),256k(env2),8m(ubisystem),-(rootfs)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_FPGA_XILINX=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y diff --git a/configs/x600_defconfig b/configs/x600_defconfig index 4658f977a4..18720daafc 100644 --- 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 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index a709fbbf63..c5a0a0371d 100644 --- 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 diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 24afc84a02..16345ca2b5 100644 --- 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 diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 540db79a27..c8d5c1bd3d 100644 --- 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 diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 11ba3e752a..bee8ddd4f2 100644 --- 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 diff --git a/include/configs/x600.h b/include/configs/x600.h index 4aa5a2a924..cd3bd94efb 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -87,8 +87,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
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> --- configs/apf27_defconfig | 1 + configs/astro_mcf5373l_defconfig | 2 ++ configs/mt_ventoux_defconfig | 1 + configs/x600_defconfig | 1 + include/configs/M54455EVB.h | 1 - include/configs/apf27.h | 4 ---- include/configs/astro_mcf5373l.h | 2 -- include/configs/mt_ventoux.h | 2 -- include/configs/x600.h | 2 -- 9 files changed, 5 insertions(+), 11 deletions(-)