diff --git a/FunKey/board/funkey/boot.cmd b/FunKey/board/funkey/boot.cmd
deleted file mode 100644
index 79e1bdd..0000000
--- a/FunKey/board/funkey/boot.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-setenv bootargs console=ttyS0,115200 panic=5 rootwait fbcon=map:10 fbcon=font:VGA8x8 vt.global_cursor_default=0 root=/dev/mmcblk0p3 rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet
-load mmc 0:1 0x41000000 uImage
-load mmc 0:1 0x41800000 sun8i-v3s-funkey.dtb
-bootm 0x41000000 - 0x41800000
diff --git a/FunKey/board/funkey/boot_alt.cmd b/FunKey/board/funkey/boot_alt.cmd
deleted file mode 100644
index e7df9bf..0000000
--- a/FunKey/board/funkey/boot_alt.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-setenv bootargs console=ttyS0,115200 panic=5 rootwait fbcon=map:10 fbcon=font:VGA8x8 vt.global_cursor_default=0 root=/dev/mmcblk0p4 rootfstype=ext4 rootflags=commit=120,data=writeback,barrier=0,journal_async_commit rw quiet
-load mmc 0:2 0x41000000 uImage
-load mmc 0:2 0x41800000 sun8i-v3s-funkey.dtb
-bootm 0x41000000 - 0x41800000
diff --git a/FunKey/board/funkey/genimage.cfg b/FunKey/board/funkey/genimage.cfg
index d980c4f..517ed3b 100644
--- a/FunKey/board/funkey/genimage.cfg
+++ b/FunKey/board/funkey/genimage.cfg
@@ -3,7 +3,6 @@ image boot.vfat {
 		files = {
 			"uImage",
 			"sun8i-v3s-funkey.dtb",
-			"boot.scr"
 		}
 	}
 	size = 8M
@@ -14,7 +13,6 @@ image boot_alt.vfat {
 		files = {
 			"uImage",
 			"sun8i-v3s-funkey.dtb",
-			"boot_alt.scr"
 		}
 	}
 	size = 8M
diff --git a/FunKey/board/funkey/post-build.sh b/FunKey/board/funkey/post-build.sh
index ed51cc2..57f26e1 100755
--- a/FunKey/board/funkey/post-build.sh
+++ b/FunKey/board/funkey/post-build.sh
@@ -13,6 +13,3 @@ rm -f ${TARGET_DIR}/etc/init.d/S01syslogd ${TARGET_DIR}/etc/init.d/S02klogd
 
 # Change dropbear init sequence
 mv ${TARGET_DIR}/etc/init.d/S50dropbear ${TARGET_DIR}/etc/init.d/S42dropbear
-
-# Generate alternate U-Boot boot script
-${HOST_DIR}/bin/mkimage -C none -A arm -T script -d ${BR2_EXTERNAL_FUNKEY_PATH}/board/funkey/boot_alt.cmd ${BINARIES_DIR}/boot_alt.scr
diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index 0802cd0..ce989cc 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -84,8 +84,7 @@ BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/ub
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
-BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS=y