diff --git a/Makefile b/Makefile
index 2b2dc8e862..a98be87a03 100644
--- a/Makefile
+++ b/Makefile
@@ -27,18 +27,17 @@ export BUILD_TYPE=squashfs
 
 IMAGEPATH=$(BUILD_TOPDIR)/bin
 UBOOT_BINARY=u-boot.bin
-UBOOTFILE=$(BOARD_TYPE)_u-boot.bin
+BOARD_TYPE:=
 
 skylab_config:
-BOARD_TYPE:=skylab
 	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:
-BOARD_TYPE:=carambola2
 	export COMPRESSED_UBOOT=0
 	export FLASH_SIZE=16
 	export NEW_DDR_TAP_CAL=1
@@ -56,10 +55,15 @@ compile:
 
 	@echo Done
 
+carambola2: BOARD_TYPE:= carambola2
+carambola2: UBOOTFILE=$(BOARD_TYPE)_u-boot.bin
 carambola2: carambola2_config compile
+
+skylab: BOARD_TYPE:= skylab
+skylab: UBOOTFILE=$(BOARD_TYPE)_u-boot.bin
 skylab: skylab_config compile
 
-all: carambola2
-	
+all: carambola2 skylab
+
 clean:
 	cd $(UBOOTDIR) && $(MAKECMD) distclean