aboutsummaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-01-27 20:28:39 +0200
committerTom Rini <trini@konsulko.com>2018-02-05 20:58:11 -0500
commit86c2f1e75b3bb8f099a3f915a34cd96b0348376f (patch)
tree0a861035674854f2b37e10b4b51aa11e6d0a54c4 /include/configs
parenta4d403290e32f95cfd254f2778e08f655ddd5a49 (diff)
downloadu-boot-86c2f1e75b3bb8f099a3f915a34cd96b0348376f.zip
u-boot-86c2f1e75b3bb8f099a3f915a34cd96b0348376f.tar.gz
u-boot-86c2f1e75b3bb8f099a3f915a34cd96b0348376f.tar.bz2
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>
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/M54455EVB.h1
-rw-r--r--include/configs/apf27.h4
-rw-r--r--include/configs/astro_mcf5373l.h2
-rw-r--r--include/configs/mt_ventoux.h2
-rw-r--r--include/configs/x600.h2
5 files changed, 0 insertions, 11 deletions
diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index a709fbb..c5a0a03 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 24afc84..16345ca 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 540db79..c8d5c1b 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 11ba3e7..bee8ddd 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 66a8e88..e18b389 100644
--- 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