scripts: use sep-char for hash nodes
authorDavid Bauer <mail@david-bauer.net>
Fri, 9 Jun 2023 12:12:47 +0000 (14:12 +0200)
committerDavid Bauer <mail@david-bauer.net>
Wed, 26 Jul 2023 13:39:24 +0000 (15:39 +0200)
U-Boot with enabled secure-boot will not boot images with the
@-character used for hash node-names.

Use the existing separation character configurable for each device.

Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit 2b133ab19cd5d741f3191f917c607667943f5f58)

scripts/mkits.sh

index bd6cddabf44c735693a669e44b8937ba5651cc2b..46ab5ee023f54249e41793f9a2ee8ab3a0d0805d 100755 (executable)
@@ -103,10 +103,10 @@ if [ -n "${DTB}" ]; then
                        ${DTADDR:+load = <${DTADDR}>;}
                        arch = \"${ARCH}\";
                        compression = \"none\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
@@ -123,10 +123,10 @@ if [ -n "${INITRD}" ]; then
                        type = \"ramdisk\";
                        arch = \"${ARCH}\";
                        os = \"linux\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
@@ -145,10 +145,10 @@ if [ -n "${ROOTFS}" ]; then
                        type = \"filesystem\";
                        arch = \"${ARCH}\";
                        compression = \"none\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
@@ -174,10 +174,10 @@ OVCONFIGS=""
                        type = \"flat_dt\";
                        arch = \"${ARCH}\";
                        compression = \"none\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
@@ -209,10 +209,10 @@ DATA="/dts-v1/;
                        compression = \"${COMPRESS}\";
                        load = <${LOAD_ADDR}>;
                        entry = <${ENTRY_ADDR}>;
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"$HASH\";
                        };
                };