diff --git a/boot.cmd b/boot.cmd index 660f3f2..74124a1 100644 --- a/boot.cmd +++ b/boot.cmd @@ -17,8 +17,8 @@ setenvuname_r echo "Boot script loaded from ${devtype} ${devnum}" -if test -e ${devtype} ${devnum} ${prefix}uEnv.txt; then - load ${devtype} ${devnum} ${load_addr} ${prefix}uEnv.txt +if test -e ${devtype} ${devnum} uEnv.txt; then + load ${devtype} ${devnum} ${load_addr} uEnv.txt env import -t ${load_addr} ${filesize} fi @@ -40,36 +40,36 @@ setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi -#load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd -#load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image -load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd-${uname_r} -load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}vmlinuz-${uname_r} +#load ${devtype} ${devnum}:2 ${ramdisk_addr_r} uInitrd +#load ${devtype} ${devnum}:2 ${kernel_addr_r} Image +load ${devtype} ${devnum}:2 ${ramdisk_addr_r} uInitrd-${uname_r} +load ${devtype} ${devnum}:2 ${kernel_addr_r} vmlinuz-${uname_r} -load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb-${uname_r}/${fdtfile} +load ${devtype} ${devnum}:2 ${fdt_addr_r} dtb-${uname_r}/${fdtfile} fdt addr ${fdt_addr_r} fdt resize 65536 for overlay_file in ${overlays}; do - if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb-${uname_r}/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then + if load ${devtype} ${devnum}:2 ${load_addr} dtb-${uname_r}/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}:2 ${load_addr} 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-${uname_r}/${fdtfile} + load ${devtype} ${devnum}:2 ${fdt_addr_r} dtb-${uname_r}/${fdtfile} else - if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb-${uname_r}/rockchip/overlay/${overlay_prefix}-fixup.scr; then + if load ${devtype} ${devnum}:2 ${load_addr} dtb-${uname_r}/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}:2 fixup.scr; then + load ${devtype} ${devnum}:2 ${load_addr} 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 b59ea6d..3c07195 100644 --- a/opi5-efi.spec +++ b/opi5-efi.spec @@ -5,7 +5,7 @@ Name: opi5-efi Version: 0.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Necessary files for booting from vendor U-Boot on Orange Pi 5 License: GPL Provides: %{name}-%{version} diff --git a/post.sh b/post.sh index b004792..3c33f5f 100644 --- a/post.sh +++ b/post.sh @@ -15,6 +15,7 @@ if [ ! -f /boot/.uname ]; then fi if [ ! -f "/boot/initramfs-${UNAME_R}" ]; then + echo "Initramfs not found... regenerating." /sbin/installkernel "${UNAME_R}" "/boot/.vmlinuz-${UNAME_R}-rpm" "/boot/.System.map-${UNAME_R}-rpm" fi