diff --git a/config/bootscripts/boot-cubox.cmd b/config/bootscripts/boot-cubox.cmd index 92a222bc9c..ea1e876ab7 100644 --- a/config/bootscripts/boot-cubox.cmd +++ b/config/bootscripts/boot-cubox.cmd @@ -10,6 +10,7 @@ run autodetectfdt setenv rootdev "/dev/mmcblk0p1" setenv verbosity "1" setenv console "display" +setenv rootfstype "ext4" setenv disp_mode "1920x1080m60" # additional values @@ -28,7 +29,7 @@ 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} video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi vt.global_cursor_default=0 loglevel=${verbosity} ${extraargs}" +setenv bootargs "root=${rootdev} rootfstype=${rootfstype} rootwait ${consoleargs} consoleblank=0 video=mxcfb0:dev=hdmi,${disp_mode},if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi vt.global_cursor_default=0 loglevel=${verbosity} ${extraargs}" ext2load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} /dtb/${fdt_file} || ext2load mmc 0 ${fdt_addr} /dtb/${fdt_file} ext2load mmc 0 ${ramdisk_addr} /boot/uInitrd || fatload mmc 0 ${ramdisk_addr} uInitrd || ext2load mmc 0 ${ramdisk_addr} uInitrd ext2load mmc 0 ${loadaddr} /boot/zImage || fatload mmc 0 ${loadaddr} zImage || ext2load mmc 0 ${loadaddr} zImage diff --git a/config/bootscripts/boot-odroid-c1.ini b/config/bootscripts/boot-odroid-c1.ini index 818d45ba76..473a8cc546 100644 --- a/config/bootscripts/boot-odroid-c1.ini +++ b/config/bootscripts/boot-odroid-c1.ini @@ -1,6 +1,7 @@ ODROIDC-UBOOT-CONFIG setenv rootdev "/dev/mmcblk0p1" +setenv rootfstype "ext4" # Possible screen resolutions # Uncomment only a single Line! The line with setenv written. @@ -80,7 +81,7 @@ if test "${hpd}" = "0"; then setenv hdmi_hpd "disablehpd=true"; fi if test "${cec}" = "1"; then setenv hdmi_cec "hdmitx=cecf"; fi # Boot Arguments -setenv bootargs "root=${rootdev} rootwait ro ${condev} loglevel=1 no_console_suspend vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac} ${extraargs}" +setenv bootargs "root=${rootdev} rootwait ro ${condev} rootfstype=${rootfstype} loglevel=1 no_console_suspend consoleblank=0 vdaccfg=0xa000 logo=osd1,loaded,0x7900000,720p,full dmfc=3 cvbsmode=576cvbs hdmimode=${m} m_bpp=${m_bpp} vout=${vout_mode} ${disableuhs} ${hdmi_hpd} ${hdmi_cec} ${enabledac} ${extraargs}" # Booting ext4load mmc 0:1 0x21000000 /boot/uImage || fatload mmc 0:1 0x21000000 uImage || ext4load mmc 0:1 0x21000000 uImage diff --git a/config/bootscripts/boot-odroid-c2.ini b/config/bootscripts/boot-odroid-c2.ini index 03ae3d780b..0a960b3ef7 100644 --- a/config/bootscripts/boot-odroid-c2.ini +++ b/config/bootscripts/boot-odroid-c2.ini @@ -1,6 +1,7 @@ ODROIDC2-UBOOT-CONFIG setenv rootdev "/dev/mmcblk0p1" +setenv rootfstype "ext4" # Possible screen resolutions # Uncomment only a single Line! The line with setenv written. @@ -44,7 +45,7 @@ setenv m "1080p60hz" # Progressive 60Hz # setenv m "800x480p60hz" # setenv m "800x600p60hz" # setenv m "1024x600p60hz" -# setenv m "1024x768p60hz" +# setenv m "1024x768p60hz" # setenv m "1280x800p60hz" # setenv m "1280x1024p60hz" # setenv m "1360x768p60hz" @@ -58,7 +59,7 @@ setenv m "1080p60hz" # Progressive 60Hz # setenv m "2560x1600p60hz" # setenv m "2560x1080p60hz" # setenv m "3440x1440p60hz" - + # CEC Enable/Disable setenv cec "cecf" @@ -88,7 +89,7 @@ setenv nographics "0" # CPU Frequency / Cores control ########################################### ### WARNING!!! WARNING!!! WARNING!!! -# Before changing anything here please read the wiki entry: +# Before changing anything here please read the wiki entry: # http://odroid.com/dokuwiki/doku.php?id=en:c2_set_cpu_freq # # MAX CPU's @@ -115,7 +116,7 @@ setenv condev "console=ttyS0,115200n8 console=tty0 consoleblank=0" # on both setenv verbosity "1" # Boot Arguments -setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw ${condev} no_console_suspend hdmimode=${m} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes loglevel=${verbosity} net.ifnames=0 ${extraargs}" +setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} no_console_suspend consoleblank=0 hdmimode=${m} m_bpp=${m_bpp} vout=${vout} fsck.repair=yes loglevel=${verbosity} net.ifnames=0 ${extraargs}" # Booting diff --git a/scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh b/scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh index 30a59a5a3c..779c29044a 100644 --- a/scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh +++ b/scripts/nand-sata-install/usr/lib/nand-sata-install/nand-sata-install.sh @@ -74,7 +74,7 @@ create_armbian() # SD card boot part # UUID=xxx... - sduuid=$(blkid -o export /dev/mmcblk0p1 | grep -w UUID) + sduuid=$(blkid -o export /dev/mmcblk*p1 | grep -w UUID | grep -v "$root_partition_device") # calculate usage and see if it fits on destination USAGE=$(df -BM | grep ^/dev | head -1 | awk '{print $3}' | tr -cd '[0-9]. \n') @@ -222,13 +222,17 @@ create_armbian() [[ -f /boot/boot.ini ]] && sed -e 's,root='"$root_partition"',root='"$satauuid"',g' -i /boot/boot.ini # new boot scripts if [[ -f /boot/armbianEnv.txt ]]; then - sed -e 's,rootdev=.*,rootdev='"$satauuid"',g' -i /boot/armbianEnv.txt - sed -e 's,rootfstype=.*,rootfstype='$choosen_fs',g' -i /boot/armbianEnv.txt + sed -e 's,rootdev=.*,rootdev='"$satauuid"',g' -i /boot/armbianEnv.txt + grep -q '^rootdev' /boot/armbianEnv.txt || echo "rootdev=$satauuid" >> /boot/armbianEnv.txt + sed -e 's,rootfstype=.*,rootfstype='$FilesystemChoosen',g' -i /boot/armbianEnv.txt + grep -q '^rootfstype' /boot/armbianEnv.txt || echo "rootfstype=$FilesystemChoosen" >> /boot/armbianEnv.txt else sed -e 's,setenv rootdev.*,setenv rootdev '"$satauuid"',g' -i /boot/boot.cmd sed -e 's,setenv rootdev.*,setenv rootdev '"$satauuid"',g' -i /boot/boot.ini + sed -e 's,setenv rootfstype=.*,setenv rootfstype='$FilesystemChoosen',g' -i /boot/boot.cmd + sed -e 's,setenv rootfstype=.*,setenv rootfstype='$FilesystemChoosen',g' -i /boot/boot.ini fi - mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr >/dev/null 2>&1 || (echo "Error"; exit 0) + [[ -f /boot/boot.cmd ]] && mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr >/dev/null 2>&1 || (echo "Error"; exit 0) mkdir -p /mnt/rootfs/media/mmc/boot echo "$sduuid /media/mmcboot ext4 ${mountopts[ext4]}" >> /mnt/rootfs/etc/fstab echo "/media/mmcboot/boot /boot none bind 0 0" >> /mnt/rootfs/etc/fstab