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

mkits.sh help currently shows dtb file as optional, but generates an
invalid its file when this option is unspecified.

We're fixing this problem by removing the use of the sed command and
just including variables instead.

Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>
SVN-Revision: 45659

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index c360c73a56a93f5135a5431ff3a57a0a251cdb72..6b5100e1a2ac9d84a703700aaa3e1491ffcf7cd9 100755 (executable)
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -55,6 +55,25 @@ fi
 
 ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
 
+# Conditionally create fdt information
+if [ -n "${DTB}" ]; then
+       FDT="
+               fdt@1 {
+                       description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
+                       data = /incbin/(\"${DTB}\");
+                       type = \"flat_dt\";
+                       arch = \"${ARCH}\";
+                       compression = \"none\";
+                       hash@1 {
+                               algo = \"crc32\";
+                       };
+                       hash@2 {
+                               algo = \"sha1\";
+                       };
+               };
+"
+fi
+
 # Create a default, fully populated DTS file
 DATA="/dts-v1/;
 
@@ -80,19 +99,8 @@ DATA="/dts-v1/;
                        };
                };
 
-               fdt@1 {
-                       description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
-                       data = /incbin/(\"${DTB}\");
-                       type = \"flat_dt\";
-                       arch = \"${ARCH}\";
-                       compression = \"none\";
-                       hash@1 {
-                               algo = \"crc32\";
-                       };
-                       hash@2 {
-                               algo = \"sha1\";
-                       };
-               };
+${FDT}
+
        };
 
        configurations {
@@ -105,11 +113,5 @@ DATA="/dts-v1/;
        };
 };"
 
-# Conditionally strip fdt information out of tree
-if [ -z "${DTB}" ]; then
-       DATA=`echo "$DATA" | sed '/start fdt/,/end fdt/d'`
-       DATA=`echo "$DATA" | sed '/fdt/d'`
-fi
-
 # Write .its file to disk
 echo "$DATA" > ${OUTPUT}