diff --git a/config/bootenv/udoo-neo-default.txt b/config/bootenv/udoo-neo-default.txt
new file mode 100644
index 0000000000..f916e3033d
--- /dev/null
+++ b/config/bootenv/udoo-neo-default.txt
@@ -0,0 +1,33 @@
+#fdt_file=imx6sx-udoo-neo-basic.dtb
+#fdt_file=imx6sx-udoo-neo-basic-hdmi.dtb
+#fdt_file=imx6sx-udoo-neo-basic-hdmi-m4.dtb
+#fdt_file=imx6sx-udoo-neo-basicks.dtb
+#fdt_file=imx6sx-udoo-neo-basicks-hdmi.dtb
+#fdt_file=imx6sx-udoo-neo-basicks-hdmi-m4.dtb
+#fdt_file=imx6sx-udoo-neo-basicks-lvds15.dtb
+#fdt_file=imx6sx-udoo-neo-basicks-lvds15-m4.dtb
+#fdt_file=imx6sx-udoo-neo-basicks-lvds7.dtb
+#fdt_file=imx6sx-udoo-neo-basicks-lvds7-m4.dtb
+#fdt_file=imx6sx-udoo-neo-basicks-m4.dtb
+#fdt_file=imx6sx-udoo-neo-basic-lvds15.dtb
+#fdt_file=imx6sx-udoo-neo-basic-lvds15-m4.dtb
+#fdt_file=imx6sx-udoo-neo-basic-lvds7.dtb
+#fdt_file=imx6sx-udoo-neo-basic-lvds7-m4.dtb
+#fdt_file=imx6sx-udoo-neo-basic-m4.dtb
+#fdt_file=imx6sx-udoo-neo-extended.dtb
+#fdt_file=imx6sx-udoo-neo-extended-hdmi.dtb
+#fdt_file=imx6sx-udoo-neo-extended-hdmi-m4.dtb
+#fdt_file=imx6sx-udoo-neo-extended-lvds15.dtb
+#fdt_file=imx6sx-udoo-neo-extended-lvds15-m4.dtb
+#fdt_file=imx6sx-udoo-neo-extended-lvds7.dtb
+#fdt_file=imx6sx-udoo-neo-extended-lvds7-m4.dtb
+#fdt_file=imx6sx-udoo-neo-extended-m4.dtb
+#fdt_file=imx6sx-udoo-neo-full.dtb
+#fdt_file=imx6sx-udoo-neo-full-hdmi.dtb
+#fdt_file=imx6sx-udoo-neo-full-hdmi-m4.dtb
+#fdt_file=imx6sx-udoo-neo-full-lvds15.dtb
+#fdt_file=imx6sx-udoo-neo-full-lvds15-m4.dtb
+#fdt_file=imx6sx-udoo-neo-full-lvds7.dtb
+#fdt_file=imx6sx-udoo-neo-full-lvds7-m4.dtb
+#fdt_file=imx6sx-udoo-neo-full-m4.dtb
+verbosity=1
diff --git a/config/bootscripts/boot-udoo-neo.cmd b/config/bootscripts/boot-udoo-neo.cmd
index 206094ec8f..136770392c 100644
--- a/config/bootscripts/boot-udoo-neo.cmd
+++ b/config/bootscripts/boot-udoo-neo.cmd
@@ -1,50 +1,37 @@
-
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+# default values
+
+setenv fw_load_addr "0x84000000"
+setenv load_addr "0x80800000"
+setenv ramdisk_addr "0x83800000"
 setenv rootdev "/dev/mmcblk0p1"
-
-# imx6sx-udoo-neo-basic.dtb
-# imx6sx-udoo-neo-basic-hdmi.dtb
-# imx6sx-udoo-neo-basic-hdmi-m4.dtb
-# imx6sx-udoo-neo-basicks.dtb
-# imx6sx-udoo-neo-basicks-hdmi.dtb
-# imx6sx-udoo-neo-basicks-hdmi-m4.dtb
-# imx6sx-udoo-neo-basicks-lvds15.dtb
-# imx6sx-udoo-neo-basicks-lvds15-m4.dtb
-# imx6sx-udoo-neo-basicks-lvds7.dtb
-# imx6sx-udoo-neo-basicks-lvds7-m4.dtb
-# imx6sx-udoo-neo-basicks-m4.dtb
-# imx6sx-udoo-neo-basic-lvds15.dtb
-# imx6sx-udoo-neo-basic-lvds15-m4.dtb
-# imx6sx-udoo-neo-basic-lvds7.dtb
-# imx6sx-udoo-neo-basic-lvds7-m4.dtb
-# imx6sx-udoo-neo-basic-m4.dtb
-# imx6sx-udoo-neo-extended.dtb
-# imx6sx-udoo-neo-extended-hdmi.dtb
-# imx6sx-udoo-neo-extended-hdmi-m4.dtb
-# imx6sx-udoo-neo-extended-lvds15.dtb
-# imx6sx-udoo-neo-extended-lvds15-m4.dtb
-# imx6sx-udoo-neo-extended-lvds7.dtb
-# imx6sx-udoo-neo-extended-lvds7-m4.dtb
-# imx6sx-udoo-neo-extended-m4.dtb
-# imx6sx-udoo-neo-full.dtb
-# imx6sx-udoo-neo-full-hdmi.dtb
-# imx6sx-udoo-neo-full-hdmi-m4.dtb
-# imx6sx-udoo-neo-full-lvds15.dtb
-# imx6sx-udoo-neo-full-lvds15-m4.dtb
-# imx6sx-udoo-neo-full-lvds7.dtb
-# imx6sx-udoo-neo-full-lvds7-m4.dtb
-# imx6sx-udoo-neo-full-m4.dtb
-#
-# Pick one of above:
-#
-
-if test "${board}" = "Neo"; then echo "Booting Neo"; fi
-
+setenv verbosity "1"
+setenv console "both"
+setenv rootfstype "ext4"
 setenv fdt_file imx6sx-udoo-neo-full-m4.dtb
 
-setenv "bootargs root=${rootdev} rootfstype=ext4 rootwait console=ttymxc0,115200 rd.dm=0 rd.luks=0 rd.lvm=0 rw uart_from_osc loglevel=1 ${extraargs}"
-ext2load mmc ${mmcdev}:${mmcpart} 0x84000000 /boot/bin/m4startup.fw
-ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/${image}
+# Print boot source
+echo "Booting from SD"
+
+if ext2load mmc 0 ${load_addr} /boot/armbianEnv.txt || fatload mmc 0 ${load_addr} armbianEnv.txt; then
+	env import -t ${load_addr} ${filesize}
+fi
+
+if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
+if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "${consoleargs} console=ttymxc0,115200"; fi
+
+setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait ${consoleargs} rd.dm=0 rd.luks=0 rd.lvm=0 rw uart_from_osc loglevel=${verbosity} ${extraargs}"
+
+ext2load mmc ${mmcdev}:${mmcpart} ${fw_load_addr} /boot/bin/m4startup.fw
+ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} /boot/zImage
+ext2load mmc ${mmcdev}:${mmcpart} ${ramdisk_addr} /boot/uInitrd
 ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} /boot/dtb/${fdt_file}
-bootz ${loadaddr} - ${fdt_addr}
-# Recompile: mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr 
-# (c) www.armbian.com
\ No newline at end of file
+
+bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr}
+
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr 
\ No newline at end of file