[U-Boot] [RFC PATCH 6/7] Move FPGA_PROG_FEEDBACK to defconfig

Chris Packham
2016-11-22T08:49:01Z

Signed-off-by: Chris Packham <judge.packham@gmail.com>
---

configs/apf27_defconfig | 1 +
configs/astro_mcf5373l_defconfig | 1 +
configs/mt_ventoux_defconfig | 1 +
include/configs/apf27.h | 1 -
include/configs/astro_mcf5373l.h | 1 -
include/configs/mt_ventoux.h | 2 --
6 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index f8f177ad56ce..4e0810a2064f 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -23,4 +23,5 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_UBI=y
CONFIG_FPGA_XILINX=y
CONFIG_FPGA_SPARTAN3=y
+CONFIG_FPGA_PROG_FEEDBACK=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index 5ea1b66e5b2a..188a2ae6d0b7 100644
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -11,3 +11,4 @@ CONFIG_CMD_I2C=y
CONFIG_CMD_CACHE=y
CONFIG_FPGA_XILINX=y
CONFIG_FPGA_SPARTAN3=y
+CONFIG_FPGA_PROG_FEEDBACK=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index d4e58395cf22..10e5ebc20945 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_FAT=y
CONFIG_CMD_UBI=y
CONFIG_FPGA_XILINX=y
CONFIG_FPGA_SPARTAN3=y
+CONFIG_FPGA_PROG_FEEDBACK=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_ULPI_VIEWPORT_OMAP=y
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index 00798fa1027f..df0dde0cdcd2 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -262,7 +262,6 @@
*/
#define CONFIG_FPGA_COUNT 1
#define CONFIG_SYS_FPGA_WAIT 250 /* 250 ms */
-#define CONFIG_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_CHECK_CTRLC
#define CONFIG_SYS_FPGA_CHECK_ERROR

diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index d5d6540ec9b9..e5eaec238af7 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -206,7 +206,6 @@
#define CONFIG_FPGA_COUNT 1
#define CONFIG_FPGA_ALTERA
#define CONFIG_FPGA_CYCLON2
-#define CONFIG_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_WAIT 1000

/* End of user parameters to be customized */
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index b6198dbdf6d3..97fe785ef957 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -42,11 +42,9 @@
* FPGA
*/
#define CONFIG_CMD_FPGA_LOADMK
-#define CONFIG_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_WAIT 10000
#define CONFIG_MAX_FPGA_DEVICES 1
#define CONFIG_FPGA_DELAY() udelay(1)
-#define CONFIG_FPGA_PROG_FEEDBACK

#define CONFIG_SPLASH_SCREEN
#define CONFIG_VIDEO_BMP_RLE8
--
2.10.2