imx: mkimage_fit_atf: Fix FIT image for correct boot order

Fix the FIT image metadata for i.MX8 to result in the intended boot
order (SPL -> ATF -> U-Boot).

Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh
index 38c9858e849f3f87b3f33598e5c4c98cc8252fef..ad81d5ecab225791e4e64f4760a1ba8ed35de26f 100755 (executable)
--- a/arch/arm/mach-imx/mkimage_fit_atf.sh
+++ b/arch/arm/mach-imx/mkimage_fit_atf.sh
@@ -55,6 +55,7 @@ cat << __HEADER_EOF
        images {
                uboot@1 {
                        description = "U-Boot (64-bit)";
+                       os = "u-boot";
                        data = /incbin/("$BL33");
                        type = "standalone";
                        arch = "arm64";
@@ -63,6 +64,7 @@ cat << __HEADER_EOF
                };
                atf@1 {
                        description = "ARM Trusted Firmware";
+                       os = "arm-trusted-firmware";
                        data = /incbin/("$BL31");
                        type = "firmware";
                        arch = "arm64";
@@ -114,8 +116,8 @@ if [ -f $BL32 ]; then
 cat << __CONF_SECTION_EOF
                config@$cnt {
                        description = "$(basename $dtname .dtb)";
-                       firmware = "uboot@1";
-                       loadables = "atf@1", "tee@1";
+                       firmware = "atf@1";
+                       loadables = "uboot@1", "tee@1";
                        fdt = "fdt@$cnt";
                };
 __CONF_SECTION_EOF
@@ -123,8 +125,8 @@ else
 cat << __CONF_SECTION1_EOF
                config@$cnt {
                        description = "$(basename $dtname .dtb)";
-                       firmware = "uboot@1";
-                       loadables = "atf@1";
+                       firmware = "atf@1";
+                       loadables = "uboot@1";
                        fdt = "fdt@$cnt";
                };
 __CONF_SECTION1_EOF