sunxi: binman: Update FIT component descriptions

Since commit d879616e9e64 ("spl: fit: simplify logic for FDT loading for
non-OS boots"), the SPL looks at the "os" properties of FIT images to
determine where to append the FDT.

The "os" property of the "firmware" image also determines how to execute
the next stage of the boot process, as in 1d3790905d9c ("spl: atf:
introduce spl_invoke_atf and make bl31_entry private"). For this reason,
the next stage must be specified in "firmware", not in "loadables".

To support this additional functionality, and to properly model the boot
process, where ATF runs before U-Boot, add the "os" properties and swap
the firmware/loadable images in the FIT image.

Since this description was copied as an example in commit 70248d6a2916
("binman: Support generating FITs with multiple dtbs"), update those
examples as well for correctness and consistency.

Acked-by: Patrick Wildt <patrick@blueri.se>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index b8a0d4b6b08e65ef56b311699deec3165f094ea0..9f5b103cbb86179e5093f8f4f6eaaa73b5c61e74 100644 (file)
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -35,6 +35,7 @@
                                uboot {
                                        description = "U-Boot (64-bit)";
                                        type = "standalone";
+                                       os = "u-boot";
                                        arch = "arm64";
                                        compression = "none";
                                        load = <0x4a000000>;
@@ -46,6 +47,7 @@
                                atf {
                                        description = "ARM Trusted Firmware";
                                        type = "firmware";
+                                       os = "arm-trusted-firmware";
                                        arch = "arm64";
                                        compression = "none";
                                        load = <BL31_ADDR>;
@@ -69,8 +71,8 @@
 
                                @config-SEQ {
                                        description = "NAME";
-                                       firmware = "uboot";
-                                       loadables = "atf";
+                                       firmware = "atf";
+                                       loadables = "uboot";
                                        fdt = "fdt-SEQ";
                                };
                        };

diff --git a/tools/binman/README.entries b/tools/binman/README.entries
index c1d436563e89e12a8228198947bb23bde3007d7d..bdb4fd6ee51c02ed25ddecac6f6312419e644833 100644 (file)
--- a/tools/binman/README.entries
+++ b/tools/binman/README.entries
@@ -385,8 +385,8 @@ You can create config nodes in a similar way:
         default = "@config-DEFAULT-SEQ";
         @config-SEQ {
             description = "NAME";
-            firmware = "uboot";
-            loadables = "atf";
+            firmware = "atf";
+            loadables = "uboot";
             fdt = "fdt-SEQ";
         };
     };

diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py
index 8a24f12aa5993656444fe788a6f732e55f2d7b4d..1a7cbd7cec7aa8d5abe4884c95223ee3d8693974 100644 (file)
--- a/tools/binman/etype/fit.py
+++ b/tools/binman/etype/fit.py
@@ -73,8 +73,8 @@ class Entry_fit(Entry):
             default = "@config-DEFAULT-SEQ";
             @config-SEQ {
                 description = "NAME";
-                firmware = "uboot";
-                loadables = "atf";
+                firmware = "atf";
+                loadables = "uboot";
                 fdt = "fdt-SEQ";
             };
         };