global: Migrate CONFIG_FEC_MXC_PHYADDR to CFG

Perform a simple rename of CONFIG_FEC_MXC_PHYADDR to CFG_FEC_MXC_PHYADDR

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 9733a33ee2c2c9d555692daff97c9d9811f695c1..1b08a2c5abf257ebd77efa0087b85375185f784b 100644 (file)
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -214,7 +214,7 @@ int board_eth_init(struct bd_info *bis)
        gpio_set_value(CL_SOM_IMX7_ETH1_PHY_NRST, 1);
        /* MAC initialization */
        return fecmxc_initialize_multi(bis, CL_SOM_IMX7_FEC_DEV_ID_PRI,
-                                      CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+                                      CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
 }
 
 /*

diff --git a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
index 7340a34402315a92308fea31347b40521e6aa435..9205d5ef6ddb61afd26165f8187cda274523988a 100644 (file)
--- a/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
+++ b/board/freescale/mx6sxsabreauto/mx6sxsabreauto.c
@@ -104,7 +104,7 @@ int board_eth_init(struct bd_info *bis)
        setup_fec();
 
        ret = fecmxc_initialize_multi(bis, 1,
-               CONFIG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
+               CFG_FEC_MXC_PHYADDR, IMX_FEC_BASE);
        if (ret)
                printf("FEC%d MXC: %s:failed\n", 1, __func__);
 

diff --git a/doc/README.fec_mxc b/doc/README.fec_mxc
index 4e890d348f47a9cb95da065f411c849f8f82cdc1..2ccd4288d281da68945b7fdeab5dd8b26b141b67 100644 (file)
--- a/doc/README.fec_mxc
+++ b/doc/README.fec_mxc
@@ -18,7 +18,7 @@ CONFIG_PHYLIB
 CONFIG_FEC_MXC_NO_ANEG
        Relevant only if PHYLIB not used. Skips auto-negotiation restart.
 
-CONFIG_FEC_MXC_PHYADDR
+CFG_FEC_MXC_PHYADDR
        Optional, selects the exact phy address that should be connected
        and function fecmxc_initialize will try to initialize it.
 

diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 9cb235ad5e37d33acfdece2cbd8a6e5ad7452d36..ab52cc119f4ee30e5b9b8d1b3c31db40f2afdae1 100644 (file)
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1086,8 +1086,8 @@ static int fec_phy_init(struct fec_priv *priv, struct udevice *dev)
        int addr;
 
        addr = device_get_phy_addr(priv, dev);
-#ifdef CONFIG_FEC_MXC_PHYADDR
-       addr = CONFIG_FEC_MXC_PHYADDR;
+#ifdef CFG_FEC_MXC_PHYADDR
+       addr = CFG_FEC_MXC_PHYADDR;
 #endif
 
        phydev = phy_connect(priv->bus, addr, dev, priv->interface);

diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index a6e9d2bb65f79618cf8fa5cda428d36b4735870d..be1478ea8b67af031028ae7674f1dc65b27a109b 100644 (file)
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -26,7 +26,7 @@
 /* MMC Configs */
 #define CFG_SYS_FSL_ESDHC_ADDR      USDHC1_BASE_ADDR
 
-#define CONFIG_FEC_MXC_PHYADDR         0
+#define CFG_FEC_MXC_PHYADDR            0
 
 #ifdef CONFIG_IMX_HAB
 #define HAB_EXTRA_SETTINGS \

diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h
index 63afa6e18969a00331724f586284a175a7fcd89b..19c7fca03b295e0f3d364e9e55647e1d3d6055db 100644 (file)
--- a/include/configs/capricorn-common.h
+++ b/include/configs/capricorn-common.h
@@ -20,7 +20,7 @@
 
 /* ENET1 connects to base board and MUX with ESAI */
 #define CFG_FEC_ENET_DEV               1
-#define CONFIG_FEC_MXC_PHYADDR         0x0
+#define CFG_FEC_MXC_PHYADDR            0x0
 
 /* EEPROM */
 #define  EEPROM_I2C_BUS                0 /* I2C0 */

diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h
index 263981860e86865f1a2d611acd2977abc8b32e9a..caa1498acead73a2b560f60973982126e6ece450 100644 (file)
--- a/include/configs/cgtqmx8.h
+++ b/include/configs/cgtqmx8.h
@@ -118,6 +118,6 @@
 #define PHYS_SDRAM_2_SIZE              0x100000000     /* 4 GB */
 
 /* Networking */
-#define CONFIG_FEC_MXC_PHYADDR         -1
+#define CFG_FEC_MXC_PHYADDR            -1
 
 #endif /* __CGTQMX8_H */

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 2d56d37f06f812146d6939e52a2d1915c3366caf..cde7d3c891ab5fe0d6655ddbb12b6e06691c8482 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -13,7 +13,7 @@
 #define CONFIG_MXC_UART_BASE            UART1_IPS_BASE_ADDR
 
 /* Network */
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 /* ENET1 */
 #define IMX_FEC_BASE                   ENET_IPS_BASE_ADDR

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index c66cf721870c5e9321baefd080ff779396ec05f9..47b76c9371e804e04780af5e2173dec8d03fb8fb 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -132,7 +132,7 @@
 /* APBH DMA is required for NAND support */
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR         0
+#define CFG_FEC_MXC_PHYADDR            0
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 0df61916b7d283fcb0c05c5765b2642c3aadc064..121b34ae96dbd06bf31c8574d61a962aca97341c 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -19,7 +19,7 @@
 
 
 /* Ethernet Configs */
-#define CONFIG_FEC_MXC_PHYADDR         0
+#define CFG_FEC_MXC_PHYADDR         0
 
 #define CFG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \

diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index b6006c021d5c66f63aa67d227d3561298ad13e26..162b0b8a69bb70eb0d5b135e7d37f2c0d407510e 100644 (file)
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -40,7 +40,7 @@
 /* MMC */
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR         1
+#define CFG_FEC_MXC_PHYADDR            1
 
 /* USB */
 #define CONFIG_MXC_USB_PORTSC                  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h
index 00ce7fb62a93f5b010706291959e66c40bf0f876..7785bdc7cbe6cabf0c12e6f30a5d3fb8eb506b6e 100644 (file)
--- a/include/configs/imx8mm-cl-iot-gate.h
+++ b/include/configs/imx8mm-cl-iot-gate.h
@@ -136,7 +136,7 @@
 #define CFG_SYS_FSL_USDHC_NUM  2
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 
-#define CONFIG_FEC_MXC_PHYADDR         0
+#define CFG_FEC_MXC_PHYADDR            0
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
index d28f3f1972b930fb32f85ed2a75ef7e826cc81ce..c364e06dc450c7bf9485fdbfc2106e9eecdf9ed9 100644 (file)
--- a/include/configs/imx8mm_evk.h
+++ b/include/configs/imx8mm_evk.h
@@ -61,6 +61,6 @@
 #define PHYS_SDRAM                      0x40000000
 #define PHYS_SDRAM_SIZE                        0x80000000 /* 2GB DDR */
 
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 #endif

diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index c6e3b105a8ad84c2d757a788f65f9b5cb0716d64..1fea5b72deba93aad85ada5aace595224a91f9bf 100644 (file)
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -13,7 +13,7 @@
 #define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 
 #define PHY_ANEG_TIMEOUT 20000
 

diff --git a/include/configs/imx8mp_icore_mx8mp.h b/include/configs/imx8mp_icore_mx8mp.h
index c3abcee40e8910f66a34f8b6a5b57ade47619e0a..bbbd91776feff30e47af0997f56dbddb329c9fdd 100644 (file)
--- a/include/configs/imx8mp_icore_mx8mp.h
+++ b/include/configs/imx8mp_icore_mx8mp.h
@@ -14,7 +14,7 @@
 #define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 
 #define DWC_NET_PHYADDR                        1
 

diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h
index ed4da0e69b5bedb50bd097c54e7922c8f630e611..38ae5f137022b9614af3ae92d11c89dac7037eec 100644 (file)
--- a/include/configs/imx8mp_rsb3720.h
+++ b/include/configs/imx8mp_rsb3720.h
@@ -39,7 +39,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          4
+#define CFG_FEC_MXC_PHYADDR          4
 
 #define PHY_ANEG_TIMEOUT 20000
 

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index c40448715f8a299ffb758979b4ba15fa4eab0394..d9ce5d5d0f1a7ea7d8f659344972502eb85ae951 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -24,7 +24,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 #endif
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 8fed3e31964c898834245ef908c35859e2e244ce..eb7059f0648c2f2cdb8ec85d95d08038492824eb 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -21,7 +21,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 #endif
 
 #define CONFIG_MFG_ENV_SETTINGS \

diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h
index 30dd5af03b00938c1295787e1226a1dbfc25f2d2..b7397f6038fddb554ff1fc4d0a7e458e01a8a153 100644 (file)
--- a/include/configs/imx8ulp_evk.h
+++ b/include/configs/imx8ulp_evk.h
@@ -21,7 +21,7 @@
 #if defined(CONFIG_FEC_MXC)
 #define PHY_ANEG_TIMEOUT               20000
 
-#define CONFIG_FEC_MXC_PHYADDR         1
+#define CFG_FEC_MXC_PHYADDR            1
 #endif
 
 #ifdef CONFIG_DISTRO_DEFAULTS

diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h
index d909bbbbcfda61f651d07bf3a2456b05bffdf19a..4dd51c7f1d7fdc6991ceca54cad5e9b4bc5d74f3 100644 (file)
--- a/include/configs/kontron_pitx_imx8m.h
+++ b/include/configs/kontron_pitx_imx8m.h
@@ -25,7 +25,7 @@
 
 /* ENET1 Config */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 #define PHY_ANEG_TIMEOUT               20000
 

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 7200c69bd9e69f61427bd0fc7ed1fc3c48f9b0d0..0b8781d7bf3422f33b023208b03ed3dac6c73cf6 100644 (file)
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -102,7 +102,7 @@
 #ifdef CONFIG_CMD_NET
 #define CFG_FEC_ENET_DEV               0
 
-#define CONFIG_FEC_MXC_PHYADDR         0x0
+#define CFG_FEC_MXC_PHYADDR            0x0
 #endif
 
 #endif

diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h
index 0deb7672f9e99ab621424cd2c26639c554152f5b..de6928d297371d49b68cd3356c15e3480047acea 100644 (file)
--- a/include/configs/m53menlo.h
+++ b/include/configs/m53menlo.h
@@ -54,7 +54,7 @@
  * Ethernet on SOC (FEC)
  */
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR         0x0
+#define CFG_FEC_MXC_PHYADDR            0x0
 #endif
 
 #define CFG_SYS_RTC_BUS_NUM            1 /* I2C2 */

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 436f5f0059deea91aaa1f1ad56f3b8ff5aa652d9..6cc49378fedc55c6e2f6a4a660640868f9b78ba2 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -31,7 +31,7 @@
 #define CFG_SYS_FLASH_BANKS_SIZES      { (32 * SZ_1M) }
 
 /* Ethernet Configuration */
-#define CONFIG_FEC_MXC_PHYADDR         1
+#define CFG_FEC_MXC_PHYADDR            1
 
 #define CFG_EXTRA_ENV_SETTINGS \
        "console=ttymxc0,115200 quiet\0" \

diff --git a/include/configs/msc_sm2s_imx8mp.h b/include/configs/msc_sm2s_imx8mp.h
index ef2111cd20aba8c90cb0961df901ea090e1e5b0c..1cd0b3cf737445e7fe118abc8d2c3720442ec6eb 100644 (file)
--- a/include/configs/msc_sm2s_imx8mp.h
+++ b/include/configs/msc_sm2s_imx8mp.h
@@ -17,7 +17,7 @@
 #define CFG_SYS_UBOOT_BASE     (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
 
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR          1
+#define CFG_FEC_MXC_PHYADDR          1
 #define PHY_ANEG_TIMEOUT 20000
 #endif
 

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 9d8737c1942556bec98bfd8730bc73190271e60e..3399cdd16fa83f92b75ab5e7e4cafe0bdb30e462 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -93,7 +93,7 @@
 /* Network */
 
 #define IMX_FEC_BASE                   ENET2_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 8372f979dc86793dfcb1699111547b18d3204fbb..c99d99abc17934aed0698c00763ff366f2186834 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -115,7 +115,7 @@
 
 /* Network */
 
-#define CONFIG_FEC_MXC_PHYADDR          0x1
+#define CFG_FEC_MXC_PHYADDR          0x1
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index efc599f37a6d4c25487e5834dd397d7da3170b1a..5e3695ecc971c7dc2065014142ef023104c5d510 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -124,9 +124,9 @@
 #define CFG_FEC_ENET_DEV               1
 
 #if (CFG_FEC_ENET_DEV == 0)
-#define CONFIG_FEC_MXC_PHYADDR          0x2
+#define CFG_FEC_MXC_PHYADDR          0x2
 #elif (CFG_FEC_ENET_DEV == 1)
-#define CONFIG_FEC_MXC_PHYADDR         0x1
+#define CFG_FEC_MXC_PHYADDR            0x1
 #endif
 #endif
 

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index 496a3164f4048fea4f528ce56f4bf95784fb7bc0..aca15be64b11b57c74d0b3bb5404ec9cae5432fc 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -18,7 +18,7 @@
 #define CFG_SYS_FSL_USDHC_NUM       2
 
 #define IMX_FEC_BASE                   ENET_BASE_ADDR
-#define CONFIG_FEC_MXC_PHYADDR         6
+#define CFG_FEC_MXC_PHYADDR            6
 
 /* USB Configs */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 979512c0a0952cfa6bf29420079f676c59bb3f40..4b47e4fbb37ae8d51b4d037f36ee9c92205c8cb6 100644 (file)
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -33,7 +33,7 @@
 #define CONFIG_MXC_USB_FLAGS           0
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR         0x1
+#define CFG_FEC_MXC_PHYADDR            0x1
 #endif
 
 #define CFG_FEC_ENET_DEV               1

diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 66258a3ab73b73778d2edb924cd9441b23962100..e1f7b7003194c38188676bc7f2b14cfb614f4935 100644 (file)
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -98,6 +98,6 @@
 /* Environment organization */
 
 /* Ethernet Configuration */
-#define CONFIG_FEC_MXC_PHYADDR         1
+#define CFG_FEC_MXC_PHYADDR            1
 
 #endif                        /* __CONFIG_H * */

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 45fc6126c8798d81f6fa51f565a6dd41b32618cd..1cb8fa63e72116e82367e37fdd3bf7c4fa4480eb 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -15,7 +15,7 @@
 
 /* Network support */
 
-#define CONFIG_FEC_MXC_PHYADDR         0x1
+#define CFG_FEC_MXC_PHYADDR            0x1
 
 #define CONFIG_MXC_UART_BASE           UART6_BASE_ADDR
 

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index ac25991703f2f7209ba2e6ae3e5645b25dbe2350..1d8709180c83bd7aa2c6717d2dddcc964b155933 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -21,7 +21,7 @@
 /* ENET Config */
 /* ENET1 */
 #if defined(CONFIG_CMD_NET)
-#define CONFIG_FEC_MXC_PHYADDR         1
+#define CFG_FEC_MXC_PHYADDR            1
 #endif
 
 /* Initial environment variables */

diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index e132805635139f2aa108f3d9b7aa46fa1a848c2c..3418d4e2b55972964d0640ec89d237e0903c186a 100644 (file)
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -66,7 +66,7 @@
 #endif
 
 #ifdef CONFIG_CMD_NET
-#define CONFIG_FEC_MXC_PHYADDR         0x1
+#define CFG_FEC_MXC_PHYADDR            0x1
 #endif
 
 #endif

diff --git a/include/configs/tqma6_mba6.h b/include/configs/tqma6_mba6.h
index 899c218727f363f5c7939895ed1815966756fead..a5f14dc4267969cc214b45c2bb9370731c63e01d 100644 (file)
--- a/include/configs/tqma6_mba6.h
+++ b/include/configs/tqma6_mba6.h
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_TQMA6_MBA6_H
 #define __CONFIG_TQMA6_MBA6_H
 
-#define CONFIG_FEC_MXC_PHYADDR         0x03
+#define CFG_FEC_MXC_PHYADDR            0x03
 
 #define CONFIG_MXC_UART_BASE           UART2_BASE
 #define CONSOLE_DEV            "ttymxc1"

diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h
index 4d8839b6e60df37b30562c9adf5f1363f9614681..34c9b6a2f97ce0d4f4f83ffbe1678ec5a0c429ca 100644 (file)
--- a/include/configs/tqma6_wru4.h
+++ b/include/configs/tqma6_wru4.h
@@ -7,7 +7,7 @@
 #define __CONFIG_TQMA6_WRU4_H
 
 /* Ethernet */
-#define CONFIG_FEC_MXC_PHYADDR         0x01
+#define CFG_FEC_MXC_PHYADDR            0x01
 
 /* UART */
 #define CONFIG_MXC_UART_BASE           UART4_BASE

diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h
index 0e0b3a7b594da6adf1cc14e973eb01ca48c32641..d10b88f157548c127971cadceb9541f5fc649b83 100644 (file)
--- a/include/configs/vf610twr.h
+++ b/include/configs/vf610twr.h
@@ -21,7 +21,7 @@
 
 #define CFG_SYS_FSL_ESDHC_ADDR 0
 
-#define CONFIG_FEC_MXC_PHYADDR          0
+#define CFG_FEC_MXC_PHYADDR          0
 
 /* I2C Configs */
 

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index 1a71b300fc55b69c7adcfc85c5130994f21c1509..c84353ebea66bc079ea27eafb24765ffa5e8fb46 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -34,7 +34,7 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 
 /* Network */
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index 13f0ee62b89ff758c11f063995f14fc43494ca27..96996ac1f0f24c41d5b2688850b0e63d2ae80e29 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -32,7 +32,7 @@
 #define CONFIG_MXC_USB_FLAGS           0
 
 #define CFG_FEC_ENET_DEV               0
-#define CONFIG_FEC_MXC_PHYADDR          0x0
+#define CFG_FEC_MXC_PHYADDR          0x0
 
 #define CFG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \