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

build: make device tree arg really optional in mkits.sh 

If no device tree is given there is no node generated, but
the configuration does still include the name of the missing node.
This will result in a successful build fit image, but bootm does
throw a error message if we want to boot the bad configuration.

Signed-off-by: Johann Neuhauser <jneuhauser@dh-electronics.com>
This commit is contained in:
Johann Neuhauser 2019-09-16 11:42:49 +02:00 committed by Petr Štetiar
parent 315405f36b
commit 205e0939f0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mkits.sh
View File

@ -59,7 +59,7 @@ ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
# Conditionally create fdt information # Conditionally create fdt information
if [ -n "${DTB}" ]; then if [ -n "${DTB}" ]; then
FDT=" FDT_NODE="
fdt@1 { fdt@1 {
description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\"; description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
data = /incbin/(\"${DTB}\"); data = /incbin/(\"${DTB}\");
@ -74,6 +74,7 @@ if [ -n "${DTB}" ]; then
}; };
}; };
" "
FDT_PROP="fdt = \"fdt@1\";"
fi fi
# Create a default, fully populated DTS file # Create a default, fully populated DTS file
@ -100,9 +101,7 @@ DATA="/dts-v1/;
algo = \"sha1\"; algo = \"sha1\";
}; };
}; };
${FDT_NODE}
${FDT}
}; };
configurations { configurations {
@ -110,7 +109,7 @@ ${FDT}
${CONFIG} { ${CONFIG} {
description = \"OpenWrt\"; description = \"OpenWrt\";
kernel = \"kernel@1\"; kernel = \"kernel@1\";
fdt = \"fdt@1\"; ${FDT_PROP}
}; };
}; };
};" };"