diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 2f83e99c3bf1cdbee9386c9335aa68ce3723de90..fb163a4c2d3f0d17f0899f2859e66e9cfa6835f8 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -155,14 +155,17 @@ arm_setup_boot() {
     arm_initrd_addr='0x48000000'
     arm_fdtaddr='0x47000000'
 
+    arm_boot_script=/boot/boot.cmd
+
     case "$dtb" in
         "am"*) arm_loadaddr='0x82000000'
                arm_initrd_addr='0x88080000'
                arm_fdtaddr='0x88000000'
+               arm_boot_script=/boot/uEnv.txt
                ;;
     esac
 
-    cat >> /boot/boot.cmd <<EOF
+    cat >> $arm_boot_script <<EOF
 setenv mmcdev 0
 setenv mmcpart 1
 
@@ -193,8 +196,10 @@ setenv mmcargs setenv bootargs init=/lib/systemd/systemd console=\${console} roo
 run loadfiles; run mmcargs; bootz \${loadaddr} \${initrd_addr}:\${initrd_size} \${fdtaddr}
 EOF
 
-    # Create boot.scr
-    mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
+    if [ "$arm_boot_script" = "/boot/boot.cmd" ]; then
+        # Create boot.scr
+        mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
+    fi
 
     # Copy all DTBs
     mkdir -p /boot/dtbs