U-boot will reject the nodes with @ for the address since
commit:
https://gitlab.denx.de/u-boot/u-boot/-/commit/79af75f7776fc20b0d7eb6afe1e27c00fdb4b9b4

This in turn will cause the failure to boot with OpenWrt
generated images.

So, to rectify that simply replace @ with -.

Signed-off-by: Robert Marko <robert.ma...@sartura.hr>
---
 scripts/mkits.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index ecaba8e965..53253bd120 100755
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -81,7 +81,7 @@ fi
 # Conditionally create fdt information
 if [ -n "${DTB}" ]; then
        FDT_NODE="
-               fdt@$FDTNUM {
+               fdt-$FDTNUM {
                        description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device 
tree blob\";
                        ${COMPATIBLE_PROP}
                        data = /incbin/(\"${DTB}\");
@@ -96,7 +96,7 @@ if [ -n "${DTB}" ]; then
                        };
                };
 "
-       FDT_PROP="fdt = \"fdt@$FDTNUM\";"
+       FDT_PROP="fdt = \"fdt-$FDTNUM\";"
 fi
 
 if [ -n "${INITRD}" ]; then
@@ -149,7 +149,7 @@ DATA="/dts-v1/;
        #address-cells = <1>;
 
        images {
-               kernel@1 {
+               kernel-1 {
                        description = \"${ARCH_UPPER} OpenWrt 
Linux-${VERSION}\";
                        data = /incbin/(\"${KERNEL}\");
                        type = \"kernel\";
@@ -174,7 +174,7 @@ ${ROOTFS_NODE}
                default = \"${CONFIG}\";
                ${CONFIG} {
                        description = \"OpenWrt ${DEVICE}\";
-                       kernel = \"kernel@1\";
+                       kernel = \"kernel-1\";
                        ${FDT_PROP}
                        ${LOADABLES:+loadables = ${LOADABLES};}
                        ${COMPATIBLE_PROP}
-- 
2.29.2


_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to