From a1c127f9a13af7f53f0f93b9b69400356bd8875d Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Wed, 4 Mar 2015 19:59:59 +0100
Subject: [PATCH] micro: move more config stuff into common.h

---
 u-boot/include/configs/carambola2.h | 7 -------
 u-boot/include/configs/common.h     | 6 ++++++
 u-boot/include/configs/skylab.h     | 6 ------
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/u-boot/include/configs/carambola2.h b/u-boot/include/configs/carambola2.h
index 1f3f0f76ba..074965dc69 100644
--- a/u-boot/include/configs/carambola2.h
+++ b/u-boot/include/configs/carambola2.h
@@ -43,7 +43,6 @@
 
 #include <configs/ar7240_freq.h>
 
-
 #define CFG_ATHRS26_PHY  1
 
 #define CONFIG_IPADDR   192.168.2.100
@@ -60,12 +59,6 @@
 #define CFG_AG7100_GE0_RMII             1
 
 #define CFG_BOOTM_LEN	(16 << 20) /* 16 MB */
-#undef  DEBUG
-#define CFG_CONSOLE_INFO_QUIET		/* don't print console @ startup*/
-#define CONFIG_SHOW_BOOT_PROGRESS	/* use LEDs to show boot status*/
-#define CONFIG_SHOW_ACTIVITY
-#define CFG_HUSH_PARSER
-#define CFG_PROMPT_HUSH_PS2 "hush>"
 
 #define CONFIG_CARAMBOLA_FACTORY_MODE
 #define CFG_C2_IMG_LOAD_ADDR		"0x80F00000"
diff --git a/u-boot/include/configs/common.h b/u-boot/include/configs/common.h
index a630045caa..7259e65145 100644
--- a/u-boot/include/configs/common.h
+++ b/u-boot/include/configs/common.h
@@ -73,6 +73,12 @@
 #define CONFIG_COMMANDS	(( CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET | CFG_CMD_MII))
 #endif /* #ifndef COMPRESSED_UBOOT */
 
+#undef  DEBUG
+#define CFG_CONSOLE_INFO_QUIET		/* don't print console @ startup*/
+#define CONFIG_SHOW_BOOT_PROGRESS	/* use LEDs to show boot status*/
+#define CONFIG_SHOW_ACTIVITY
+#define CFG_HUSH_PARSER
+#define CFG_PROMPT_HUSH_PS2 "hush>"
 
 /* platform specific */
 #define ARCH_DMA_MINALIGN 		4*1024 // 4kb in datasheet
diff --git a/u-boot/include/configs/skylab.h b/u-boot/include/configs/skylab.h
index 239937f2fe..444c4a351e 100644
--- a/u-boot/include/configs/skylab.h
+++ b/u-boot/include/configs/skylab.h
@@ -58,12 +58,6 @@
 #define CFG_AG7100_GE0_RMII             1
 
 #define CFG_BOOTM_LEN	(16 << 20) /* 16 MB */
-#undef  DEBUG
-#define CFG_CONSOLE_INFO_QUIET		/* don't print console @ startup*/
-#define CONFIG_SHOW_BOOT_PROGRESS	/* use LEDs to show boot status*/
-#define CONFIG_SHOW_ACTIVITY
-#define CFG_HUSH_PARSER
-#define CFG_PROMPT_HUSH_PS2 "hush>"
 
 #define CONFIG_CARAMBOLA_FACTORY_MODE
 #define CFG_C2_IMG_LOAD_ADDR		"0x80F00000"