RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scripts: mkits.sh: replace @ with - in nodes 

U-boot will reject the nodes with @ for the address since
commit:
79af75f777

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>
This commit is contained in:
Robert Marko 2021-03-04 12:37:21 +01:00 committed by Daniel Golle
parent 8d24da1470
commit 5ec60cbe9d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/mkits.sh
View File

@ -81,7 +81,7 @@ fi
# Conditionally create fdt information # Conditionally create fdt information
if [ -n "${DTB}" ]; then if [ -n "${DTB}" ]; then
FDT_NODE=" FDT_NODE="
fdt@$FDTNUM { fdt-$FDTNUM {
description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\"; description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
${COMPATIBLE_PROP} ${COMPATIBLE_PROP}
data = /incbin/(\"${DTB}\"); data = /incbin/(\"${DTB}\");
@ -96,12 +96,12 @@ if [ -n "${DTB}" ]; then
}; };
}; };
" "
FDT_PROP="fdt = \"fdt@$FDTNUM\";" FDT_PROP="fdt = \"fdt-$FDTNUM\";"
fi fi
if [ -n "${INITRD}" ]; then if [ -n "${INITRD}" ]; then
INITRD_NODE=" INITRD_NODE="
initrd@$INITRDNUM { initrd-$INITRDNUM {
description = \"${ARCH_UPPER} OpenWrt ${DEVICE} initrd\"; description = \"${ARCH_UPPER} OpenWrt ${DEVICE} initrd\";
${COMPATIBLE_PROP} ${COMPATIBLE_PROP}
data = /incbin/(\"${INITRD}\"); data = /incbin/(\"${INITRD}\");
@ -116,14 +116,14 @@ if [ -n "${INITRD}" ]; then
}; };
}; };
" "
INITRD_PROP="ramdisk=\"initrd@${INITRDNUM}\";" INITRD_PROP="ramdisk=\"initrd-${INITRDNUM}\";"
fi fi
if [ -n "${ROOTFS}" ]; then if [ -n "${ROOTFS}" ]; then
dd if="${ROOTFS}" of="${ROOTFS}.pagesync" bs=4096 conv=sync dd if="${ROOTFS}" of="${ROOTFS}.pagesync" bs=4096 conv=sync
ROOTFS_NODE=" ROOTFS_NODE="
rootfs@$ROOTFSNUM { rootfs-$ROOTFSNUM {
description = \"${ARCH_UPPER} OpenWrt ${DEVICE} rootfs\"; description = \"${ARCH_UPPER} OpenWrt ${DEVICE} rootfs\";
${COMPATIBLE_PROP} ${COMPATIBLE_PROP}
data = /incbin/(\"${ROOTFS}.pagesync\"); data = /incbin/(\"${ROOTFS}.pagesync\");
@ -138,7 +138,7 @@ if [ -n "${ROOTFS}" ]; then
}; };
}; };
" "
LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs@${ROOTFSNUM}\"" LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs-${ROOTFSNUM}\""
fi fi
# Create a default, fully populated DTS file # Create a default, fully populated DTS file
@ -149,7 +149,7 @@ DATA="/dts-v1/;
#address-cells = <1>; #address-cells = <1>;
images { images {
kernel@1 { kernel-1 {
description = \"${ARCH_UPPER} OpenWrt Linux-${VERSION}\"; description = \"${ARCH_UPPER} OpenWrt Linux-${VERSION}\";
data = /incbin/(\"${KERNEL}\"); data = /incbin/(\"${KERNEL}\");
type = \"kernel\"; type = \"kernel\";
@ -174,7 +174,7 @@ ${ROOTFS_NODE}
default = \"${CONFIG}\"; default = \"${CONFIG}\";
${CONFIG} { ${CONFIG} {
description = \"OpenWrt ${DEVICE}\"; description = \"OpenWrt ${DEVICE}\";
kernel = \"kernel@1\"; kernel = \"kernel-1\";
${FDT_PROP} ${FDT_PROP}
${LOADABLES:+loadables = ${LOADABLES};} ${LOADABLES:+loadables = ${LOADABLES};}
${COMPATIBLE_PROP} ${COMPATIBLE_PROP}