diff options
| author | Robert Marko <robert.marko@sartura.hr> | 2021-03-04 12:37:21 +0100 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2021-03-05 15:45:33 +0000 |
| commit | 5ec60cbe9d94b925393bea2a54bdaf062a28fece (patch) | |
| tree | 67b161c087e347f2ccd38044bd6ffc1360b2d959 /scripts | |
| parent | 8d24da14702b8da820bf2e3952d5691f77136018 (diff) | |
| download | upstream-5ec60cbe9d94b925393bea2a54bdaf062a28fece.tar.gz upstream-5ec60cbe9d94b925393bea2a54bdaf062a28fece.tar.bz2 upstream-5ec60cbe9d94b925393bea2a54bdaf062a28fece.zip | |
scripts: mkits.sh: replace @ with - in nodes
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: Daniel Golle <daniel@makrotopia.org>
(cover also newly added rootfs@1 and initrd@1 nodes)
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mkits.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/mkits.sh b/scripts/mkits.sh index ecaba8e965..e5369548d7 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,12 +96,12 @@ if [ -n "${DTB}" ]; then }; }; " - FDT_PROP="fdt = \"fdt@$FDTNUM\";" + FDT_PROP="fdt = \"fdt-$FDTNUM\";" fi if [ -n "${INITRD}" ]; then INITRD_NODE=" - initrd@$INITRDNUM { + initrd-$INITRDNUM { description = \"${ARCH_UPPER} OpenWrt ${DEVICE} initrd\"; ${COMPATIBLE_PROP} data = /incbin/(\"${INITRD}\"); @@ -116,14 +116,14 @@ if [ -n "${INITRD}" ]; then }; }; " - INITRD_PROP="ramdisk=\"initrd@${INITRDNUM}\";" + INITRD_PROP="ramdisk=\"initrd-${INITRDNUM}\";" fi if [ -n "${ROOTFS}" ]; then dd if="${ROOTFS}" of="${ROOTFS}.pagesync" bs=4096 conv=sync ROOTFS_NODE=" - rootfs@$ROOTFSNUM { + rootfs-$ROOTFSNUM { description = \"${ARCH_UPPER} OpenWrt ${DEVICE} rootfs\"; ${COMPATIBLE_PROP} data = /incbin/(\"${ROOTFS}.pagesync\"); @@ -138,7 +138,7 @@ if [ -n "${ROOTFS}" ]; then }; }; " - LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs@${ROOTFSNUM}\"" + LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs-${ROOTFSNUM}\"" fi # Create a default, fully populated DTS file @@ -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} |