From 93a203d38b520db64e041e66f6bdad39ee5a3366 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 3 Aug 2023 17:23:58 -0600 Subject: binman: Renumber 291 and 292 test files These have ended up with the same numbers as earlier files. Fix them. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 4 +- tools/binman/test/291_template_phandle.dts | 51 -------------------- tools/binman/test/292_template_phandle_dup.dts | 65 -------------------------- tools/binman/test/309_template_phandle.dts | 51 ++++++++++++++++++++ tools/binman/test/310_template_phandle_dup.dts | 65 ++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 118 deletions(-) delete mode 100644 tools/binman/test/291_template_phandle.dts delete mode 100644 tools/binman/test/292_template_phandle_dup.dts create mode 100644 tools/binman/test/309_template_phandle.dts create mode 100644 tools/binman/test/310_template_phandle_dup.dts diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 36428ec3434..78389b34a71 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -6974,7 +6974,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap entry_args = { 'atf-bl31-path': 'bl31.elf', } - data = self._DoReadFileDtb('291_template_phandle.dts', + data = self._DoReadFileDtb('309_template_phandle.dts', entry_args=entry_args) fname = tools.get_output_filename('image.bin') out = tools.run('dumpimage', '-l', fname) @@ -6990,7 +6990,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'atf-bl31-path': 'bl31.elf', } with self.assertRaises(ValueError) as e: - self._DoReadFileDtb('292_template_phandle_dup.dts', + self._DoReadFileDtb('310_template_phandle_dup.dts', entry_args=entry_args) self.assertIn( 'Duplicate phandle 1 in nodes /binman/image/fit/images/atf/atf-bl31 and /binman/image-2/fit/images/atf/atf-bl31', diff --git a/tools/binman/test/291_template_phandle.dts b/tools/binman/test/291_template_phandle.dts deleted file mode 100644 index c4ec1dd41be..00000000000 --- a/tools/binman/test/291_template_phandle.dts +++ /dev/null @@ -1,51 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - multiple-images; - - ti_spl_template: template-1 { - fit { - description = "test-desc"; - #address-cells = <1>; - images { - atf { - description = "atf"; - ti-secure { - type = "collection"; - content = <&atf>; - keyfile = "key.pem"; - }; - atf: atf-bl31 { - description = "atf"; - }; - }; - }; - }; - }; - - image { - insert-template = <&ti_spl_template>; - fit { - images { - fdt-0 { - description = "fdt"; - ti-secure { - type = "collection"; - content = <&foo_dtb>; - keyfile = "key.pem"; - }; - foo_dtb: blob-ext { - filename = "vga.bin"; - }; - }; - }; - }; - }; - }; -}; diff --git a/tools/binman/test/292_template_phandle_dup.dts b/tools/binman/test/292_template_phandle_dup.dts deleted file mode 100644 index dc86f06463b..00000000000 --- a/tools/binman/test/292_template_phandle_dup.dts +++ /dev/null @@ -1,65 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - multiple-images; - - ti_spl_template: template-1 { - fit { - description = "test-desc"; - #address-cells = <1>; - images { - atf { - description = "atf"; - ti-secure { - type = "collection"; - content = <&atf>; - keyfile = "key.pem"; - }; - atf: atf-bl31 { - description = "atf"; - }; - }; - }; - }; - }; - - image { - insert-template = <&ti_spl_template>; - fit { - images { - fdt-0 { - description = "fdt"; - ti-secure { - type = "collection"; - content = <&foo_dtb>; - keyfile = "key.pem"; - }; - foo_dtb: blob-ext { - filename = "vga.bin"; - }; - }; - }; - }; - }; - - image-2 { - insert-template = <&ti_spl_template>; - fit { - images { - fdt-0 { - description = "fdt"; - blob-ext { - filename = "vga.bin"; - }; - }; - }; - }; - }; - }; -}; diff --git a/tools/binman/test/309_template_phandle.dts b/tools/binman/test/309_template_phandle.dts new file mode 100644 index 00000000000..c4ec1dd41be --- /dev/null +++ b/tools/binman/test/309_template_phandle.dts @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + multiple-images; + + ti_spl_template: template-1 { + fit { + description = "test-desc"; + #address-cells = <1>; + images { + atf { + description = "atf"; + ti-secure { + type = "collection"; + content = <&atf>; + keyfile = "key.pem"; + }; + atf: atf-bl31 { + description = "atf"; + }; + }; + }; + }; + }; + + image { + insert-template = <&ti_spl_template>; + fit { + images { + fdt-0 { + description = "fdt"; + ti-secure { + type = "collection"; + content = <&foo_dtb>; + keyfile = "key.pem"; + }; + foo_dtb: blob-ext { + filename = "vga.bin"; + }; + }; + }; + }; + }; + }; +}; diff --git a/tools/binman/test/310_template_phandle_dup.dts b/tools/binman/test/310_template_phandle_dup.dts new file mode 100644 index 00000000000..dc86f06463b --- /dev/null +++ b/tools/binman/test/310_template_phandle_dup.dts @@ -0,0 +1,65 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + multiple-images; + + ti_spl_template: template-1 { + fit { + description = "test-desc"; + #address-cells = <1>; + images { + atf { + description = "atf"; + ti-secure { + type = "collection"; + content = <&atf>; + keyfile = "key.pem"; + }; + atf: atf-bl31 { + description = "atf"; + }; + }; + }; + }; + }; + + image { + insert-template = <&ti_spl_template>; + fit { + images { + fdt-0 { + description = "fdt"; + ti-secure { + type = "collection"; + content = <&foo_dtb>; + keyfile = "key.pem"; + }; + foo_dtb: blob-ext { + filename = "vga.bin"; + }; + }; + }; + }; + }; + + image-2 { + insert-template = <&ti_spl_template>; + fit { + images { + fdt-0 { + description = "fdt"; + blob-ext { + filename = "vga.bin"; + }; + }; + }; + }; + }; + }; +}; -- cgit v1.3.1