diff options
Diffstat (limited to 'recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in index b3e15a5..9760ccc 100644 --- a/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in +++ b/recipes-bsp/u-boot/u-boot-distro-boot/boot.cmd.in @@ -67,36 +67,38 @@ if test "${root_devtype}" = ""; then fi fi -if test -n ${setup}; then - run setup -else - env set setupargs 'console=${console},${baudrate} console=tty1 consoleblank=0' -fi +env set appendargs @@APPEND@@ +env set setupargs console=tty1 console=${console},${baudrate} -if test ${kernel_image} = "Image.gz" -then - env set kernel_addr_load ${loadaddr} - env set bootcmd_unzip 'unzip ${kernel_addr_load} ${kernel_addr_r}' -else +if test ${kernel_image} = "fitImage"; then + env set kernel_addr_load ${ramdisk_addr_r} env set bootcmd_unzip ';' - if test ${kernel_image} = "fitImage" - then - env set kernel_addr_load ${ramdisk_addr_r} +else + if test -n ${kernel_comp_addr_r}; then + # use booti automatic decompression + env set kernel_addr_load ${loadaddr} + env set bootcmd_unzip ';' else - env set kernel_addr_load ${kernel_addr_r} + if test ${kernel_image} = "Image.gz"; then + env set kernel_addr_load ${loadaddr} + env set bootcmd_unzip 'unzip ${kernel_addr_load} ${kernel_addr_r}' + else + env set kernel_addr_load ${kernel_addr_r} + env set bootcmd_unzip ';' + fi fi fi # Set dynamic commands env set set_bootcmd_kernel 'env set bootcmd_kernel "${load_cmd} \\${kernel_addr_load} \\${kernel_image}"' -env set set_load_overlays_file 'env set load_overlays_file "${load_cmd} \\${loadaddr} \\${overlays_file}; env import -t \\${loadaddr} \\${filesize}"' +env set set_load_overlays_file 'env set load_overlays_file "${load_cmd} \\${loadaddr} \\${overlays_file} && env import -t \\${loadaddr} \\${filesize}"' if test ${kernel_image} = "fitImage" then env set fdt_high env set fdt_resize true env set set_bootcmd_dtb 'env set bootcmd_dtb "true"' - env set set_apply_overlays 'env set apply_overlays "for overlay_file in \"\\${fdt_overlays}\"; do env set fitconf_fdt_overlays \"\\"\\${fitconf_fdt_overlays}#conf@\\${overlay_file}\\"\"; env set overlay_file; done; true"' - env set bootcmd_boot 'echo "Bootargs: \${bootargs}" && @@KERNEL_BOOTCMD@@ ${ramdisk_addr_r}#conf@\${fdtfile}\${fitconf_fdt_overlays}' + env set set_apply_overlays 'env set apply_overlays "for overlay_file in \"\\${fdt_overlays}\"; do env set fitconf_fdt_overlays \"\\"\\${fitconf_fdt_overlays}#conf-\\${overlay_file}\\"\"; env set overlay_file; done; true"' + env set bootcmd_boot 'echo "Bootargs: \${bootargs}" && bootm ${kernel_addr_load}#conf-@@KERNEL_DTB_PREFIX@@\${fdtfile}\${fitconf_fdt_overlays}' else env set fdt_resize 'fdt addr ${fdt_addr_r} && fdt resize 0x20000' env set set_bootcmd_dtb 'env set bootcmd_dtb "echo Loading DeviceTree: \\${fdtfile}; ${load_cmd} \\${fdt_addr_r} \\${fdtfile}"' @@ -106,17 +108,17 @@ fi # Set static commands if test ${root_devtype} = "nfs-dhcp"; then - env set rootfsargs_set 'env set rootfsargs "root=/dev/nfs ip=dhcp nfsroot=${rootpath}"' + env set rootfsargs_set 'env set rootfsargs "root=/dev/nfs ip=dhcp"' else if test ${root_devtype} = "nfs-static"; then - env set rootfsargs_set 'env set rootfsargs "root=/dev/nfs nfsroot=${serverip}:${rootpath}"' + env set rootfsargs_set 'env set rootfsargs "root=/dev/nfs nfsroot=${serverip}:/${rootpath}"' else env set uuid_set 'part uuid ${root_devtype} ${root_devnum}:${root_part} uuid' env set rootfsargs_set 'run uuid_set && env set rootfsargs root=PARTUUID=${uuid} ro rootwait' fi fi -env set bootcmd_args 'run rootfsargs_set && env set bootargs ${defargs} ${rootfsargs} ${setupargs} ${vidargs} ${tdxargs}' +env set bootcmd_args 'run rootfsargs_set && env set bootargs ${rootfsargs} ${setupargs} ${appendargs} ${tdxargs}' if test ${skip_fdt_overlays} != 1; then env set bootcmd_overlays 'run load_overlays_file && run fdt_resize && run apply_overlays' else |