jeans/operating-system
jeans/operating-system
1
0
Fork 0
mirror of https://github.com/home-assistant/operating-system.git synced 2025-07-28 07:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix prevent device tree on rpi (#107)

Browse Source 
* Fix prevent device tree

* Update uboot-boot.sh

* Update rauc-hook

* Update rauc-hook
This commit is contained in:
Pascal Vizeli 2018-07-15 21:40:28 +02:00 committed by Pascal Vizeli
parent ed8f2489e0
commit 38a3af6a8d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildroot-external/board/raspberrypi/rpi3-64/uboot-boot.sh
View File

@ -11,7 +11,8 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
# Preserve origin bootargs # Preserve origin bootargs
setenv bootargs_rpi setenv bootargs_rpi
fdt addr ${fdt_addr} setenv fdt_org ${fdt_addr}
fdt addr ${fdt_org}
fdt get value bootargs_rpi /chosen bootargs fdt get value bootargs_rpi /chosen bootargs
setenv bootargs setenv bootargs
@ -35,6 +36,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
fi fi
done done
setenv fdt_addr
if test -n "${bootargs}"; then if test -n "${bootargs}"; then
saveenv saveenv
else else
@ -48,7 +50,7 @@ fi
echo "Loading kernel" echo "Loading kernel"
run load_kernel run load_kernel
echo " Starting kernel" echo " Starting kernel"
booti ${kernel_addr_r} - ${fdt_addr} booti ${kernel_addr_r} - ${fdt_org}
echo "Fails on boot" echo "Fails on boot"
reset reset

6
buildroot-external/board/raspberrypi/uboot-boot.sh
View File

@ -11,7 +11,8 @@ setenv bootargs_b "root=PARTUUID=a3ec664e-32ce-4665-95ea-7ae90ce9aa20 rootfstype
# Preserve origin bootargs # Preserve origin bootargs
setenv bootargs_rpi setenv bootargs_rpi
fdt addr ${fdt_addr} setenv fdt_org ${fdt_addr}
fdt addr ${fdt_org}
fdt get value bootargs_rpi /chosen bootargs fdt get value bootargs_rpi /chosen bootargs
setenv bootargs setenv bootargs
@ -35,6 +36,7 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
fi fi
done done
setenv fdt_addr
if test -n "${bootargs}"; then if test -n "${bootargs}"; then
saveenv saveenv
else else
@ -48,7 +50,7 @@ fi
echo "Loading kernel" echo "Loading kernel"
run load_kernel run load_kernel
echo " Starting kernel" echo " Starting kernel"
bootz ${kernel_addr_r} - ${fdt_addr} bootz ${kernel_addr_r} - ${fdt_org}
echo "Fails on boot" echo "Fails on boot"
reset reset

5
buildroot-external/misc/rauc-hook
View File

@ -20,4 +20,9 @@ if [ -L /var/lib/systemd/timesync ]; then
rm -f /var/lib/systemd/timesync rm -f /var/lib/systemd/timesync
fi fi
# u-boot first stage device tree
if [ -e /usr/sbin/fw_setenv ]; then
fw_setenv fdt_addr
fi
exit 0 exit 0