diff --git a/Makefile b/Makefile
index a98be87a03..f4136d5815 100644
--- a/Makefile
+++ b/Makefile
@@ -31,18 +31,10 @@ BOARD_TYPE:=
 
 skylab_config:
 	export COMPRESSED_UBOOT=0
-	export FLASH_SIZE=8
-	export NEW_DDR_TAP_CAL=1
-	export CONFIG_HORNET_1_1_WAR=1
-	export CONFIG_HORNET_XTAL=25
 	export CARABOOT_RELEASE=v2.2-dev
 
 carambola2_config:
 	export COMPRESSED_UBOOT=0
-	export FLASH_SIZE=16
-	export NEW_DDR_TAP_CAL=1
-	export CONFIG_HORNET_XTAL=40
-	export CONFIG_HORNET_1_1_WAR=1
 	export CARABOOT_RELEASE=v2.2-dev
 
 compile:
diff --git a/u-boot/Makefile b/u-boot/Makefile
index 2a521c6a18..c9ad10f216 100644
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -272,33 +272,19 @@ unconfig:
 #========================================================================
 
 carambola2_config: unconfig hornet_common_config
-	@echo "#define FLASH_SIZE $(FLASH_SIZE)" >>include/config.h
 	@echo "#define CARABOOT_RELEASE \"$(CARABOOT_RELEASE)\"" >>include/config.h
 	@./mkconfig -a carambola2 mips mips carambola2 ar7240 ar7240
 
 skylab_config: unconfig hornet_common_config
-	@echo "#define FLASH_SIZE $(FLASH_SIZE)" >>include/config.h
 	@echo "#define CARABOOT_RELEASE \"$(CARABOOT_RELEASE)\"" >>include/config.h
 	@./mkconfig -a skylab mips mips carambola2 ar7240 ar7240
 
 
 hornet_common_config        :
 	@ >include/config.h
-	@echo "#define CONFIG_AR7240 1" >>include/config.h
-	@echo "#define CONFIG_MACH_HORNET 1" >>include/config.h
-ifeq ($(CONFIG_HORNET_XTAL), 40)
-	@echo "#define CONFIG_40MHZ_XTAL_SUPPORT 1" >>include/config.h
-endif
-ifeq ($(CONFIG_HORNET_1_1_WAR), 1)
-	@echo "#define CONFIG_HORNET_1_1_WAR 1" >>include/config.h
-endif
 ifeq ($(AG7240_BROADCAST_ENABLE), 1)
 	@echo "#define AG7240_BROADCAST_ENABLE 1" >>include/config.h
 endif
-ifeq ($(NEW_DDR_TAP_CAL), 1)
-	@echo "#define NEW_DDR_TAP_CAL 1" >>include/config.h
-endif
-
 
 ###############
 
diff --git a/u-boot/include/configs/carambola2.h b/u-boot/include/configs/carambola2.h
index 2b0935d32c..06d0913797 100644
--- a/u-boot/include/configs/carambola2.h
+++ b/u-boot/include/configs/carambola2.h
@@ -8,6 +8,13 @@
 #include <configs/ar7240.h>
 #include <config.h>
 
+#define FLASH_SIZE 16
+#define CONFIG_AR7240 1
+#define CONFIG_MACH_HORNET 1
+#define CONFIG_40MHZ_XTAL_SUPPORT 1
+#define CONFIG_HORNET_1_1_WAR 1
+#define NEW_DDR_TAP_CAL 1
+
 /* enable watchdog */
 #define CONFIG_HW_WATCHDOG
 
diff --git a/u-boot/include/configs/skylab.h b/u-boot/include/configs/skylab.h
index 5741dc9ae4..8d6649edba 100644
--- a/u-boot/include/configs/skylab.h
+++ b/u-boot/include/configs/skylab.h
@@ -8,6 +8,12 @@
 #include <configs/ar7240.h>
 #include <config.h>
 
+#define FLASH_SIZE 8
+#define CONFIG_AR7240 1
+#define CONFIG_MACH_HORNET 1
+#define CONFIG_HORNET_1_1_WAR 1
+#define NEW_DDR_TAP_CAL 1
+
 /* enable watchdog */
 #define CONFIG_HW_WATCHDOG