From: Michal Simek <monstr@monstr.eu>
Date: Mon, 24 Sep 2012 13:01:24 +0000 (+0200)
Subject: zynq: Move ethernet config to one file
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b9beb60f6975d22a6121a9381c1c67ce6d980e2;p=thirdparty%2Fu-boot.git

zynq: Move ethernet config to one file

Also move command config to common file.

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

diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h
index a8465930341..cf939c54af0 100644
--- a/include/configs/zynq_afx.h
+++ b/include/configs/zynq_afx.h
@@ -30,7 +30,6 @@
 
 
 
-#include <config_cmd_default.h>
 #define CONFIG_REGINFO		/* Again, debugging */
 #undef CONFIG_CMD_SETGETDCR	/* README says 4xx only */
 #define CONFIG_TIMESTAMP	/* print image timestamp on bootm, etc */
@@ -52,13 +51,6 @@
  */
 #define PHYS_SDRAM_1_SIZE (128 * 1024 * 1024)
 
-/*
- * Ethernet Settings
- */
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
-#undef CONFIG_BOOTM_NETBSD
-
 /*
  * SPI Settings
  */
diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index 5df1860e3fb..6cf8ea05271 100644
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -65,6 +65,7 @@
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 # define CONFIG_PHYLIB
 # define CONFIG_PHY_MARVELL
+# define CONFIG_SYS_ENET
 #endif
 
 /* SCU timer address is hardcoded */
@@ -106,6 +107,21 @@
 # endif
 #endif
 
+
+
+#include <config_cmd_default.h>
+
+
+#ifdef CONFIG_SYS_ENET
+# define CONFIG_CMD_PING
+# define CONFIG_CMD_MII
+#else
+# undef CONFIG_CMD_NET
+# undef CONFIG_CMD_NFS
+#endif
+
+
+
 #include <asm/arch/xparameters.h>
 
 #define CONFIG_SYS_TEXT_BASE 0x04000000
@@ -214,4 +230,6 @@
 
 #define CONFIG_BOARD_LATE_INIT
 
+#undef CONFIG_BOOTM_NETBSD
+
 #endif /* __CONFIG_ZYNQ_COMMON_H */
diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h
index 9c370da9ed9..0a854160d18 100644
--- a/include/configs/zynq_cseflash.h
+++ b/include/configs/zynq_cseflash.h
@@ -24,15 +24,11 @@
 
 
 
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_PING		/* Might be useful for debugging */
 #undef CONFIG_REGINFO		/* Again, debugging */
 #undef CONFIG_CMD_SETGETDCR	/* README says 4xx only */
 #undef CONFIG_CMD_EDITENV
 #undef CONFIG_CMD_SAVEENV
 
-#undef CONFIG_CMD_NET		/* bootp, tftpboot, rarpboot	*/
-#undef CONFIG_CMD_NFS		/* NFS support			*/
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_XIMG
 
diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index 710c42064f8..d18467376e1 100644
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -66,8 +66,6 @@
 		"go 0x8000\0"
 
 
-#include <config_cmd_default.h>
-#define CONFIG_CMD_PING		/* Might be useful for debugging */
 #define CONFIG_REGINFO		/* Again, debugging */
 #undef CONFIG_CMD_SETGETDCR	/* README says 4xx only */
 
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 09cde5a102e..ac4894af625 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -28,13 +28,10 @@
 #include <configs/zynq_common.h>
 
 
-#include <config_cmd_default.h>
-#define CONFIG_CMD_PING		/* Might be useful for debugging */
 #define CONFIG_CMD_SAVEENV	/* Command to save ENV to Flash */
 #define CONFIG_REGINFO		/* Again, debugging */
 #undef CONFIG_CMD_SETGETDCR	/* README says 4xx only */
 
-#define CONFIG_CMD_MII
 
 #define CONFIG_TIMESTAMP	/* print image timestamp on bootm, etc */
 
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 341b8551375..054a6a5e2bc 100644
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -47,7 +47,6 @@
 #include <configs/zynq_common.h>
 
 
-#include <config_cmd_default.h>
 #define CONFIG_REGINFO		/* Again, debugging */
 #undef CONFIG_CMD_SETGETDCR	/* README says 4xx only */
 
@@ -74,17 +73,6 @@
 #define PHYS_SDRAM_1_SIZE (1024 * 1024 * 1024)
 
 
-/*
- * Ethernet Settings
- */
-#if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM013)
-#define CONFIG_CMD_PING
-#else
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
-#undef CONFIG_BOOTM_NETBSD
-#endif
-
 /*
  * SPI Settings
  */
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 538d65894bd..99c55f19687 100644
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -50,8 +50,6 @@
 		"tftp 0x800000 ramdisk8M.image.gz;" \
 		"go 0x8000\0"
 
-#include <config_cmd_default.h>
-#define CONFIG_CMD_PING		/* Might be useful for debugging */
 #define CONFIG_REGINFO		/* Again, debugging */
 #undef CONFIG_CMD_SETGETDCR	/* README says 4xx only */