global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

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

diff --git a/board/freescale/ls1046afrwy/eth.c b/board/freescale/ls1046afrwy/eth.c
index 9f8bd92..71c4c21 100644 (file)
--- a/board/freescale/ls1046afrwy/eth.c
+++ b/board/freescale/ls1046afrwy/eth.c
@@ -3,6 +3,8 @@
  * Copyright 2019 NXP
  */
 #include <common.h>
+#include <fdt_support.h>
+#include <net.h>
 #include <asm/io.h>
 #include <netdev.h>
 #include <fm_eth.h>
@@ -12,13 +14,13 @@
 
 #include "../common/fman.h"
 
-int board_eth_init(bd_t *bis)
+int board_eth_init(struct bd_info *bis)
 {
 #ifdef CONFIG_FMAN_ENET
        struct memac_mdio_info dtsec_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;
@@ -53,6 +55,8 @@ int board_eth_init(bd_t *bis)
        fm_info_set_mdio(FM1_DTSEC10, dev);
        fm_info_set_mdio(FM1_DTSEC1, dev);
 
+       fm_disable_port(FM1_DTSEC9);
+
        cpu_eth_init(bis);
 #endif
 
@@ -66,7 +70,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;