diff --git a/06_generate_debian_console_root.sh b/06_generate_debian_console_root.sh
index c9ca373..40c2e67 100755
--- a/06_generate_debian_console_root.sh
+++ b/06_generate_debian_console_root.sh
@@ -37,15 +37,17 @@ tar xfp ./deploy/debian-sid-console-riscv64-${datestamp}/riscv64-rootfs-*.tar -C
 sync
 
 mkdir -p ./deploy/input/ || true
+cp -v ./deploy/boot.scr deploy/input/
+
 echo "label Linux eMMC" > ./deploy/input/extlinux.conf
 echo "    kernel /Image" >> ./deploy/input/extlinux.conf
 #echo "    append root=/dev/mmcblk0p3 ro rootfstype=ext4 rootwait console=ttyS0,115200 earlycon uio_pdrv_genirq.of_id=generic-uio net.ifnames=0" >> ./deploy/input/extlinux.conf
 echo "    fdtdir /" >> ./deploy/input/extlinux.conf
 echo "    fdt /mpfs-beaglev-fire.dtb" >> ./deploy/input/extlinux.conf
-#echo "    #fdtoverlays /overlays/<file>.dtbo" >> ./deploy/input/extlinux.conf
+echo "    #fdtoverlays /overlays/<file>.dtbo" >> ./deploy/input/extlinux.conf
 
-echo "extlinux/extlinux.conf"
-cat ./deploy/input/extlinux.conf
+#echo "extlinux/extlinux.conf"
+#cat ./deploy/input/extlinux.conf
 
 mkdir -p ./ignore/.root/boot/firmware/ || true
 
diff --git a/07_create_sdcard_img.sh b/07_create_sdcard_img.sh
index 4a227b6..ab41ffe 100755
--- a/07_create_sdcard_img.sh
+++ b/07_create_sdcard_img.sh
@@ -25,6 +25,11 @@ if [ -d ./tmp ] ; then
 	rm -rf ./tmp || true
 fi
 
+if [ ! -f ./images/sdcard.img ]; then
+	echo "Error: ./images/sdcard.img was not generated"
+	exit 2
+fi
+
 if [ -f /usr/bin/bmaptool ] ; then
 	if [ -f ./images/sdcard.bmap ] ; then
 		rm -rf ./images/sdcard.bmap || true
diff --git a/deploy/genimage.cfg b/deploy/genimage.cfg
index 3998e29..9ada9da 100644
--- a/deploy/genimage.cfg
+++ b/deploy/genimage.cfg
@@ -4,12 +4,13 @@ image boot.vfat {
 	vfat {
 		files = {
 			"beaglev_fire.itb",
+			"boot.scr",
 			"mpfs-beaglev-fire.dtb",
 			"Image"
 		}
-		file extlinux/extlinux.conf {
-			image = extlinux.conf
-		}
+		#file extlinux/extlinux.conf {
+		#	image = extlinux.conf
+		#}
 	}
 
 	size = 60M
diff --git a/patches/u-boot/beaglev-fire/microchip_mpfs_icicle.h b/patches/u-boot/beaglev-fire/microchip_mpfs_icicle.h
index f208d5a..9ef5425 100644
--- a/patches/u-boot/beaglev-fire/microchip_mpfs_icicle.h
+++ b/patches/u-boot/beaglev-fire/microchip_mpfs_icicle.h
@@ -70,11 +70,7 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x10000000\0" \
-	"kernel_addr_r=0x80200000\0" \
-	"fdt_addr_r=0x8a000000\0" \
-	"scriptaddr=0x88100000\0" \
-	"pxefile_addr_r=0x88200000\0" \
-	"ramdisk_addr_r=0x88300000\0" \
+	"scriptaddr=0x8e000000\0" \
 	BOOTENV_DESIGN_OVERLAYS \
 	BOOTENV \