mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-07-27 15:06:29 +00:00
Fix prevent device tree on rpi (#107)
* Fix prevent device tree * Update uboot-boot.sh * Update rauc-hook * Update rauc-hook
This commit is contained in:
parent
ed8f2489e0
commit
38a3af6a8d
@ -11,7 +11,8 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
|
||||
|
||||
# Preserve origin bootargs
|
||||
setenv bootargs_rpi
|
||||
fdt addr ${fdt_addr}
|
||||
setenv fdt_org ${fdt_addr}
|
||||
fdt addr ${fdt_org}
|
||||
fdt get value bootargs_rpi /chosen bootargs
|
||||
|
||||
setenv bootargs
|
||||
@ -35,6 +36,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
|
||||
fi
|
||||
done
|
||||
|
||||
setenv fdt_addr
|
||||
if test -n "${bootargs}"; then
|
||||
saveenv
|
||||
else
|
||||
@ -48,7 +50,7 @@ fi
|
||||
echo "Loading kernel"
|
||||
run load_kernel
|
||||
echo " Starting kernel"
|
||||
booti ${kernel_addr_r} - ${fdt_addr}
|
||||
booti ${kernel_addr_r} - ${fdt_org}
|
||||
|
||||
echo "Fails on boot"
|
||||
reset
|
||||
|
@ -11,7 +11,8 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
|
||||
|
||||
# Preserve origin bootargs
|
||||
setenv bootargs_rpi
|
||||
fdt addr ${fdt_addr}
|
||||
setenv fdt_org ${fdt_addr}
|
||||
fdt addr ${fdt_org}
|
||||
fdt get value bootargs_rpi /chosen bootargs
|
||||
|
||||
setenv bootargs
|
||||
@ -35,6 +36,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
|
||||
fi
|
||||
done
|
||||
|
||||
setenv fdt_addr
|
||||
if test -n "${bootargs}"; then
|
||||
saveenv
|
||||
else
|
||||
@ -48,7 +50,7 @@ fi
|
||||
echo "Loading kernel"
|
||||
run load_kernel
|
||||
echo " Starting kernel"
|
||||
bootz ${kernel_addr_r} - ${fdt_addr}
|
||||
bootz ${kernel_addr_r} - ${fdt_org}
|
||||
|
||||
echo "Fails on boot"
|
||||
reset
|
||||
|
@ -20,4 +20,9 @@ if [ -L /var/lib/systemd/timesync ]; then
|
||||
rm -f /var/lib/systemd/timesync
|
||||
fi
|
||||
|
||||
# u-boot first stage device tree
|
||||
if [ -e /usr/sbin/fw_setenv ]; then
|
||||
fw_setenv fdt_addr
|
||||
fi
|
||||
|
||||
exit 0
|
||||
|
Loading…
x
Reference in New Issue
Block a user