mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
Allow oDroid-N2 to boot if first partition mounted as root by uBoot (#2158)
This commit is contained in:
@@ -115,7 +115,7 @@ if test "${hdmimode}" = "custombuilt"; then setenv cmode "modeline=${modeline}";
|
||||
if ext4load mmc ${devno}:1 0x44000000 /boot/armbianEnv.txt || fatload mmc ${devno}:1 0x44000000 armbianEnv.txt || ext4load mmc ${devno}:1 0x44000000 armbianEnv.txt; then env import -t 0x44000000 ${filesize}; fi
|
||||
|
||||
# Boot Args
|
||||
setenv bootargs "root=${rootdev} rootwait rootflags=data=writeback rw rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} ${bootsplash} cvbscable=${cvbscable} overscan=${overscan} consoleblank=0"
|
||||
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${condev} ${amlogic} no_console_suspend fsck.repair=yes net.ifnames=0 elevator=noop hdmimode=${hdmimode} cvbsmode=576cvbs max_freq_a53=${max_freq_a53} max_freq_a73=${max_freq_a73} maxcpus=${maxcpus} voutmode=${voutmode} ${cmode} disablehpd=${disablehpd} ${bootsplash} cvbscable=${cvbscable} overscan=${overscan} consoleblank=0"
|
||||
|
||||
# Set load addresses
|
||||
setenv dtb_loadaddr "0x1000000"
|
||||
@@ -124,17 +124,17 @@ setenv loadaddr "0x1B00000"
|
||||
setenv initrd_loadaddr "0x3700000"
|
||||
|
||||
# Load kernel, dtb and initrd
|
||||
ext4load mmc ${devno}:1 ${k_addr} boot/${kernelimage}
|
||||
ext4load mmc ${devno}:1 ${dtb_loadaddr} boot/dtb/amlogic/${fdtfile}
|
||||
ext4load mmc ${devno}:1 ${initrd_loadaddr} boot/uInitrd
|
||||
ext4load mmc ${devno}:1 ${k_addr} ${kernelimage} || ext4load mmc ${devno}:1 ${k_addr} boot/${kernelimage}
|
||||
ext4load mmc ${devno}:1 ${dtb_loadaddr} dtb/amlogic/${fdtfile} || ext4load mmc ${devno}:1 ${dtb_loadaddr} boot/dtb/amlogic/${fdtfile}
|
||||
ext4load mmc ${devno}:1 ${initrd_loadaddr} uInitrd || ext4load mmc ${devno}:1 ${initrd_loadaddr} boot/uInitrd
|
||||
|
||||
if test "${kernelimage}" = "zImage"; then
|
||||
fdt addr ${dtb_loadaddr}
|
||||
# unzip the kernel
|
||||
unzip ${k_addr} ${loadaddr}
|
||||
# boot legacy kernel
|
||||
booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}
|
||||
fdt addr ${dtb_loadaddr}
|
||||
# unzip the kernel
|
||||
unzip ${k_addr} ${loadaddr}
|
||||
# boot legacy kernel
|
||||
booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}
|
||||
else
|
||||
# boot mainline kernel
|
||||
bootm ${k_addr} ${initrd_loadaddr} ${dtb_loadaddr}
|
||||
# boot mainline kernel
|
||||
bootm ${k_addr} ${initrd_loadaddr} ${dtb_loadaddr}
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user