Changes between Version 21 and Version 22 of ventana/ubuntu

Timestamp:

10/24/2018 03:36:53 PM (6 years ago)

Author:

Tim Harvey

Comment:

update bootscript to include mmc/sata and avoid dependence on bootloader bootscript

ventana/ubuntu

@@ -378 +378 @@
 cat << EOF > /tmp/bootscript
 
+# the following env vars are assumed to be set:
+#  dtype - nand|usb|mmc|sata
+#  loadaddr - memory address for loading blobs
+#  video - optional kernel cmdline args
+#  extra - optional kernel cmdline args
+#  fixfdt - optional script to execute prior to bootm
+#
+
+echo "Gateworks Ubuntu Bootscript v1.10"
+
 # calculate load addresses based off of loadaddr as the base
 # and allow 128KB for FDT and 64MB for kernel
@@ -384 +394 @@
 setexpr rd_addr \$linux_addr + 0x4000000 # allow 64MB for kernel
 
-# if nand|usb dtype use initrd - sata|mmc don't require initrd
+# setup root and load options based on dev type
 if itest.s "x\${dtype}" == "xnand" ; then
   echo "Booting from NAND/ubifs..."
-  setenv bootargs "console=\${console},\${baudrate} root=ubi0:rootfs rootfstype=ubifs rootwait \${video} \${extra}"
-  ubifsload \$fdt_addr boot/\$fdt_file ||
-  ubifsload \$fdt_addr boot/\$fdt_file1 ||
-  ubifsload \$fdt_addr boot/\$fdt_file2
-  test -n "\$fixfdt" && run fixfdt
-  ubifsload \$linux_addr boot/uImage
-  ubifsload \$rd_addr boot/uramdisk
+  setenv root "root=ubi0:rootfs rootfstype=ubifs rootwait"
+  setenv fsload "ubifsload"
+elif itest.s "x\${dtype}" == "xmmc" ; then
+  echo "Booting from MMC..."
+  setenv root "root=/dev/mmcblk0p1 rootwait"
+  setenv fsload "ext4load \$dtype 0:1"
+  setenv rd_addr # ramdisk not needed for IMX6 MMC
+elif itest.s "x\${dtype}" == "xusb" ; then
+  echo "Booting from USB Mass Storage..."
+  setenv root "root=/dev/sda1 rootwait"
+  setenv fsload "ext4load \$dtype 0:1"
+elif itest.s "x\${dtype}" == "xsata" ; then
+  echo "Booting from SATA..."
+  setenv root "root=/dev/sda1 rootwait"
+  setenv fsload "ext4load \$dtype 0:1"
+  setenv rd_addr # ramdisk not needed for IMX6 AHCI SATA
+fi
+
+# setup bootargs
+setenv bootargs "console=\${console},\${baudrate} \${root} \${video} \${extra}"
+
+# load fdt/kernel/ramdisk
+echo "Loading FDT..."
+\$fsload \$fdt_addr boot/\$fdt_file ||
+\$fsload \$fdt_addr boot/\$fdt_file1 ||
+\$fsload \$fdt_addr boot/\$fdt_file2
+echo "Loading Kernel..."
+\$fsload \$linux_addr boot/uImage
+if itest.s "x\${rd_addr}" != "x" ; then
+  echo "Loading Ramdisk..."
+  \$fsload \$rd_addr boot/uramdisk
+fi
+if itest.s "x\${dtype}" == "xnand" ; then
   ubifsumount
+fi
+
+# fdt fixup
+test -n "\$fixfdt" && run fixfdt
+
+# boot
+if itest.s "x\${rd_addr}" != "x" ; then
+  echo "Booting ramdisk with "\$bootargs"..."
   bootm \$linux_addr \$rd_addr \$fdt_addr
-elif itest.s "x\${dtype}" == "xusb" ; then
-  echo "Booting from usb..."
-  setenv bootargs "console=\${console},\${baudrate} root=/dev/sda1  rootwait \${video} \${extra}"
-  ext4load usb 0:1 \$fdt_addr boot/\$fdt_file ||
-  ext4load usb 0:1 \$fdt_addr boot/\$fdt_file1 ||
-  ext4load usb 0:1 \$fdt_addr boot/\$fdt_file2
-  test -n "\$fixfdt" && run fixfdt
-  ext4load usb 0:1 \$linux_addr boot/uImage
-  ext4load usb 0:1 \$rd_addr boot/uramdisk
-  bootm \$linux_addr \$rd_addr \$fdt_addr
+else
+  echo "Booting with "\$bootargs"..."
+  bootm \$linux_addr - \$fdt_addr
 fi
 EOF