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

zynq: Move CONFIG to common location

CONFIG_AUTO_COMPLETE, CONFIG_CMDLINE_EDITING
and CONFIG_SYS_LONGHELP

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

diff --git a/include/configs/zynq_afx.h b/include/configs/zynq_afx.h
index 96227dff521..6d46a5f7b8c 100644
--- a/include/configs/zynq_afx.h
+++ b/include/configs/zynq_afx.h
@@ -30,9 +30,6 @@
 
 #include <configs/zynq_common.h>
 
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
 #if defined(CONFIG_AFX_NOR) || defined(CONFIG_AFX_QSPI)
 /* Place a Xilinx Boot ROM header in u-boot image? */
 #define CONFIG_ZYNQ_XILINX_FLASH_HEADER
diff --git a/include/configs/zynq_common.h b/include/configs/zynq_common.h
index e65946baee6..86598f3af0f 100644
--- a/include/configs/zynq_common.h
+++ b/include/configs/zynq_common.h
@@ -108,6 +108,11 @@
 #endif
 
 
+#define CONFIG_AUTO_COMPLETE
+#define CONFIG_CMDLINE_EDITING
+#define CONFIG_SYS_LONGHELP
+
+
 
 #include <config_cmd_default.h>
 
diff --git a/include/configs/zynq_cseflash.h b/include/configs/zynq_cseflash.h
index 40d07f3497d..70183f56d04 100644
--- a/include/configs/zynq_cseflash.h
+++ b/include/configs/zynq_cseflash.h
@@ -57,8 +57,10 @@
 #undef CONFIG_GZIP
 #undef CONFIG_ZLIB
 
-//#define CONFIG_AUTO_COMPLETE
+#undef CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
+#undef CONFIG_SYS_LONGHELP
+
 
 /* Because (at least at first) we're going to be loaded via JTAG_Tcl */
 #define CONFIG_SKIP_LOWLEVEL_INIT
diff --git a/include/configs/zynq_ep107.h b/include/configs/zynq_ep107.h
index 1f77a88c205..8382c7ba5e1 100644
--- a/include/configs/zynq_ep107.h
+++ b/include/configs/zynq_ep107.h
@@ -67,9 +67,6 @@
 		"tftp 0x800000 ramdisk8M.image.gz;" \
 		"go 0x8000\0"
 
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
 #undef CONFIG_FIT
 #undef CONFIG_FIT_VERBOSE
 
diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
index 635b5494942..cfeaf286881 100644
--- a/include/configs/zynq_zc70x.h
+++ b/include/configs/zynq_zc70x.h
@@ -32,10 +32,6 @@
 
 #define CONFIG_CMD_SAVEENV	/* Command to save ENV to Flash */
 
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_LONGHELP
-
 /*
  * SPI Settings
  */
diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h
index 3d6d0bed3f2..870f4a8c530 100644
--- a/include/configs/zynq_zc770.h
+++ b/include/configs/zynq_zc770.h
@@ -48,10 +48,6 @@
 
 #include <configs/zynq_common.h>
 
-
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
 #if defined(CONFIG_ZC770_XM010) || defined(CONFIG_ZC770_XM012)
 /* Place a Xilinx Boot ROM header in u-boot image? */
 #define CONFIG_ZYNQ_XILINX_FLASH_HEADER
diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
index 64eb2d022df..533af0dd0e1 100644
--- a/include/configs/zynq_zed.h
+++ b/include/configs/zynq_zed.h
@@ -52,9 +52,6 @@
 		"tftp 0x800000 ramdisk8M.image.gz;" \
 		"go 0x8000\0"
 
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-
 /*
  * SPI Settings
  */