Revert "net: old_gem: Wire up configuration for old gem driver"

This reverts commit df6e39a23578fa57434c2f501a05c79da643420b.

Mainline zynq gem driver is fixed that's why no problem
to enable it and remove old one.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv7/zynq/config.mk b/arch/arm/cpu/armv7/zynq/config.mk
index a022aebb3e407b9707fc303aadc309ddad2a11e1..85996f3255fe0755b452b12500f97a718df475f8 100644 (file)
--- a/arch/arm/cpu/armv7/zynq/config.mk
+++ b/arch/arm/cpu/armv7/zynq/config.mk
@@ -23,5 +23,3 @@
 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/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 0fc6abccc270ce239eb246179bf4ae10ede19745..4e7df2e7928eb159154a44295a7c07b9cab4c388 100644 (file)
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -21,12 +21,9 @@
 #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 b09ac3cf3b4f6b1cdc759a453a588cd53a25c7b0..dab27ae2b02cb0257e28dbb88fe9cf6ee07429cc 100644 (file)
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -24,12 +24,8 @@
 
 #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
 
@@ -43,12 +39,8 @@
 
 #elif defined(CONFIG_ZC770_XM013)
 # define CONFIG_ZYNQ_SERIAL_UART0
-# 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_GEM1
+# define CONFIG_PHY_ADDR       7
 # define CONFIG_ZYNQ_SPI
 
 #else

diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 9d3a2084b600be391cc94fec1bd76c703e246197..b065ef7e373f9a7199ae4a430860ba086a1d88d8 100644 (file)
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -21,12 +21,9 @@
 #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