diff --git a/board_configs.sh b/board_configs.sh
index 60556c758..93ffb49c4 100755
--- a/board_configs.sh
+++ b/board_configs.sh
@@ -20,6 +20,30 @@ case ${BOARD} in
 		export CROSS_COMPILE=aarch64-linux-gnu-
 		CHIP="rk3399"
 		;;
+	"rock960ab")
+		DEFCONFIG=rockchip_linux_defconfig
+		UBOOT_DEFCONFIG=evb-rk3399_defconfig
+		DTB=rock960-model-ab-linux.dtb
+		export ARCH=arm64
+		export CROSS_COMPILE=aarch64-linux-gnu-
+		CHIP="rk3399"
+		;;
+	"rock960c")
+		DEFCONFIG=rockchip_linux_defconfig
+		UBOOT_DEFCONFIG=evb-rk3399_defconfig
+		DTB=rock960-model-c-linux.dtb
+		export ARCH=arm64
+		export CROSS_COMPILE=aarch64-linux-gnu-
+		CHIP="rk3399"
+		;;
+	"ficus")
+		DEFCONFIG=rockchip_linux_defconfig
+		UBOOT_DEFCONFIG=evb-rk3399_defconfig
+		DTB=ficus-linux.dtb
+		export ARCH=arm64
+		export CROSS_COMPILE=aarch64-linux-gnu-
+		CHIP="rk3399"
+		;;
 	"rk3399-firefly")
 		DEFCONFIG=rockchip_linux_defconfig
 		UBOOT_DEFCONFIG=firefly-rk3399_defconfig
diff --git a/extlinux/rk3399.conf b/extlinux/rk3399.conf
index 1c826e2a5..cc7cebb91 100644
--- a/extlinux/rk3399.conf
+++ b/extlinux/rk3399.conf
@@ -1,4 +1,4 @@
 label kernel-4.4
     kernel /Image
-    fdt /rk3399-sapphire-excavator-linux.dtb
+    fdt /rock960-model-ab-linux.dtb
     append  earlyprintk console=ttyFIQ0,1500000n8 rw root=PARTUUID=b921b045-1d rootfstype=ext4 init=/sbin/init rootwait
diff --git a/mk-kernel.sh b/mk-kernel.sh
index 13b5d55f3..0af88f7c7 100755
--- a/mk-kernel.sh
+++ b/mk-kernel.sh
@@ -27,10 +27,10 @@ if [ $? -ne 0 ]; then
 fi
 
 echo -e "\e[36m Building kernel for ${BOARD} board! \e[0m"
-echo -e "\e[36m Using ${DEFCONFIG} \e[0m"
 
 cd ${LOCALPATH}/kernel
-make ${DEFCONFIG}
+[ ! -e .config ] && echo -e "\e[36m Using ${DEFCONFIG} \e[0m" && make ${DEFCONFIG}
+
 make -j8
 cd ${LOCALPATH}
 
diff --git a/mk-uboot.sh b/mk-uboot.sh
index 0447461ab..a1b8ff6af 100755
--- a/mk-uboot.sh
+++ b/mk-uboot.sh
@@ -79,10 +79,10 @@ EOF
 elif [ "${CHIP}" == "rk3399" ]; then
 	$TOOLPATH/loaderimage --pack --uboot ./u-boot-dtb.bin uboot.img 0x200000
 
-	tools/mkimage -n rk3399 -T rksd -d ../rkbin/rk33/rk3399_ddr_800MHz_v1.08.bin idbloader.img
-	cat ../rkbin/rk33/rk3399_miniloader_v1.06.bin >> idbloader.img
+	tools/mkimage -n rk3399 -T rksd -d ../rkbin/bin/rk33/rk3399_ddr_800MHz_v1.12.bin idbloader.img
+	cat ../rkbin/bin/rk33/rk3399_miniloader_v1.12.bin >> idbloader.img
 	cp idbloader.img ${OUT}/u-boot/
-	cp ../rkbin/rk33/rk3399_loader_v1.08.106.bin ${OUT}/u-boot/
+	cp ../rkbin/bin/rk33/rk3399_loader_v1.12.112.bin ${OUT}/u-boot/
 
 	cat >trust.ini <<EOF
 [VERSION]
@@ -92,7 +92,7 @@ MINOR=0
 SEC=0
 [BL31_OPTION]
 SEC=1
-PATH=../rkbin/rk33/rk3399_bl31_v1.00.elf
+PATH=../rkbin/bin/rk33/rk3399_bl31_v1.17.elf
 ADDR=0x10000
 [BL32_OPTION]
 SEC=0