]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
microblaze: Remove support for LL_TEMAC
authorMichal Simek <michal.simek@xilinx.com>
Wed, 2 Dec 2015 16:22:07 +0000 (17:22 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Fri, 18 Dec 2015 12:15:58 +0000 (13:15 +0100)
LL_TEMAC is available at big endian MB and it is not properly tested
that's why the patch removes it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
board/xilinx/microblaze-generic/microblaze-generic.c
board/xilinx/microblaze-generic/xparameters.h
include/configs/microblaze-generic.h

index 0c8bd7d1511eb6213e96fac6dcb91201b81d49a6..bc4d6414df2db81650493aa65e80f95e64813794 100644 (file)
@@ -122,40 +122,5 @@ int board_eth_init(bd_t *bis)
                        txpp, rxpp);
 #endif
 
-#ifdef CONFIG_XILINX_LL_TEMAC
-# ifdef XILINX_LLTEMAC_BASEADDR
-#  ifdef XILINX_LLTEMAC_FIFO_BASEADDR
-       ret |= xilinx_ll_temac_eth_init(bis, XILINX_LLTEMAC_BASEADDR,
-                       XILINX_LL_TEMAC_M_FIFO, XILINX_LLTEMAC_FIFO_BASEADDR);
-#  elif XILINX_LLTEMAC_SDMA_CTRL_BASEADDR
-#   if XILINX_LLTEMAC_SDMA_USE_DCR == 1
-       ret |= xilinx_ll_temac_eth_init(bis, XILINX_LLTEMAC_BASEADDR,
-                       XILINX_LL_TEMAC_M_SDMA_DCR,
-                       XILINX_LLTEMAC_SDMA_CTRL_BASEADDR);
-#   else
-       ret |= xilinx_ll_temac_eth_init(bis, XILINX_LLTEMAC_BASEADDR,
-                       XILINX_LL_TEMAC_M_SDMA_PLB,
-                       XILINX_LLTEMAC_SDMA_CTRL_BASEADDR);
-#   endif
-#  endif
-# endif
-# ifdef XILINX_LLTEMAC_BASEADDR1
-#  ifdef XILINX_LLTEMAC_FIFO_BASEADDR1
-       ret |= xilinx_ll_temac_eth_init(bis, XILINX_LLTEMAC_BASEADDR1,
-                       XILINX_LL_TEMAC_M_FIFO, XILINX_LLTEMAC_FIFO_BASEADDR1);
-#  elif XILINX_LLTEMAC_SDMA_CTRL_BASEADDR1
-#   if XILINX_LLTEMAC_SDMA_USE_DCR == 1
-       ret |= xilinx_ll_temac_eth_init(bis, XILINX_LLTEMAC_BASEADDR1,
-                       XILINX_LL_TEMAC_M_SDMA_DCR,
-                       XILINX_LLTEMAC_SDMA_CTRL_BASEADDR1);
-#   else
-       ret |= xilinx_ll_temac_eth_init(bis, XILINX_LLTEMAC_BASEADDR1,
-                       XILINX_LL_TEMAC_M_SDMA_PLB,
-                       XILINX_LLTEMAC_SDMA_CTRL_BASEADDR1);
-#   endif
-#  endif
-# endif
-#endif
-
        return ret;
 }
index d6d0d679e8e06be2910158fb3580220223360169..8ba146cb88db7833f8b296b73390b20a63bb8827 100644 (file)
 /* Ethernet controller is Ethernet_MAC */
 #define XILINX_EMACLITE_BASEADDR       0x40C00000
 
-/* LL_TEMAC Ethernet controller */
-#define XILINX_LLTEMAC_BASEADDR                        0x44000000
-#define XILINX_LLTEMAC_SDMA_CTRL_BASEADDR      0x42000180
-#define XILINX_LLTEMAC_BASEADDR1               0x44200000
-#define XILINX_LLTEMAC_FIFO_BASEADDR1          0x42100000
-
 /* Watchdog IP is wxi_timebase_wdt_0 */
 #define XILINX_WATCHDOG_BASEADDR       0x50000000
 #define XILINX_WATCHDOG_IRQ            1
index e0bc41c874a1a19fde2b17e47a29cd18addd3d37..8db6b551ceda81d547e3eed43afb5aa1ce03ccb4 100644 (file)
 # define CONFIG_XILINX_EMACLITE        1
 # define CONFIG_SYS_ENET
 #endif
-#if defined(XILINX_LLTEMAC_BASEADDR)
-# define CONFIG_XILINX_LL_TEMAC        1
-# define CONFIG_SYS_ENET
-#endif
 #if defined(XILINX_AXIEMAC_BASEADDR)
 # define CONFIG_XILINX_AXIEMAC 1
 # define CONFIG_SYS_ENET
 #define CONFIG_FIT             1
 #define CONFIG_OF_LIBFDT       1
 
-#if defined(CONFIG_XILINX_LL_TEMAC) || defined(CONFIG_XILINX_AXIEMAC)
+#if defined(CONFIG_XILINX_AXIEMAC)
 # define CONFIG_MII            1
 # define CONFIG_CMD_MII                1
 # define CONFIG_PHY_GIGE       1