net: old_gem: Wire up configuration for old gem driver

Just wire up old gem config for zynq.

Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/arch/arm/cpu/armv7/zynq/config.mk b/arch/arm/cpu/armv7/zynq/config.mk
index 85996f3255fe0755b452b12500f97a718df475f8..a022aebb3e407b9707fc303aadc309ddad2a11e1 100644 (file)
--- a/arch/arm/cpu/armv7/zynq/config.mk
+++ b/arch/arm/cpu/armv7/zynq/config.mk
@@ -23,3 +23,5 @@
 PLATFORM_RELFLAGS += -fno-strict-aliasing
 # Xilinx, added to prevent unaligned accesses which started happening # with GCC 4.5.2 tools
 PLATFORM_RELFLAGS += -mno-unaligned-access
+
+PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/xilinx/common

diff --git a/board/xilinx/zynq_common/Makefile b/board/xilinx/zynq_common/Makefile
index 5e1570782560eb006fc4061e0126f20255af4b68..c5dfdcd4a665173acfbf1f00cafe734e23286d4e 100644 (file)
--- a/board/xilinx/zynq_common/Makefile
+++ b/board/xilinx/zynq_common/Makefile
@@ -28,7 +28,7 @@ endif
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS-y        := board.o
+COBJS-y        := board.o ../common/xbasic_types.o
 SOBJS   := lowlevel_init.o
 
 COBJS  := $(sort $(COBJS-y))

diff --git a/board/xilinx/zynq_common/board.c b/board/xilinx/zynq_common/board.c
index 0d1a55e21c11b615fdc1d284062561224599b187..3f6950dd1052d46818cee959e6b22ecf59d2dc3e 100644 (file)
--- a/board/xilinx/zynq_common/board.c
+++ b/board/xilinx/zynq_common/board.c
@@ -32,13 +32,13 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #define dmbp() __asm__ __volatile__ ("dmb" : : : "memory")
 
-static void XIo_Out32(u32 OutAddress, u32 Value)
+void XIo_Out32(u32 OutAddress, u32 Value)
 {
     *(volatile u32 *) OutAddress = Value;
     dmbp();
 }
 
-static u32 XIo_In32(u32 InAddress)
+u32 XIo_In32(u32 InAddress)
 {
     volatile u32 temp = *(volatile u32 *)InAddress;
     dmbp();

diff --git a/drivers/net/zynq_gem_g.c b/drivers/net/zynq_gem_g.c
index 04399169577ce7c30d644481ada5f3fca700d610..1d55bf92ce67083f7fb875fc0d10d2b909430d93 100644 (file)
--- a/drivers/net/zynq_gem_g.c
+++ b/drivers/net/zynq_gem_g.c
@@ -34,13 +34,13 @@
  * The configuration table for emacps device
  */
 
-XEmacPss_Config XEmacPss_ConfigTable[XPAR_XEMACPSS_NUM_INSTANCES] = {
+XEmacPss_Config XEmacPss_ConfigTable[2] = {
        {
-        XPAR_XEMACPSS_0_DEVICE_ID,  /* Device ID */
-        XPAR_XEMACPSS_0_BASEADDR    /* Device base address */
+        0,  /* Device ID */
+        0xe000b000    /* Device base address */
        },
        {
-        XPAR_XEMACPSS_1_DEVICE_ID,  /* Device ID */
-        XPAR_XEMACPSS_1_BASEADDR    /* Device base address */
+        1,  /* Device ID */
+        0xe000c000    /* Device base address */
        }
 };

diff --git a/drivers/net/zynq_gem_sinit.c b/drivers/net/zynq_gem_sinit.c
index 9f1157a9c7da025109e30016cc47caab0f33db81..97626fc29e0639483609be70ea5460fa4aaa34cd 100644 (file)
--- a/drivers/net/zynq_gem_sinit.c
+++ b/drivers/net/zynq_gem_sinit.c
@@ -47,7 +47,7 @@ XEmacPss_Config *XEmacPss_LookupConfig(u16 DeviceId)
        XEmacPss_Config *CfgPtr = NULL;
        int i;
 
-       for (i = 0; i < XPAR_XEMACPSS_NUM_INSTANCES; i++) {
+       for (i = 0; i < 2; i++) {
                if (XEmacPss_ConfigTable[i].DeviceId == DeviceId) {
                        CfgPtr = &XEmacPss_ConfigTable[i];
                        break;

diff --git a/drivers/net/zynq_gem_wrap.c b/drivers/net/zynq_gem_wrap.c
index 9547d921047a35e8e727b50b533b0910f49c4283..b780f11e0856c0e497bdba9c6caf5d8148da5e88 100644 (file)
--- a/drivers/net/zynq_gem_wrap.c
+++ b/drivers/net/zynq_gem_wrap.c
@@ -523,7 +523,7 @@ static int Xgmac_write_hwaddr(struct eth_device *dev)
        return 0;
 }
 
-int zynq_gem_initialize(bd_t *bis)
+int zynq_gem_initialize_old(bd_t *bis)
 {
        struct eth_device *dev;
        dev = malloc(sizeof(*dev));

diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index a7ef8f7420b748257fc78f9ab0670119ec9687d6..34b578327649d6228761d7fa3a9029b88a0a358c 100644 (file)
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -23,9 +23,12 @@
 #define PHYS_SDRAM_1_SIZE (256 * 1024 * 1024)
 
 #define CONFIG_ZYNQ_SERIAL_UART0
-#define CONFIG_ZYNQ_GEM0
 #define CONFIG_PHY_ADDR        23
 
+#define CONFIG_ZYNQ_GEM_OLD
+#define CONFIG_XGMAC_PHY_ADDR CONFIG_PHY_ADDR
+#define CONFIG_SYS_ENET
+
 #define CONFIG_CPU_FREQ_HZ     12500000
 
 #define CONFIG_MMC

diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 8809716280ceea3e7ea7df845107a1477ada1455..ce8599736ebd791c6c3059998391dd1256c412d2 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -21,9 +21,13 @@
 #define PHYS_SDRAM_1_SIZE (1024 * 1024 * 1024)
 
 #define CONFIG_ZYNQ_SERIAL_UART1
-#define CONFIG_ZYNQ_GEM0
 #define CONFIG_PHY_ADDR        7
 
+#define CONFIG_ZYNQ_GEM_OLD
+#define CONFIG_XGMAC_PHY_ADDR CONFIG_PHY_ADDR
+#define CONFIG_SYS_ENET
+
+
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_MMC

diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index c511577cefa200cee38c6369f8dc0a06eda43b17..43d8900804cfda7a1803309fe577ee6b181e922f 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -24,8 +24,12 @@
 
 #if defined(CONFIG_ZC770_XM010)
 # define CONFIG_ZYNQ_SERIAL_UART1
-# define CONFIG_ZYNQ_GEM0
 # define CONFIG_PHY_ADDR       7
+
+#define CONFIG_ZYNQ_GEM_OLD
+#define CONFIG_XGMAC_PHY_ADDR CONFIG_PHY_ADDR
+#define CONFIG_SYS_ENET
+
 # define CONFIG_MMC
 # define CONFIG_ZYNQ_SPI
 
@@ -39,8 +43,12 @@
 
 #elif defined(CONFIG_ZC770_XM013)
 # define CONFIG_ZYNQ_SERIAL_UART0
-# define CONFIG_ZYNQ_GEM1
-# define CONFIG_PHY_ADDR       7
+# define CONFIG_PHY_ADDR       7
+
+#define CONFIG_ZYNQ_GEM_OLD
+#define CONFIG_XGMAC_PHY_ADDR CONFIG_PHY_ADDR
+#define CONFIG_SYS_ENET
+
 # define CONFIG_ZYNQ_SPI
 
 #else

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 6da452814e2cc3d9dedcad8b0a9e8b0ee30662f3..eb7711f43567b487e177954e1eb38c4f70ae7fe1 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -21,9 +21,12 @@
 #define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024)
 
 #define CONFIG_ZYNQ_SERIAL_UART1
-#define CONFIG_ZYNQ_GEM0
 #define CONFIG_PHY_ADDR        0
 
+#define CONFIG_ZYNQ_GEM_OLD
+#define CONFIG_XGMAC_PHY_ADDR CONFIG_PHY_ADDR
+#define CONFIG_SYS_ENET
+
 #define CONFIG_SYS_NO_FLASH
 
 #define CONFIG_MMC