cyteen
/
sd-card-images
1
0
Fork 0
Code Issues Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

zz-update-uimg: Add more fdt search paths

This commit is contained in:
Johan Gunnarsson 2021-08-12 19:30:09 +02:00
parent f69f58afba
commit 78fe857bcd
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
2nd-stage-files/pre-2nd-stage-files-arm64/etc/initramfs/post-update.d/zz-update-uimg
View File

@ -7,9 +7,14 @@ ABI="${1}"
# Create U-Boot ramdisk image
mkimage -A arm64 -T ramdisk -C none -d "/boot/initrd.img-${ABI}" "/boot/initrd.uimg-${ABI}"
FDT=/usr/lib/linux
[ -d "/lib/firmware/${ABI}/device-tree" ] && FDT="/lib/firmware/${ABI}/device-tree"
[ -d "/usr/lib/linux-image-${ABI}" ] && FDT="/usr/lib/linux-image-${ABI}"
# List of paths to search for fdtfile in
FDT="\
/lib/firmware/${ABI}/device-tree/\${vendor} \
/lib/firmware/${ABI}/device-tree \
/usr/lib/linux-image-${ABI}/\${vendor} \
/usr/lib/linux-image-${ABI} \
/usr/lib/linux/\${vendor} \
/usr/lib/linux"
# Create U-Boot boot script
cat << EOF > /boot/boot.cmd
@ -17,12 +22,13 @@ load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r} /boot/vmlinuz-
load \${devtype} \${devnum}:\${distro_bootpart} \${ramdisk_addr_r} /boot/initrd.uimg-${ABI}
part uuid \${devtype} \${devnum}:\${distro_bootpart} partuuid
setenv bootargs root=PARTUUID=\${partuuid} rw rootwait
if test -e \${devtype} \${devnum}:\${distro_bootpart} ${FDT}/\${fdtfile}; then
load \${devtype} \${devnum}:\${distro_bootpart} \${fdt_addr_r} ${FDT}/\${fdtfile}
booti \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}
else
booti \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr}
fi
for fdtpath in ${FDT}; do
if test -e \${devtype} \${devnum}:\${distro_bootpart} \${fdtpath}/\${fdtfile}; then
load \${devtype} \${devnum}:\${distro_bootpart} \${fdt_addr_r} \${fdtpath}/\${fdtfile}
booti \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}
fi
done
booti \${kernel_addr_r} \${ramdisk_addr_r} \${fdtcontroladdr}
EOF
# Create U-Boot boot script

24
2nd-stage-files/pre-2nd-stage-files-armhf/etc/initramfs/post-update.d/zz-update-uimg
View File

@ -7,9 +7,14 @@ ABI="${1}"
# Create U-Boot ramdisk image
mkimage -A arm -T ramdisk -C none -d "/boot/initrd.img-${ABI}" "/boot/initrd.uimg-${ABI}"
FDT=/usr/lib/linux
[ -d "/lib/firmware/${ABI}/device-tree" ] && FDT="/lib/firmware/${ABI}/device-tree"
[ -d "/usr/lib/linux-image-${ABI}" ] && FDT="/usr/lib/linux-image-${ABI}"
# List of paths to search for fdtfile in
FDT="\
/lib/firmware/${ABI}/device-tree/\${vendor} \
/lib/firmware/${ABI}/device-tree \
/usr/lib/linux-image-${ABI}/\${vendor} \
/usr/lib/linux-image-${ABI} \
/usr/lib/linux/\${vendor} \
/usr/lib/linux"
# Create U-Boot boot script
cat << EOF > /boot/boot.cmd
@ -17,12 +22,13 @@ load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r} /boot/vmlinuz-
load \${devtype} \${devnum}:\${distro_bootpart} \${ramdisk_addr_r} /boot/initrd.uimg-${ABI}
part uuid \${devtype} \${devnum}:\${distro_bootpart} partuuid
setenv bootargs root=PARTUUID=\${partuuid} rw rootwait
if test -e \${devtype} \${devnum}:\${distro_bootpart} ${FDT}/\${fdtfile}; then
load \${devtype} \${devnum}:\${distro_bootpart} \${fdt_addr_r} ${FDT}/\${fdtfile}
bootz \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}
else
bootz \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr}
fi
for fdtpath in ${FDT}; do
if test -e \${devtype} \${devnum}:\${distro_bootpart} \${fdtpath}/\${fdtfile}; then
load \${devtype} \${devnum}:\${distro_bootpart} \${fdt_addr_r} \${fdtpath}/\${fdtfile}
bootz \${kernel_addr_r} \${ramdisk_addr_r} \${fdt_addr_r}
fi
done
bootz \${kernel_addr_r} \${ramdisk_addr_r} \${fdtcontroladdr}
EOF
# Create U-Boot boot script