From 8eeef60e199d381ae56cf69367a6747488a9d1a1 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 24 Jan 2013 12:01:28 +0100 Subject: [PATCH] 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 --- arch/arm/cpu/armv7/zynq/config.mk | 2 -- include/configs/zynq_zc70x.h | 5 +---- include/configs/zynq_zc770.h | 14 +++----------- include/configs/zynq_zed.h | 5 +---- 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/arch/arm/cpu/armv7/zynq/config.mk b/arch/arm/cpu/armv7/zynq/config.mk index a022aebb3e4..85996f3255f 100644 --- 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 0fc6abccc27..4e7df2e7928 100644 --- 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 b09ac3cf3b4..dab27ae2b02 100644 --- 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 9d3a2084b60..b065ef7e373 100644 --- 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 -- 2.47.3