diff options
| author | Johann Neuhauser <jneuhauser@dh-electronics.com> | 2019-09-16 11:42:49 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2019-10-09 20:44:50 +0200 |
| commit | 830000855eb6ad0991ec943e8ec2fcd7670b0038 (patch) | |
| tree | 6c789fa876adaefe7bf38ad5a29575294c3c7110 /scripts | |
| parent | 60ff8bf512d5b678754aed6aa5916aad950fdb89 (diff) | |
| download | upstream-830000855eb6ad0991ec943e8ec2fcd7670b0038.tar.gz upstream-830000855eb6ad0991ec943e8ec2fcd7670b0038.tar.bz2 upstream-830000855eb6ad0991ec943e8ec2fcd7670b0038.zip | |
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>
(cherry picked from commit 205e0939f0a141a1524d94eaf84407ddcb6a1a09)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mkits.sh | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/mkits.sh b/scripts/mkits.sh index 5d836be8e4..93c8cedaed 100755 --- a/scripts/mkits.sh +++ b/scripts/mkits.sh @@ -59,7 +59,7 @@ ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'` # Conditionally create fdt information if [ -n "${DTB}" ]; then - FDT=" + FDT_NODE=" fdt@1 { description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\"; data = /incbin/(\"${DTB}\"); @@ -74,6 +74,7 @@ if [ -n "${DTB}" ]; then }; }; " + FDT_PROP="fdt = \"fdt@1\";" fi # Create a default, fully populated DTS file @@ -100,9 +101,7 @@ DATA="/dts-v1/; algo = \"sha1\"; }; }; - -${FDT} - +${FDT_NODE} }; configurations { @@ -110,7 +109,7 @@ ${FDT} ${CONFIG} { description = \"OpenWrt\"; kernel = \"kernel@1\"; - fdt = \"fdt@1\"; + ${FDT_PROP} }; }; };" |