From a6b44acaf5a3be07caa5fd42ef61d37470cb706a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 24 Jul 2023 09:19:59 -0600 Subject: binman: Renumber 277...289 TI test files These have ended up with the same numbers as earlier files. Fix them. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 18 ++++++++--------- tools/binman/test/277_ti_board_cfg.dts | 14 ------------- tools/binman/test/278_ti_board_cfg_combined.dts | 25 ------------------------ tools/binman/test/279_ti_board_cfg_no_type.dts | 11 ----------- tools/binman/test/279_ti_secure.dts | 17 ---------------- tools/binman/test/280_ti_secure_rom.dts | 17 ---------------- tools/binman/test/281_ti_secure_rom_combined.dts | 25 ------------------------ tools/binman/test/288_ti_secure_rom_a.dts | 19 ------------------ tools/binman/test/289_ti_secure_rom_b.dts | 18 ----------------- tools/binman/test/293_ti_board_cfg.dts | 14 +++++++++++++ tools/binman/test/294_ti_board_cfg_combined.dts | 25 ++++++++++++++++++++++++ tools/binman/test/295_ti_board_cfg_no_type.dts | 11 +++++++++++ tools/binman/test/296_ti_secure.dts | 17 ++++++++++++++++ tools/binman/test/297_ti_secure_rom.dts | 17 ++++++++++++++++ tools/binman/test/298_ti_secure_rom_combined.dts | 25 ++++++++++++++++++++++++ tools/binman/test/299_ti_secure_rom_a.dts | 19 ++++++++++++++++++ tools/binman/test/300_ti_secure_rom_b.dts | 18 +++++++++++++++++ 17 files changed, 155 insertions(+), 155 deletions(-) delete mode 100644 tools/binman/test/277_ti_board_cfg.dts delete mode 100644 tools/binman/test/278_ti_board_cfg_combined.dts delete mode 100644 tools/binman/test/279_ti_board_cfg_no_type.dts delete mode 100644 tools/binman/test/279_ti_secure.dts delete mode 100644 tools/binman/test/280_ti_secure_rom.dts delete mode 100644 tools/binman/test/281_ti_secure_rom_combined.dts delete mode 100644 tools/binman/test/288_ti_secure_rom_a.dts delete mode 100644 tools/binman/test/289_ti_secure_rom_b.dts create mode 100644 tools/binman/test/293_ti_board_cfg.dts create mode 100644 tools/binman/test/294_ti_board_cfg_combined.dts create mode 100644 tools/binman/test/295_ti_board_cfg_no_type.dts create mode 100644 tools/binman/test/296_ti_secure.dts create mode 100644 tools/binman/test/297_ti_secure_rom.dts create mode 100644 tools/binman/test/298_ti_secure_rom_combined.dts create mode 100644 tools/binman/test/299_ti_secure_rom_a.dts create mode 100644 tools/binman/test/300_ti_secure_rom_b.dts diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 40d2fd5da1b..26913bb094a 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -6930,19 +6930,19 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testTIBoardConfig(self): """Test that a schema validated board config file can be generated""" - data = self._DoReadFile('277_ti_board_cfg.dts') + data = self._DoReadFile('293_ti_board_cfg.dts') self.assertEqual(TI_BOARD_CONFIG_DATA, data) def testTIBoardConfigCombined(self): """Test that a schema validated combined board config file can be generated""" - data = self._DoReadFile('278_ti_board_cfg_combined.dts') + data = self._DoReadFile('294_ti_board_cfg_combined.dts') configlen_noheader = TI_BOARD_CONFIG_DATA * 4 self.assertGreater(data, configlen_noheader) def testTIBoardConfigNoDataType(self): """Test that error is thrown when data type is not supported""" with self.assertRaises(ValueError) as e: - data = self._DoReadFile('279_ti_board_cfg_no_type.dts') + data = self._DoReadFile('295_ti_board_cfg_no_type.dts') self.assertIn("Schema validation error", str(e.exception)) def testPackTiSecure(self): @@ -6951,7 +6951,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap entry_args = { 'keyfile': keyfile, } - data = self._DoReadFileDtb('279_ti_secure.dts', + data = self._DoReadFileDtb('296_ti_secure.dts', entry_args=entry_args)[0] self.assertGreater(len(data), len(TI_UNSECURE_DATA)) @@ -6963,7 +6963,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap 'keyfile': keyfile, } with test_util.capture_sys_output() as (_, stderr): - self._DoTestFile('279_ti_secure.dts', + self._DoTestFile('296_ti_secure.dts', force_missing_bintools='openssl', entry_args=entry_args) err = stderr.getvalue() @@ -6975,11 +6975,11 @@ fdt fdtmap Extract the devicetree blob from the fdtmap entry_args = { 'keyfile': keyfile, } - data = self._DoReadFileDtb('280_ti_secure_rom.dts', + data = self._DoReadFileDtb('297_ti_secure_rom.dts', entry_args=entry_args)[0] - data_a = self._DoReadFileDtb('288_ti_secure_rom_a.dts', + data_a = self._DoReadFileDtb('299_ti_secure_rom_a.dts', entry_args=entry_args)[0] - data_b = self._DoReadFileDtb('289_ti_secure_rom_b.dts', + data_b = self._DoReadFileDtb('300_ti_secure_rom_b.dts', entry_args=entry_args)[0] self.assertGreater(len(data), len(TI_UNSECURE_DATA)) self.assertGreater(len(data_a), len(TI_UNSECURE_DATA)) @@ -6991,7 +6991,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap entry_args = { 'keyfile': keyfile, } - data = self._DoReadFileDtb('281_ti_secure_rom_combined.dts', + data = self._DoReadFileDtb('298_ti_secure_rom_combined.dts', entry_args=entry_args)[0] self.assertGreater(len(data), len(TI_UNSECURE_DATA)) diff --git a/tools/binman/test/277_ti_board_cfg.dts b/tools/binman/test/277_ti_board_cfg.dts deleted file mode 100644 index cda024c1b8c..00000000000 --- a/tools/binman/test/277_ti_board_cfg.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - ti-board-config { - config = "yaml/config.yaml"; - schema = "yaml/schema.yaml"; - }; - }; -}; diff --git a/tools/binman/test/278_ti_board_cfg_combined.dts b/tools/binman/test/278_ti_board_cfg_combined.dts deleted file mode 100644 index 95ef449cbf4..00000000000 --- a/tools/binman/test/278_ti_board_cfg_combined.dts +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - ti-board-config { - board-cfg { - config = "yaml/config.yaml"; - schema = "yaml/schema.yaml"; - }; - sec-cfg { - config = "yaml/config.yaml"; - schema = "yaml/schema.yaml"; - }; - rm-cfg { - config = "yaml/config.yaml"; - schema = "yaml/schema.yaml"; - }; - pm-cfg { - config = "yaml/config.yaml"; - schema = "yaml/schema.yaml"; - }; - }; - }; -}; diff --git a/tools/binman/test/279_ti_board_cfg_no_type.dts b/tools/binman/test/279_ti_board_cfg_no_type.dts deleted file mode 100644 index 584b7acc5a4..00000000000 --- a/tools/binman/test/279_ti_board_cfg_no_type.dts +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - binman { - ti-board-config { - config = "yaml/config.yaml"; - schema = "yaml/schema_notype.yaml"; - }; - }; -}; diff --git a/tools/binman/test/279_ti_secure.dts b/tools/binman/test/279_ti_secure.dts deleted file mode 100644 index 941d0ab4ca3..00000000000 --- a/tools/binman/test/279_ti_secure.dts +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - ti-secure { - content = <&unsecure_binary>; - }; - unsecure_binary: blob-ext { - filename = "ti_unsecure.bin"; - }; - }; -}; diff --git a/tools/binman/test/280_ti_secure_rom.dts b/tools/binman/test/280_ti_secure_rom.dts deleted file mode 100644 index d1313769f43..00000000000 --- a/tools/binman/test/280_ti_secure_rom.dts +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - ti-secure-rom { - content = <&unsecure_binary>; - }; - unsecure_binary: blob-ext { - filename = "ti_unsecure.bin"; - }; - }; -}; diff --git a/tools/binman/test/281_ti_secure_rom_combined.dts b/tools/binman/test/281_ti_secure_rom_combined.dts deleted file mode 100644 index bf872739bc1..00000000000 --- a/tools/binman/test/281_ti_secure_rom_combined.dts +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - ti-secure-rom { - content = <&unsecure_binary>; - content-sbl = <&unsecure_binary>; - content-sysfw = <&unsecure_binary>; - content-sysfw-data = <&unsecure_binary>; - content-sysfw-inner-cert = <&unsecure_binary>; - content-dm-data = <&unsecure_binary>; - combined; - sysfw-inner-cert; - dm-data; - }; - unsecure_binary: blob-ext { - filename = "ti_unsecure.bin"; - }; - }; -}; diff --git a/tools/binman/test/288_ti_secure_rom_a.dts b/tools/binman/test/288_ti_secure_rom_a.dts deleted file mode 100644 index 887138f0e4b..00000000000 --- a/tools/binman/test/288_ti_secure_rom_a.dts +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - ti-secure-rom { - content = <&unsecure_binary>; - core = "secure"; - countersign; - }; - unsecure_binary: blob-ext { - filename = "ti_unsecure.bin"; - }; - }; -}; diff --git a/tools/binman/test/289_ti_secure_rom_b.dts b/tools/binman/test/289_ti_secure_rom_b.dts deleted file mode 100644 index c6d6182158c..00000000000 --- a/tools/binman/test/289_ti_secure_rom_b.dts +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - ti-secure-rom { - content = <&unsecure_binary>; - core = "public"; - }; - unsecure_binary: blob-ext { - filename = "ti_unsecure.bin"; - }; - }; -}; diff --git a/tools/binman/test/293_ti_board_cfg.dts b/tools/binman/test/293_ti_board_cfg.dts new file mode 100644 index 00000000000..cda024c1b8c --- /dev/null +++ b/tools/binman/test/293_ti_board_cfg.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + ti-board-config { + config = "yaml/config.yaml"; + schema = "yaml/schema.yaml"; + }; + }; +}; diff --git a/tools/binman/test/294_ti_board_cfg_combined.dts b/tools/binman/test/294_ti_board_cfg_combined.dts new file mode 100644 index 00000000000..95ef449cbf4 --- /dev/null +++ b/tools/binman/test/294_ti_board_cfg_combined.dts @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + ti-board-config { + board-cfg { + config = "yaml/config.yaml"; + schema = "yaml/schema.yaml"; + }; + sec-cfg { + config = "yaml/config.yaml"; + schema = "yaml/schema.yaml"; + }; + rm-cfg { + config = "yaml/config.yaml"; + schema = "yaml/schema.yaml"; + }; + pm-cfg { + config = "yaml/config.yaml"; + schema = "yaml/schema.yaml"; + }; + }; + }; +}; diff --git a/tools/binman/test/295_ti_board_cfg_no_type.dts b/tools/binman/test/295_ti_board_cfg_no_type.dts new file mode 100644 index 00000000000..584b7acc5a4 --- /dev/null +++ b/tools/binman/test/295_ti_board_cfg_no_type.dts @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + binman { + ti-board-config { + config = "yaml/config.yaml"; + schema = "yaml/schema_notype.yaml"; + }; + }; +}; diff --git a/tools/binman/test/296_ti_secure.dts b/tools/binman/test/296_ti_secure.dts new file mode 100644 index 00000000000..941d0ab4ca3 --- /dev/null +++ b/tools/binman/test/296_ti_secure.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + ti-secure { + content = <&unsecure_binary>; + }; + unsecure_binary: blob-ext { + filename = "ti_unsecure.bin"; + }; + }; +}; diff --git a/tools/binman/test/297_ti_secure_rom.dts b/tools/binman/test/297_ti_secure_rom.dts new file mode 100644 index 00000000000..d1313769f43 --- /dev/null +++ b/tools/binman/test/297_ti_secure_rom.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + ti-secure-rom { + content = <&unsecure_binary>; + }; + unsecure_binary: blob-ext { + filename = "ti_unsecure.bin"; + }; + }; +}; diff --git a/tools/binman/test/298_ti_secure_rom_combined.dts b/tools/binman/test/298_ti_secure_rom_combined.dts new file mode 100644 index 00000000000..bf872739bc1 --- /dev/null +++ b/tools/binman/test/298_ti_secure_rom_combined.dts @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + ti-secure-rom { + content = <&unsecure_binary>; + content-sbl = <&unsecure_binary>; + content-sysfw = <&unsecure_binary>; + content-sysfw-data = <&unsecure_binary>; + content-sysfw-inner-cert = <&unsecure_binary>; + content-dm-data = <&unsecure_binary>; + combined; + sysfw-inner-cert; + dm-data; + }; + unsecure_binary: blob-ext { + filename = "ti_unsecure.bin"; + }; + }; +}; diff --git a/tools/binman/test/299_ti_secure_rom_a.dts b/tools/binman/test/299_ti_secure_rom_a.dts new file mode 100644 index 00000000000..887138f0e4b --- /dev/null +++ b/tools/binman/test/299_ti_secure_rom_a.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + ti-secure-rom { + content = <&unsecure_binary>; + core = "secure"; + countersign; + }; + unsecure_binary: blob-ext { + filename = "ti_unsecure.bin"; + }; + }; +}; diff --git a/tools/binman/test/300_ti_secure_rom_b.dts b/tools/binman/test/300_ti_secure_rom_b.dts new file mode 100644 index 00000000000..c6d6182158c --- /dev/null +++ b/tools/binman/test/300_ti_secure_rom_b.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + ti-secure-rom { + content = <&unsecure_binary>; + core = "public"; + }; + unsecure_binary: blob-ext { + filename = "ti_unsecure.bin"; + }; + }; +}; -- cgit v1.3.1