Compare commits

...

2 Commits

Author SHA1 Message Date
Pratham Patel d7b9b67616
load dtb, unitrd and vmlinuz from second part 2023-10-08 08:11:17 +05:30
Pratham Patel 9b47feb86e
no need to diff 2023-10-08 08:00:24 +05:30
3 changed files with 10 additions and 13 deletions

View File

@ -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

View File

@ -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}

View File

@ -27,6 +27,3 @@ cp "/boot/uInitrd-${UNAME_R}" /boot/uInitrd
mkimage -C none -A arm -T script -d "/boot/efi/boot.cmd-${FULL_VER}" "/boot/efi/boot.scr-${FULL_VER}"
cp "/boot/efi/boot.scr-${FULL_VER}" /boot/efi/boot.scr
diff /opt/opi5-efi/boot.cmd "/boot/efi/boot.cmd-${FULL_VER}" > /boot/diff_boot_cmd || echo "diffed"
diff /opt/opi5-efi/uEnv.txt "/boot/efi/uEnv.txt-${FULL_VER}" > /boot/diff_uenv_txt || echo "diffed"