diff --git a/bin/firmware-overlay/rt2870.bin b/bin/firmware-overlay/rt2870.bin new file mode 100644 index 0000000000..9ddac4a4bb Binary files /dev/null and b/bin/firmware-overlay/rt2870.bin differ diff --git a/config/bootenv/udoo-default.txt b/config/bootenv/udoo-default.txt new file mode 100644 index 0000000000..b9bafac335 --- /dev/null +++ b/config/bootenv/udoo-default.txt @@ -0,0 +1 @@ +verbosity=1 diff --git a/config/bootscripts/boot-udoo.cmd b/config/bootscripts/boot-udoo.cmd index ab9d57f58b..7eda98921f 100644 --- a/config/bootscripts/boot-udoo.cmd +++ b/config/bootscripts/boot-udoo.cmd @@ -1,23 +1,44 @@ +# DO NOT EDIT THIS FILE +# +# Please edit /boot/armbianEnv.txt to set supported parameters +# +# default values + +setenv load_addr "0x12000000" +setenv ramdisk_addr "0x14800000" setenv rootdev "/dev/mmcblk0p1" +setenv verbosity "1" +setenv console "both" +setenv disp_mode "1920x1080M60" +setenv rootfstype "ext4" -if ext4load mmc 0 0x00000000 /boot/.verbose -then -setenv verbosity 7 -else -setenv verbosity 1 +# Print boot source +echo "Booting from SD" + +if ext4load mmc 0 ${load_addr} /boot/armbianEnv.txt || fatload mmc 0 ${load_addr} armbianEnv.txt; then + env import -t ${load_addr} ${filesize} fi -setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait console=tty1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 quiet loglevel=1 loglevel=${verbosity} consoleblank=0 ${extraargs}" -if ext4load mmc 0 0x00000000 /boot/.next -then - setenv fdt_file imx6q-udoo.dtb + +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=ttymxc1,115200"; fi + + +setenv bootargs "root=${rootdev} rootfstype=ext4 rootwait ${consoleargs} video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 vt.global_cursor_default=0 loglevel=${verbosity} ${extraargs}" + +ext4load mmc 0 ${ramdisk_addr} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr} uInitrd || ext4load mmc 0 ${ramdisk_addr} uInitrd +ext4load mmc 0 ${loadaddr} /boot/zImage || fatload mmc 0 ${loadaddr} zImage + +if load mmc 0 0x00000000 /boot/.next || load mmc 0 0x00000000 .next; then + setenv fdt_file "imx6q-udoo.dtb" + ext4load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} dtb/${fdt_file} else - setenv fdt_file imx6q-udoo-hdmi.dtb + setenv fdt_file "imx6q-udoo-hdmi.dtb" + ext4load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} dtb/${fdt_file} fi -setenv ramdisk_addr 0x14800000 -ext2load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} dtb/${fdt_file} -ext2load mmc 0 ${ramdisk_addr} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr} uInitrd || ext4load mmc 0 ${ramdisk_addr} uInitrd -ext2load mmc 0 ${loadaddr} /boot/${image} || fatload mmc 0 ${loadaddr} ${image} + bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr} + +# Recompile with: # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr diff --git a/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch b/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch index 49c8bdc8d6..cc38425912 100644 --- a/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch +++ b/patch/kernel/udoo-default/packaging-3.14-DEFAULT-with-postinstall-scripts.patch @@ -160,7 +160,7 @@ index 152d4d2..9b30ad2 100644 +sed -e "s/exit 0//g" -i $tmpdir/DEBIAN/postinst +cat >> $tmpdir/DEBIAN/postinst < /dev/null 2>&1 || mv /$kernel_tmp_version /boot/zImage -+ ++rm -f /boot/.next +exit 0 +EOT +