diff --git a/boot.cmd b/boot.cmd index 357f45e..935c2ff 100644 --- a/boot.cmd +++ b/boot.cmd @@ -42,34 +42,34 @@ if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgro #load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd #load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image -load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd${unamer} -load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}vmlinuz${unamer} +load ${devtype} ${devnum}:1 ${ramdisk_addr_r} ${prefix}uInitrd${unamer} +load ${devtype} ${devnum}:1 ${kernel_addr_r} ${prefix}vmlinuz${unamer} -load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb${unamer}/${fdtfile} +load ${devtype} ${devnum}:1 ${fdt_addr_r} ${prefix}dtb${unamer}/${fdtfile} fdt addr ${fdt_addr_r} fdt resize 65536 for overlay_file in ${overlays}; do - if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb${unamer}/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then + if load ${devtype} ${devnum}:1 ${load_addr} ${prefix}dtb${unamer}/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo" fdt apply ${load_addr} || setenv overlay_error "true" fi done for overlay_file in ${user_overlays}; do - if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then + if load ${devtype} ${devnum}:1 ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then echo "Applying user provided DT overlay ${overlay_file}.dtbo" fdt apply ${load_addr} || setenv overlay_error "true" fi done if test "${overlay_error}" = "true"; then echo "Error applying DT overlays, restoring original DT" - load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb${unamer}/${fdtfile} + load ${devtype} ${devnum}:1 ${fdt_addr_r} ${prefix}dtb${unamer}/${fdtfile} else - if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb${unamer}/rockchip/overlay/${overlay_prefix}-fixup.scr; then + if load ${devtype} ${devnum}:1 ${load_addr} ${prefix}dtb${unamer}/rockchip/overlay/${overlay_prefix}-fixup.scr; then echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)" source ${load_addr} fi - if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then - load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr + if test -e ${devtype} ${devnum}:1 ${prefix}fixup.scr; then + load ${devtype} ${devnum}:1 ${load_addr} ${prefix}fixup.scr echo "Applying user provided fixup script (fixup.scr)" source ${load_addr} fi diff --git a/opi5-efi.spec b/opi5-efi.spec index 687b5b5..d19773c 100644 --- a/opi5-efi.spec +++ b/opi5-efi.spec @@ -5,7 +5,7 @@ Name: opi5-efi Version: 0.0.4 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Necessary files for booting from vendor U-Boot on Orange Pi 5 License: GPL Provides: %{name}-%{version}