[U-Boot] [PATCH v3 18/31] ARM: i.MX6: sabresd: Move CONFIG_FEC_MXC to defconfigs

Jagan Teki
2017-04-05T19:20:28Z

Moved CONFIG_FEC_MXC from include/configs/mxsabresd.h
to imx6 sabresd defconfigs.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
configs/imx6q_sabresd_defconfig | 1 +
configs/imx6qp_sabresd_defconfig | 1 +
configs/mx6dlsabresd_defconfig | 1 +
configs/mx6qsabresd_defconfig | 1 +
configs/mx6sabresd_spl_defconfig | 1 +
include/configs/mx6sabre_common.h | 3 ++-
6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/configs/imx6q_sabresd_defconfig b/configs/imx6q_sabresd_defconfig
index 9ac3c9c..377a489 100644
--- a/configs/imx6q_sabresd_defconfig
+++ b/configs/imx6q_sabresd_defconfig
@@ -62,5 +62,6 @@ CONFIG_DM_USB=y
# CONFIG_DM_MMC_OPS is not set
CONFIG_DM_PMIC_PFUZE100=y
CONFIG_SYS_I2C_MXC=y
+CONFIG_FEC_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
diff --git a/configs/imx6qp_sabresd_defconfig b/configs/imx6qp_sabresd_defconfig
index a01482c..037bd41 100644
--- a/configs/imx6qp_sabresd_defconfig
+++ b/configs/imx6qp_sabresd_defconfig
@@ -63,5 +63,6 @@ CONFIG_DM_USB=y
# CONFIG_DM_MMC_OPS is not set
CONFIG_DM_PMIC_PFUZE100=y
CONFIG_SYS_I2C_MXC=y
+CONFIG_FEC_MXC=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
diff --git a/configs/mx6dlsabresd_defconfig b/configs/mx6dlsabresd_defconfig
index 64a024b..c61fcd2 100644
--- a/configs/mx6dlsabresd_defconfig
+++ b/configs/mx6dlsabresd_defconfig
@@ -45,3 +45,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
CONFIG_SYS_I2C_MXC=y
+CONFIG_FEC_MXC=y
diff --git a/configs/mx6qsabresd_defconfig b/configs/mx6qsabresd_defconfig
index 8617094..e9758e3 100644
--- a/configs/mx6qsabresd_defconfig
+++ b/configs/mx6qsabresd_defconfig
@@ -45,3 +45,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
CONFIG_SYS_I2C_MXC=y
+CONFIG_FEC_MXC=y
diff --git a/configs/mx6sabresd_spl_defconfig b/configs/mx6sabresd_spl_defconfig
index c3eb03c..bba77b6 100644
--- a/configs/mx6sabresd_spl_defconfig
+++ b/configs/mx6sabresd_spl_defconfig
@@ -51,3 +51,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_OF_LIBFDT=y
CONFIG_SYS_I2C_MXC=y
+CONFIG_FEC_MXC=y
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index a2ab77a..19ef6dc 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -21,7 +21,7 @@
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0

-#define CONFIG_FEC_MXC
+#ifdef CONFIG_FEC_MXC
#define CONFIG_MII
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_FEC_XCV_TYPE RGMII
@@ -30,6 +30,7 @@

#define CONFIG_PHYLIB
#define CONFIG_PHY_ATHEROS
+#endif

#ifdef CONFIG_CMD_SF
#define CONFIG_MXC_SPI
--
1.9.1