[1/4] mx6sabre_common: Remove FEC related settings
diff mbox series

Message ID 20200120163104.32487-1-alifer.wsdm@gmail.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series
  • [1/4] mx6sabre_common: Remove FEC related settings
Related show

Commit Message

Alifer Moraes Jan. 20, 2020, 4:31 p.m. UTC
From: Fabio Estevam <festevam@gmail.com>

In preparation for converting to DM_ETH and moving the FEC symbols
to Kconfig we need to move the FEC definitions to mx6sabreauto.h
and mx6sabresd.h to avoid build breakage during the conversion.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Alifer Moraes <alifer.wsdm@gmail.com>
---
 include/configs/mx6sabre_common.h | 8 --------
 include/configs/mx6sabreauto.h    | 8 ++++++++
 include/configs/mx6sabresd.h      | 9 +++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

Comments

Stefano Babic Feb. 10, 2020, 9:08 a.m. UTC | #1
> From: Fabio Estevam <festevam@gmail.com>
> In preparation for converting to DM_ETH and moving the FEC symbols
> to Kconfig we need to move the FEC definitions to mx6sabreauto.h
> and mx6sabresd.h to avoid build breakage during the conversion.
> Signed-off-by: Fabio Estevam <festevam@gmail.com>
> Signed-off-by: Alifer Moraes <alifer.wsdm@gmail.com>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Patch
diff mbox series

diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
index 9309e0320f..ee3b754910 100644
--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
@@ -20,14 +20,6 @@ 
 /* MMC Configs */
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
-#define CONFIG_FEC_MXC
-#define IMX_FEC_BASE			ENET_BASE_ADDR
-#define CONFIG_FEC_XCV_TYPE		RGMII
-#define CONFIG_ETHPRIME			"FEC"
-#define CONFIG_FEC_MXC_PHYADDR		1
-
-#define CONFIG_PHY_ATHEROS
-
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
 #define EMMC_ENV \
 	"emmcdev=2\0" \
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index e444930dc8..c07b03984a 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -75,4 +75,12 @@ 
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR	0x08
 
+#define CONFIG_FEC_MXC
+#define IMX_FEC_BASE			ENET_BASE_ADDR
+#define CONFIG_FEC_XCV_TYPE		RGMII
+#define CONFIG_ETHPRIME			"FEC"
+#define CONFIG_FEC_MXC_PHYADDR		1
+
+#define CONFIG_PHY_ATHEROS
+
 #endif                         /* __MX6SABREAUTO_CONFIG_H */
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index ec1537541a..d810202117 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -62,4 +62,13 @@ 
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	1 /* Enabled USB controller number */
 #endif
 
+#define CONFIG_FEC_MXC
+#define IMX_FEC_BASE			ENET_BASE_ADDR
+#define CONFIG_FEC_XCV_TYPE		RGMII
+#define CONFIG_ETHPRIME			"FEC"
+#define CONFIG_FEC_MXC_PHYADDR		1
+
+#define CONFIG_PHY_ATHEROS
+
+
 #endif                         /* __MX6SABRESD_CONFIG_H */