binman: test: Ensure all config references exist in /images node

Several binman FIT test device trees reference image nodes such as atf
and uboot in their /configurations sections, but those image nodes
were not actually defined in the /images node. This mismatch can lead
to validation errors when stricter consistency checks are introduced.

This patch adds minimal definitions for atf and uboot under the
/images node in all relevant test DTS files.

Signed-off-by: Aristo Chen <aristo.chen@canonical.com>

diff --git a/tools/binman/test/170_fit_fdt.dts b/tools/binman/test/170_fit_fdt.dts
index 0197ffd..4b1e9b4 100644 (file)
--- a/tools/binman/test/170_fit_fdt.dts
+++ b/tools/binman/test/170_fit_fdt.dts
@@ -15,6 +15,20 @@
                        fit,fdt-list = "of-list";
 
                        images {
+                               atf {
+                                       description = "atf firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
+                               uboot {
+                                       description = "U-Boot firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
                                kernel {
                                        description = "Vanilla Linux kernel";
                                        type = "kernel";

diff --git a/tools/binman/test/220_fit_subentry_bintool.dts b/tools/binman/test/220_fit_subentry_bintool.dts
index 6e29d41..b1d8fb0 100644 (file)
--- a/tools/binman/test/220_fit_subentry_bintool.dts
+++ b/tools/binman/test/220_fit_subentry_bintool.dts
@@ -12,7 +12,7 @@
                        #address-cells = <1>;
 
                        images {
-                               test {
+                               kernel {
                                        description = "Something using a bintool";
                                        type = "kernel";
                                        arch = "arm";

diff --git a/tools/binman/test/223_fit_fdt_oper.dts b/tools/binman/test/223_fit_fdt_oper.dts
index e630165..cb3b31e 100644 (file)
--- a/tools/binman/test/223_fit_fdt_oper.dts
+++ b/tools/binman/test/223_fit_fdt_oper.dts
@@ -15,6 +15,20 @@
                        fit,fdt-list = "of-list";
 
                        images {
+                               atf {
+                                       description = "atf firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
+                               uboot {
+                                       description = "U-Boot firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
                                kernel {
                                        description = "Vanilla Linux kernel";
                                        type = "kernel";

diff --git a/tools/binman/test/284_fit_fdt_list.dts b/tools/binman/test/284_fit_fdt_list.dts
index 8885313..70cdb32 100644 (file)
--- a/tools/binman/test/284_fit_fdt_list.dts
+++ b/tools/binman/test/284_fit_fdt_list.dts
@@ -15,6 +15,20 @@
                        fit,fdt-list-val = "test-fdt1", "test-fdt2";
 
                        images {
+                               atf {
+                                       description = "atf firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
+                               uboot {
+                                       description = "U-Boot firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
                                kernel {
                                        description = "Vanilla Linux kernel";
                                        type = "kernel";

diff --git a/tools/binman/test/333_fit_fdt_dir.dts b/tools/binman/test/333_fit_fdt_dir.dts
index aa77845..71971de 100644 (file)
--- a/tools/binman/test/333_fit_fdt_dir.dts
+++ b/tools/binman/test/333_fit_fdt_dir.dts
@@ -15,6 +15,20 @@
                        fit,fdt-list-dir = "fdts";
 
                        images {
+                               atf {
+                                       description = "atf firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
+                               uboot {
+                                       description = "U-Boot firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
                                kernel {
                                        description = "Vanilla Linux kernel";
                                        type = "kernel";

diff --git a/tools/binman/test/334_fit_fdt_compat.dts b/tools/binman/test/334_fit_fdt_compat.dts
index 3bf45c7..bf1b5a4 100644 (file)
--- a/tools/binman/test/334_fit_fdt_compat.dts
+++ b/tools/binman/test/334_fit_fdt_compat.dts
@@ -15,6 +15,20 @@
                        fit,fdt-list = "of-list";
 
                        images {
+                               atf {
+                                       description = "atf firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
+                               uboot {
+                                       description = "U-Boot firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
                                kernel {
                                        description = "Vanilla Linux kernel";
                                        type = "kernel";

diff --git a/tools/binman/test/335_fit_fdt_phase.dts b/tools/binman/test/335_fit_fdt_phase.dts
index f8d0740..c20bcad 100644 (file)
--- a/tools/binman/test/335_fit_fdt_phase.dts
+++ b/tools/binman/test/335_fit_fdt_phase.dts
@@ -15,6 +15,20 @@
                        fit,fdt-list = "of-list";
 
                        images {
+                               atf {
+                                       description = "atf firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
+                               uboot {
+                                       description = "U-Boot firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
                                kernel {
                                        description = "Vanilla Linux kernel";
                                        type = "kernel";

diff --git a/tools/binman/test/345_fit_fdt_name.dts b/tools/binman/test/345_fit_fdt_name.dts
index 631a8e5..0ef2e19 100644 (file)
--- a/tools/binman/test/345_fit_fdt_name.dts
+++ b/tools/binman/test/345_fit_fdt_name.dts
@@ -15,6 +15,20 @@
                        fit,fdt-list = "of-list";
 
                        images {
+                               atf {
+                                       description = "atf firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
+                               uboot {
+                                       description = "U-Boot firmware";
+                                       type = "firmware";
+                                       compression = "none";
+                                       load = <00000000>;
+                                       entry = <00000000>;
+                               };
                                kernel {
                                        description = "Vanilla Linux kernel";
                                        type = "kernel";