global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

[platform/kernel/u-boot.git] / board / freescale / ls1046ardb / eth.c

diff --git a/board/freescale/ls1046ardb/eth.c b/board/freescale/ls1046ardb/eth.c
index 6ffd4ae..04fa57f 100644 (file)
--- a/board/freescale/ls1046ardb/eth.c
+++ b/board/freescale/ls1046ardb/eth.c
@@ -3,6 +3,7 @@
  * Copyright 2016 Freescale Semiconductor, Inc.
  */
 #include <common.h>
+#include <fdt_support.h>
 #include <net.h>
 #include <asm/io.h>
 #include <netdev.h>
@@ -13,7 +14,7 @@
 
 #include "../common/fman.h"
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 #ifdef CONFIG_FMAN_ENET
        int i;
@@ -21,7 +22,7 @@ int board_eth_init(bd_t *bis)
        struct memac_mdio_info tgec_mdio_info;
        struct mii_dev *dev;
        u32 srds_s1;
-       struct ccsr_gur *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
+       struct ccsr_gur *gur = (void *)(CFG_SYS_FSL_GUTS_ADDR);
 
        srds_s1 = in_be32(&gur->rcwsr[4]) &
                        FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_MASK;
@@ -66,7 +67,7 @@ int board_eth_init(bd_t *bis)
        for (i = FM1_DTSEC1; i < FM1_DTSEC1 + CONFIG_SYS_NUM_FM1_DTSEC; i++)
                fm_info_set_mdio(i, dev);
 
-       /* XFI on lane A, MAC 9 */
+       /* 10GBase-R on lane A, MAC 9 */
        dev = miiphy_get_dev_by_name(DEFAULT_FM_TGEC_MDIO_NAME);
        fm_info_set_mdio(FM1_10GEC1, dev);
 
@@ -83,7 +84,7 @@ int fdt_update_ethernet_dt(void *blob)
        int i, prop;
        int offset, nodeoff;
        const char *path;
-       struct ccsr_gur *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR);
+       struct ccsr_gur *gur = (void *)(CFG_SYS_FSL_GUTS_ADDR);
 
        srds_s1 = in_be32(&gur->rcwsr[4]) &
                        FSL_CHASSIS2_RCWSR4_SRDS1_PRTCL_MASK;