[U-Boot] [PATCH V3 01/27] imx: mkimage_fit_atf: Fix FIT image for correct boot order

[Peng Fan]

From: Frieder Schrempf <frieder.schrempf at kontron.de>

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 at kontron.de>
Signed-off-by: Peng Fan <peng.fan at nxp.com>
---
 arch/arm/mach-imx/mkimage_fit_atf.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/mkimage_fit_atf.sh b/arch/arm/mach-imx/mkimage_fit_atf.sh
index 38c9858e84..ad81d5ecab 100755
--- 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 at 1 {
 			description = "U-Boot (64-bit)";
+			os = "u-boot";
 			data = /incbin/("$BL33");
 			type = "standalone";
 			arch = "arm64";
@@ -63,6 +64,7 @@ cat << __HEADER_EOF
 		};
 		atf at 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 at 1";
-			loadables = "atf at 1", "tee at 1";
+			firmware = "atf at 1";
+			loadables = "uboot at 1", "tee at 1";
 			fdt = "fdt@$cnt";
 		};
 __CONF_SECTION_EOF
@@ -123,8 +125,8 @@ else
 cat << __CONF_SECTION1_EOF
 		config@$cnt {
 			description = "$(basename $dtname .dtb)";
-			firmware = "uboot at 1";
-			loadables = "atf at 1";
+			firmware = "atf at 1";
+			loadables = "uboot at 1";
 			fdt = "fdt@$cnt";
 		};
 __CONF_SECTION1_EOF
-- 
2.16.4