From 52d7fe3a4570bca315754879ace7b82b47d4a34d Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 6 Mar 2026 11:12:40 -0700 Subject: binman: test: Move FIP/TF-A test files to test/fip/ Move about 15 test files for ARM Trusted Firmware FIP, ATF BL31, SCP, OpenSBI, and BL1 entries into a fip/ subdirectory. Drop the numeric prefixes and the redundant fip_ filename prefix, and update all references. Signed-off-by: Simon Glass --- tools/binman/ftest.py | 30 ++++++++++++++--------------- tools/binman/test/169_atf_bl31.dts | 16 ---------------- tools/binman/test/172_scp.dts | 16 ---------------- tools/binman/test/201_opensbi.dts | 14 -------------- tools/binman/test/203_fip.dts | 21 -------------------- tools/binman/test/204_fip_other.dts | 22 --------------------- tools/binman/test/205_fip_no_type.dts | 15 --------------- tools/binman/test/206_fip_uuid.dts | 22 --------------------- tools/binman/test/207_fip_ls.dts | 25 ------------------------ tools/binman/test/208_fip_replace.dts | 33 -------------------------------- tools/binman/test/209_fip_missing.dts | 19 ------------------ tools/binman/test/210_fip_size.dts | 19 ------------------ tools/binman/test/211_fip_bad_align.dts | 18 ----------------- tools/binman/test/212_fip_collection.dts | 24 ----------------------- tools/binman/test/347_bl1.dts | 13 ------------- tools/binman/test/fip/atf_bl31.dts | 16 ++++++++++++++++ tools/binman/test/fip/bad_align.dts | 18 +++++++++++++++++ tools/binman/test/fip/bl1.dts | 13 +++++++++++++ tools/binman/test/fip/collection.dts | 24 +++++++++++++++++++++++ tools/binman/test/fip/fip.dts | 21 ++++++++++++++++++++ tools/binman/test/fip/ls.dts | 25 ++++++++++++++++++++++++ tools/binman/test/fip/missing.dts | 19 ++++++++++++++++++ tools/binman/test/fip/no_type.dts | 15 +++++++++++++++ tools/binman/test/fip/opensbi.dts | 14 ++++++++++++++ tools/binman/test/fip/other.dts | 22 +++++++++++++++++++++ tools/binman/test/fip/replace.dts | 33 ++++++++++++++++++++++++++++++++ tools/binman/test/fip/scp.dts | 16 ++++++++++++++++ tools/binman/test/fip/size.dts | 19 ++++++++++++++++++ tools/binman/test/fip/uuid.dts | 22 +++++++++++++++++++++ 29 files changed, 292 insertions(+), 292 deletions(-) delete mode 100644 tools/binman/test/169_atf_bl31.dts delete mode 100644 tools/binman/test/172_scp.dts delete mode 100644 tools/binman/test/201_opensbi.dts delete mode 100644 tools/binman/test/203_fip.dts delete mode 100644 tools/binman/test/204_fip_other.dts delete mode 100644 tools/binman/test/205_fip_no_type.dts delete mode 100644 tools/binman/test/206_fip_uuid.dts delete mode 100644 tools/binman/test/207_fip_ls.dts delete mode 100644 tools/binman/test/208_fip_replace.dts delete mode 100644 tools/binman/test/209_fip_missing.dts delete mode 100644 tools/binman/test/210_fip_size.dts delete mode 100644 tools/binman/test/211_fip_bad_align.dts delete mode 100644 tools/binman/test/212_fip_collection.dts delete mode 100644 tools/binman/test/347_bl1.dts create mode 100644 tools/binman/test/fip/atf_bl31.dts create mode 100644 tools/binman/test/fip/bad_align.dts create mode 100644 tools/binman/test/fip/bl1.dts create mode 100644 tools/binman/test/fip/collection.dts create mode 100644 tools/binman/test/fip/fip.dts create mode 100644 tools/binman/test/fip/ls.dts create mode 100644 tools/binman/test/fip/missing.dts create mode 100644 tools/binman/test/fip/no_type.dts create mode 100644 tools/binman/test/fip/opensbi.dts create mode 100644 tools/binman/test/fip/other.dts create mode 100644 tools/binman/test/fip/replace.dts create mode 100644 tools/binman/test/fip/scp.dts create mode 100644 tools/binman/test/fip/size.dts create mode 100644 tools/binman/test/fip/uuid.dts (limited to 'tools') diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 43f421178cb..1e83e6140b4 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -4247,12 +4247,12 @@ class TestFunctional(unittest.TestCase): def testPackBl31(self): """Test that an image with an ATF BL31 binary can be created""" - data = self._DoReadFile('169_atf_bl31.dts') + data = self._DoReadFile('fip/atf_bl31.dts') self.assertEqual(ATF_BL31_DATA, data[:len(ATF_BL31_DATA)]) def testPackScp(self): """Test that an image with an SCP binary can be created""" - data = self._DoReadFile('172_scp.dts') + data = self._DoReadFile('fip/scp.dts') self.assertEqual(SCP_DATA, data[:len(SCP_DATA)]) def CheckFitFdt(self, dts='fit/fdt.dts', use_fdt_list=True, @@ -5046,7 +5046,7 @@ class TestFunctional(unittest.TestCase): def testPackOpenSBI(self): """Test that an image with an OpenSBI binary can be created""" - data = self._DoReadFile('201_opensbi.dts') + data = self._DoReadFile('fip/opensbi.dts') self.assertEqual(OPENSBI_DATA, data[:len(OPENSBI_DATA)]) def testSectionsSingleThread(self): @@ -5234,7 +5234,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFip(self): """Basic test of generation of an ARM Firmware Image Package (FIP)""" - data = self._DoReadFile('203_fip.dts') + data = self._DoReadFile('fip/fip.dts') hdr, fents = fip_util.decode_fip(data) self.assertEqual(fip_util.HEADER_MAGIC, hdr.name) self.assertEqual(fip_util.HEADER_SERIAL, hdr.serial) @@ -5266,7 +5266,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFipOther(self): """Basic FIP with something that isn't a external blob""" - data = self._DoReadFile('204_fip_other.dts') + data = self._DoReadFile('fip/other.dts') hdr, fents = fip_util.decode_fip(data) self.assertEqual(2, len(fents)) @@ -5277,13 +5277,13 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFipNoType(self): """FIP with an entry of an unknown type""" with self.assertRaises(ValueError) as e: - self._DoReadFile('205_fip_no_type.dts') + self._DoReadFile('fip/no_type.dts') self.assertIn("Must provide a fip-type (node name 'u-boot' is not a known FIP type)", str(e.exception)) def testFipUuid(self): """Basic FIP with a manual uuid""" - data = self._DoReadFile('206_fip_uuid.dts') + data = self._DoReadFile('fip/uuid.dts') hdr, fents = fip_util.decode_fip(data) self.assertEqual(2, len(fents)) @@ -5297,7 +5297,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFipLs(self): """Test listing a FIP""" - data = self._DoReadFileRealDtb('207_fip_ls.dts') + data = self._DoReadFileRealDtb('fip/ls.dts') hdr, fents = fip_util.decode_fip(data) tmpdir = None @@ -5353,7 +5353,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFipExtractOneEntry(self): """Test extracting a single entry fron an FIP""" - self._DoReadFileRealDtb('207_fip_ls.dts') + self._DoReadFileRealDtb('fip/ls.dts') image_fname = tools.get_output_filename('image.bin') fname = os.path.join(self._indir, 'output.extact') control.ExtractEntries(image_fname, fname, None, ['atf-fip/u-boot']) @@ -5363,7 +5363,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFipReplace(self): """Test replacing a single file in a FIP""" expected = U_BOOT_DATA + tools.get_bytes(0x78, 50) - data = self._DoReadFileRealDtb('208_fip_replace.dts') + data = self._DoReadFileRealDtb('fip/replace.dts') updated_fname = tools.get_output_filename('image-updated.bin') tools.write_file(updated_fname, data) entry_name = 'atf-fip/u-boot' @@ -5387,13 +5387,13 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFipMissing(self): with terminal.capture() as (stdout, stderr): - self._DoTestFile('209_fip_missing.dts', allow_missing=True) + self._DoTestFile('fip/missing.dts', allow_missing=True) err = stderr.getvalue() self.assertRegex(err, "Image 'image'.*missing.*: rmm-fw") def testFipSize(self): """Test a FIP with a size property""" - data = self._DoReadFile('210_fip_size.dts') + data = self._DoReadFile('fip/size.dts') self.assertEqual(0x100 + len(U_BOOT_DATA), len(data)) hdr, fents = fip_util.decode_fip(data) self.assertEqual(fip_util.HEADER_MAGIC, hdr.name) @@ -5414,14 +5414,14 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testFipBadAlign(self): """Test that an invalid alignment value in a FIP is detected""" with self.assertRaises(ValueError) as e: - self._DoTestFile('211_fip_bad_align.dts') + self._DoTestFile('fip/bad_align.dts') self.assertIn( "Node \'/binman/atf-fip\': FIP alignment 31 must be a power of two", str(e.exception)) def testFipCollection(self): """Test using a FIP in a collection""" - data = self._DoReadFile('212_fip_collection.dts') + data = self._DoReadFile('fip/collection.dts') entry1 = control.images['image'].GetEntries()['collection'] data1 = data[:entry1.size] hdr1, fents2 = fip_util.decode_fip(data1) @@ -5583,7 +5583,7 @@ fdt fdtmap Extract the devicetree blob from the fdtmap def testPackBl1(self): """test if an image with a bl1 binary can be created""" - data = self._DoReadFile('347_bl1.dts') + data = self._DoReadFile('fip/bl1.dts') self.assertEqual(ATF_BL1_DATA, data[:len(ATF_BL1_DATA)]) def testRenesasRCarGen4SA0Image(self): diff --git a/tools/binman/test/169_atf_bl31.dts b/tools/binman/test/169_atf_bl31.dts deleted file mode 100644 index 2b7547d70f9..00000000000 --- a/tools/binman/test/169_atf_bl31.dts +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - atf-bl31 { - filename = "bl31.bin"; - }; - }; -}; diff --git a/tools/binman/test/172_scp.dts b/tools/binman/test/172_scp.dts deleted file mode 100644 index 354e4ef17df..00000000000 --- a/tools/binman/test/172_scp.dts +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - size = <16>; - - scp { - filename = "scp.bin"; - }; - }; -}; diff --git a/tools/binman/test/201_opensbi.dts b/tools/binman/test/201_opensbi.dts deleted file mode 100644 index 942183f9900..00000000000 --- a/tools/binman/test/201_opensbi.dts +++ /dev/null @@ -1,14 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - opensbi { - filename = "fw_dynamic.bin"; - }; - }; -}; diff --git a/tools/binman/test/203_fip.dts b/tools/binman/test/203_fip.dts deleted file mode 100644 index 08973373240..00000000000 --- a/tools/binman/test/203_fip.dts +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - atf-fip { - fip-hdr-flags = /bits/ 64 <0x123>; - soc-fw { - fip-flags = /bits/ 64 <0x123456789abcdef>; - filename = "bl31.bin"; - }; - - scp-fwu-cfg { - filename = "bl2u.bin"; - }; - }; - }; -}; diff --git a/tools/binman/test/204_fip_other.dts b/tools/binman/test/204_fip_other.dts deleted file mode 100644 index 65039410986..00000000000 --- a/tools/binman/test/204_fip_other.dts +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - atf-fip { - fip-hdr-flags = /bits/ 64 <0x123>; - soc-fw { - fip-flags = /bits/ 64 <0x123456789abcdef>; - filename = "bl31.bin"; - }; - - _testing { - fip-type = "rot-cert"; - return-contents-later; - }; - }; - }; -}; diff --git a/tools/binman/test/205_fip_no_type.dts b/tools/binman/test/205_fip_no_type.dts deleted file mode 100644 index 23c8c3bc37e..00000000000 --- a/tools/binman/test/205_fip_no_type.dts +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - atf-fip { - fip-hdr-flags = /bits/ 64 <0x123>; - u-boot { - }; - }; - }; -}; diff --git a/tools/binman/test/206_fip_uuid.dts b/tools/binman/test/206_fip_uuid.dts deleted file mode 100644 index c9bd44f9c31..00000000000 --- a/tools/binman/test/206_fip_uuid.dts +++ /dev/null @@ -1,22 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - atf-fip { - fip-hdr-flags = /bits/ 64 <0x123>; - soc-fw { - fip-flags = /bits/ 64 <0x123456789abcdef>; - filename = "bl31.bin"; - }; - - u-boot { - fip-uuid = [fc 65 13 92 4a 5b 11 ec - 94 35 ff 2d 1c fc 79 9c]; - }; - }; - }; -}; diff --git a/tools/binman/test/207_fip_ls.dts b/tools/binman/test/207_fip_ls.dts deleted file mode 100644 index 630fca15024..00000000000 --- a/tools/binman/test/207_fip_ls.dts +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - atf-fip { - fip-hdr-flags = /bits/ 64 <0x123>; - soc-fw { - fip-flags = /bits/ 64 <0x123456789abcdef>; - filename = "bl31.bin"; - }; - - u-boot { - fip-uuid = [fc 65 13 92 4a 5b 11 ec - 94 35 ff 2d 1c fc 79 9c]; - }; - }; - - fdtmap { - }; - }; -}; diff --git a/tools/binman/test/208_fip_replace.dts b/tools/binman/test/208_fip_replace.dts deleted file mode 100644 index 432c12474df..00000000000 --- a/tools/binman/test/208_fip_replace.dts +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - allow-repack; - atf-fip { - fip-hdr-flags = /bits/ 64 <0x123>; - soc-fw { - fip-flags = /bits/ 64 <0x123456789abcdef>; - filename = "bl31.bin"; - }; - - u-boot { - fip-uuid = [fc 65 13 92 4a 5b 11 ec - 94 35 ff 2d 1c fc 79 9c]; - }; - - }; - - u-boot { - }; - - u-boot-dtb { - }; - - fdtmap { - }; - }; -}; diff --git a/tools/binman/test/209_fip_missing.dts b/tools/binman/test/209_fip_missing.dts deleted file mode 100644 index 43bb600d047..00000000000 --- a/tools/binman/test/209_fip_missing.dts +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - atf-fip { - soc-fw { - filename = "bl31.bin"; - }; - - rmm-fw { - filename = "rmm.bin"; - }; - }; - }; -}; diff --git a/tools/binman/test/210_fip_size.dts b/tools/binman/test/210_fip_size.dts deleted file mode 100644 index 9dfee796459..00000000000 --- a/tools/binman/test/210_fip_size.dts +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - atf-fip { - size = <0x100>; - pad-byte = <0xff>; - soc-fw { - filename = "bl31.bin"; - }; - }; - u-boot { - }; - }; -}; diff --git a/tools/binman/test/211_fip_bad_align.dts b/tools/binman/test/211_fip_bad_align.dts deleted file mode 100644 index a0901496d80..00000000000 --- a/tools/binman/test/211_fip_bad_align.dts +++ /dev/null @@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - atf-fip { - fip-align = <31>; - size = <0x100>; - pad-byte = <0xff>; - soc-fw { - filename = "bl31.bin"; - }; - }; - }; -}; diff --git a/tools/binman/test/212_fip_collection.dts b/tools/binman/test/212_fip_collection.dts deleted file mode 100644 index 332c023af87..00000000000 --- a/tools/binman/test/212_fip_collection.dts +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - - binman { - collection { - content = <&fip &u_boot>; - }; - fip: atf-fip { - soc-fw { - filename = "bl31.bin"; - }; - - scp-fwu-cfg { - filename = "bl2u.bin"; - }; - }; - u_boot: u-boot { - }; - }; -}; diff --git a/tools/binman/test/347_bl1.dts b/tools/binman/test/347_bl1.dts deleted file mode 100644 index 1a109956204..00000000000 --- a/tools/binman/test/347_bl1.dts +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -/dts-v1/; - -/ { - #address-cells = <1>; - #size-cells = <1>; - binman { - atf-bl1 { - filename = "bl1.bin"; - }; - }; -}; diff --git a/tools/binman/test/fip/atf_bl31.dts b/tools/binman/test/fip/atf_bl31.dts new file mode 100644 index 00000000000..2b7547d70f9 --- /dev/null +++ b/tools/binman/test/fip/atf_bl31.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + atf-bl31 { + filename = "bl31.bin"; + }; + }; +}; diff --git a/tools/binman/test/fip/bad_align.dts b/tools/binman/test/fip/bad_align.dts new file mode 100644 index 00000000000..a0901496d80 --- /dev/null +++ b/tools/binman/test/fip/bad_align.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + atf-fip { + fip-align = <31>; + size = <0x100>; + pad-byte = <0xff>; + soc-fw { + filename = "bl31.bin"; + }; + }; + }; +}; diff --git a/tools/binman/test/fip/bl1.dts b/tools/binman/test/fip/bl1.dts new file mode 100644 index 00000000000..1a109956204 --- /dev/null +++ b/tools/binman/test/fip/bl1.dts @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + binman { + atf-bl1 { + filename = "bl1.bin"; + }; + }; +}; diff --git a/tools/binman/test/fip/collection.dts b/tools/binman/test/fip/collection.dts new file mode 100644 index 00000000000..332c023af87 --- /dev/null +++ b/tools/binman/test/fip/collection.dts @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + collection { + content = <&fip &u_boot>; + }; + fip: atf-fip { + soc-fw { + filename = "bl31.bin"; + }; + + scp-fwu-cfg { + filename = "bl2u.bin"; + }; + }; + u_boot: u-boot { + }; + }; +}; diff --git a/tools/binman/test/fip/fip.dts b/tools/binman/test/fip/fip.dts new file mode 100644 index 00000000000..08973373240 --- /dev/null +++ b/tools/binman/test/fip/fip.dts @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + atf-fip { + fip-hdr-flags = /bits/ 64 <0x123>; + soc-fw { + fip-flags = /bits/ 64 <0x123456789abcdef>; + filename = "bl31.bin"; + }; + + scp-fwu-cfg { + filename = "bl2u.bin"; + }; + }; + }; +}; diff --git a/tools/binman/test/fip/ls.dts b/tools/binman/test/fip/ls.dts new file mode 100644 index 00000000000..630fca15024 --- /dev/null +++ b/tools/binman/test/fip/ls.dts @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + atf-fip { + fip-hdr-flags = /bits/ 64 <0x123>; + soc-fw { + fip-flags = /bits/ 64 <0x123456789abcdef>; + filename = "bl31.bin"; + }; + + u-boot { + fip-uuid = [fc 65 13 92 4a 5b 11 ec + 94 35 ff 2d 1c fc 79 9c]; + }; + }; + + fdtmap { + }; + }; +}; diff --git a/tools/binman/test/fip/missing.dts b/tools/binman/test/fip/missing.dts new file mode 100644 index 00000000000..43bb600d047 --- /dev/null +++ b/tools/binman/test/fip/missing.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + atf-fip { + soc-fw { + filename = "bl31.bin"; + }; + + rmm-fw { + filename = "rmm.bin"; + }; + }; + }; +}; diff --git a/tools/binman/test/fip/no_type.dts b/tools/binman/test/fip/no_type.dts new file mode 100644 index 00000000000..23c8c3bc37e --- /dev/null +++ b/tools/binman/test/fip/no_type.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + atf-fip { + fip-hdr-flags = /bits/ 64 <0x123>; + u-boot { + }; + }; + }; +}; diff --git a/tools/binman/test/fip/opensbi.dts b/tools/binman/test/fip/opensbi.dts new file mode 100644 index 00000000000..942183f9900 --- /dev/null +++ b/tools/binman/test/fip/opensbi.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + opensbi { + filename = "fw_dynamic.bin"; + }; + }; +}; diff --git a/tools/binman/test/fip/other.dts b/tools/binman/test/fip/other.dts new file mode 100644 index 00000000000..65039410986 --- /dev/null +++ b/tools/binman/test/fip/other.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + atf-fip { + fip-hdr-flags = /bits/ 64 <0x123>; + soc-fw { + fip-flags = /bits/ 64 <0x123456789abcdef>; + filename = "bl31.bin"; + }; + + _testing { + fip-type = "rot-cert"; + return-contents-later; + }; + }; + }; +}; diff --git a/tools/binman/test/fip/replace.dts b/tools/binman/test/fip/replace.dts new file mode 100644 index 00000000000..432c12474df --- /dev/null +++ b/tools/binman/test/fip/replace.dts @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + allow-repack; + atf-fip { + fip-hdr-flags = /bits/ 64 <0x123>; + soc-fw { + fip-flags = /bits/ 64 <0x123456789abcdef>; + filename = "bl31.bin"; + }; + + u-boot { + fip-uuid = [fc 65 13 92 4a 5b 11 ec + 94 35 ff 2d 1c fc 79 9c]; + }; + + }; + + u-boot { + }; + + u-boot-dtb { + }; + + fdtmap { + }; + }; +}; diff --git a/tools/binman/test/fip/scp.dts b/tools/binman/test/fip/scp.dts new file mode 100644 index 00000000000..354e4ef17df --- /dev/null +++ b/tools/binman/test/fip/scp.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + size = <16>; + + scp { + filename = "scp.bin"; + }; + }; +}; diff --git a/tools/binman/test/fip/size.dts b/tools/binman/test/fip/size.dts new file mode 100644 index 00000000000..9dfee796459 --- /dev/null +++ b/tools/binman/test/fip/size.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + atf-fip { + size = <0x100>; + pad-byte = <0xff>; + soc-fw { + filename = "bl31.bin"; + }; + }; + u-boot { + }; + }; +}; diff --git a/tools/binman/test/fip/uuid.dts b/tools/binman/test/fip/uuid.dts new file mode 100644 index 00000000000..c9bd44f9c31 --- /dev/null +++ b/tools/binman/test/fip/uuid.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + atf-fip { + fip-hdr-flags = /bits/ 64 <0x123>; + soc-fw { + fip-flags = /bits/ 64 <0x123456789abcdef>; + filename = "bl31.bin"; + }; + + u-boot { + fip-uuid = [fc 65 13 92 4a 5b 11 ec + 94 35 ff 2d 1c fc 79 9c]; + }; + }; + }; +}; -- cgit v1.3.1