diff --git a/u-boot/include/configs/carambola2.h b/u-boot/include/configs/carambola2.h
index 2ea5024d15..7f8790e8c1 100644
--- a/u-boot/include/configs/carambola2.h
+++ b/u-boot/include/configs/carambola2.h
@@ -31,34 +31,6 @@
 #	error "Invalid flash configuration"
 #endif
 
-#define CFG_FLASH_WORD_SIZE     unsigned short 
-
-/* 
- * We boot from this flash
- */
-#define CFG_FLASH_BASE		    0x9f000000
-
-#ifdef COMPRESSED_UBOOT
-#define BOOTSTRAP_TEXT_BASE         CFG_FLASH_BASE
-#define BOOTSTRAP_CFG_MONITOR_BASE  BOOTSTRAP_TEXT_BASE
-#endif
-
-
-/* 
- * The following #defines are needed to get flash environment right 
- */
-#define	CFG_MONITOR_BASE	TEXT_BASE
-#define	CFG_MONITOR_LEN		(192 << 10)
-
-#undef CONFIG_BOOTARGS
-/* XXX - putting rootfs in last partition results in jffs errors */
-
-/* default mtd partition table */
-#undef MTDPARTS_DEFAULT
-
-#define	CONFIG_BOOTARGS     ""
-#define MTDPARTS_DEFAULT    ""
-
 /* pll and ddr configuration */
 #define CONFIG_40MHZ_XTAL_SUPPORT 1
 #define NEW_DDR_TAP_CAL 1
diff --git a/u-boot/include/configs/common.h b/u-boot/include/configs/common.h
index e3366a5dcb..83d151b203 100644
--- a/u-boot/include/configs/common.h
+++ b/u-boot/include/configs/common.h
@@ -1,4 +1,32 @@
 
+#define CFG_FLASH_WORD_SIZE     unsigned short 
+
+/* 
+ * We boot from this flash
+ */
+#define CFG_FLASH_BASE		    0x9f000000
+
+#ifdef COMPRESSED_UBOOT
+#define BOOTSTRAP_TEXT_BASE         CFG_FLASH_BASE
+#define BOOTSTRAP_CFG_MONITOR_BASE  BOOTSTRAP_TEXT_BASE
+#endif
+
+
+/* 
+ * The following #defines are needed to get flash environment right 
+ */
+#define	CFG_MONITOR_BASE	TEXT_BASE
+#define	CFG_MONITOR_LEN		(192 << 10)
+
+#undef CONFIG_BOOTARGS
+/* XXX - putting rootfs in last partition results in jffs errors */
+
+/* default mtd partition table */
+#undef MTDPARTS_DEFAULT
+
+#define	CONFIG_BOOTARGS     ""
+#define MTDPARTS_DEFAULT    ""
+
 /* 
  * timeout values are in ticks 
  */
diff --git a/u-boot/include/configs/skylab.h b/u-boot/include/configs/skylab.h
index cc34453187..4feb3cc62e 100644
--- a/u-boot/include/configs/skylab.h
+++ b/u-boot/include/configs/skylab.h
@@ -31,34 +31,6 @@
 #	error "Invalid flash configuration"
 #endif
 
-#define CFG_FLASH_WORD_SIZE     unsigned short 
-
-/* 
- * We boot from this flash
- */
-#define CFG_FLASH_BASE		    0x9f000000
-
-#ifdef COMPRESSED_UBOOT
-#define BOOTSTRAP_TEXT_BASE         CFG_FLASH_BASE
-#define BOOTSTRAP_CFG_MONITOR_BASE  BOOTSTRAP_TEXT_BASE
-#endif
-
-
-/* 
- * The following #defines are needed to get flash environment right 
- */
-#define	CFG_MONITOR_BASE	TEXT_BASE
-#define	CFG_MONITOR_LEN		(192 << 10)
-
-#undef CONFIG_BOOTARGS
-/* XXX - putting rootfs in last partition results in jffs errors */
-
-/* default mtd partition table */
-#undef MTDPARTS_DEFAULT
-
-#define	CONFIG_BOOTARGS     ""
-#define MTDPARTS_DEFAULT    ""
-
 /* pll and ddr configuration */
 #define NEW_DDR_TAP_CAL 1