[U-Boot] [RFC PATCH 3/7] Move CONFIG_FPGA_SPARTAN options to defconfig

Chris Packham
2016-11-22T08:48:58Z

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

configs/PMC440_defconfig | 3 +++
configs/apf27_defconfig | 2 ++
configs/astro_mcf5373l_defconfig | 2 ++
configs/mt_ventoux_defconfig | 2 ++
configs/x600_defconfig | 2 ++
include/configs/PMC440.h | 4 ----
include/configs/apf27.h | 5 -----
include/configs/astro_mcf5373l.h | 3 ---
include/configs/mt_ventoux.h | 3 ---
include/configs/x600.h | 3 ---
10 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/configs/PMC440_defconfig b/configs/PMC440_defconfig
index cd2f0d2a5b4b..8a2e9c964e14 100644
--- a/configs/PMC440_defconfig
+++ b/configs/PMC440_defconfig
@@ -16,6 +16,9 @@ CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_FAT=y
+CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
+CONFIG_FPGA_SPARTAN2=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
diff --git a/configs/apf27_defconfig b/configs/apf27_defconfig
index a02e180d2f2c..f8f177ad56ce 100644
--- a/configs/apf27_defconfig
+++ b/configs/apf27_defconfig
@@ -21,4 +21,6 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_CMD_UBI=y
+CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
CONFIG_OF_LIBFDT=y
diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig
index 94e931eabadc..5ea1b66e5b2a 100644
--- a/configs/astro_mcf5373l_defconfig
+++ b/configs/astro_mcf5373l_defconfig
@@ -9,3 +9,5 @@ CONFIG_CMD_I2C=y
# CONFIG_CMD_NET is not set
# CONFIG_CMD_NFS is not set
CONFIG_CMD_CACHE=y
+CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index 9e330a7f44ca..d4e58395cf22 100644
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -24,6 +24,8 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y
CONFIG_CMD_UBI=y
+CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_USB_ULPI_VIEWPORT_OMAP=y
diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index 65b7d9565aac..0db6b5c6ba20 100644
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -26,6 +26,8 @@ CONFIG_CMD_CACHE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_CMD_UBI=y
+CONFIG_FPGA_XILINX=y
+CONFIG_FPGA_SPARTAN3=y
CONFIG_SYS_I2C_DW=y
CONFIG_NETDEVICES=y
CONFIG_ETH_DESIGNWARE=y
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index 2e7f6e480323..750f8447220c 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -343,10 +343,6 @@
/*-----------------------------------------------------------------------
* FPGA stuff
*----------------------------------------------------------------------*/
-#define CONFIG_FPGA
-#define CONFIG_FPGA_XILINX
-#define CONFIG_FPGA_SPARTAN2
-#define CONFIG_FPGA_SPARTAN3

#define CONFIG_FPGA_COUNT 2
/*-----------------------------------------------------------------------
diff --git a/include/configs/apf27.h b/include/configs/apf27.h
index a97ba9f39c50..00798fa1027f 100644
--- a/include/configs/apf27.h
+++ b/include/configs/apf27.h
@@ -260,12 +260,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_FPGA_PROG_FEEDBACK
#define CONFIG_SYS_FPGA_CHECK_CTRLC
diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h
index 0af356bcb49d..d5d6540ec9b9 100644
--- a/include/configs/astro_mcf5373l.h
+++ b/include/configs/astro_mcf5373l.h
@@ -204,9 +204,6 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE

#define CONFIG_FPGA_COUNT 1
-#define CONFIG_FPGA
-#define CONFIG_FPGA_XILINX
-#define CONFIG_FPGA_SPARTAN3
#define CONFIG_FPGA_ALTERA
#define CONFIG_FPGA_CYCLON2
#define CONFIG_FPGA_PROG_FEEDBACK
diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 1353b11b1250..b6198dbdf6d3 100644
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -42,9 +42,6 @@
* FPGA
*/
#define CONFIG_CMD_FPGA_LOADMK
-#define CONFIG_FPGA
-#define CONFIG_FPGA_XILINX
-#define CONFIG_FPGA_SPARTAN3
#define CONFIG_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 5e51f6535624..a879c4c7c113 100644
--- a/include/configs/x600.h
+++ b/include/configs/x600.h
@@ -96,9 +96,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

/* USB EHCI options */
--
2.10.2