binman: Add support for generating more complex FITs
Subsystems (5)
v3 cover binman: Add support for generating more complex FITs
This series allows binman to generate FITs that include multiple DTB images and the configuration to use them.
It is then possible to remove the sunxi FIT generator script, so this series handles that also.
With this, sunxi is fully converted to use binman.
Note: This series is available at u-boot-dm/binman-working and is based on u-boot-dm/testing
Changes in v3:
- Add a way to show help messages for missing blobs
- Rebase on top of earlier binman series
Changes in v2:
- Add a 'fit-fdt-list' property
- Add a check for a missing fit,fdt-list property
- Add a check for a missing of-list property
- Add a check for an empty of-list
- Add new patch to allow selecting default FIT configuration
- Add new patch to move 'external' support into base class
- Add new patch to support missing external blobs always
- Add the URL of ARM Trusted Firmware and mention of U-Boot docs
- Fix 'board' typo in commit message
- Fix copyright year
- Update docs to indicate that BL31 is loaded from SPL
- Update docs to mention both bl31.bin and bl31.elf
Simon Glass (12):
binman: Allow entry args to be required
binman: Fix up a few missing comments
libfdt: Detected out-of-space with fdt_finish()
binman: Move 'external' support into base class
binman: Add support for ATF BL31
binman: Support generating FITs with multiple dtbs
Makefile: Support missing external blobs always
sunxi: Convert 64-bit boards to use binman
sunxi: Drop the FIT-generator script
binman: Allow selecting default FIT configuration
binman: Support help messages for missing blobs
binman: sunxi: Add help message for missing sunxi ATF BL31
Kconfig | 3 +- Makefile | 23 +- arch/arm/dts/sunxi-u-boot.dtsi | 62 +++++- board/sunxi/mksunxi_fit_atf.sh | 87 -------- scripts/dtc/pylibfdt/libfdt.i_shipped | 3 +- tools/binman/README | 6 + tools/binman/README.entries | 73 ++++++- tools/binman/control.py | 74 ++++++- tools/binman/entry.py | 23 ++ tools/binman/etype/atf_bl31.py | 24 +++ tools/binman/etype/blob.py | 8 +- tools/binman/etype/blob_ext.py | 11 - tools/binman/etype/blob_named_by_arg.py | 10 +- tools/binman/etype/cros_ec_rw.py | 3 +- tools/binman/etype/fit.py | 116 +++++++++- tools/binman/etype/section.py | 14 +- tools/binman/ftest.py | 203 +++++++++++++++++- tools/binman/missing-blob-help | 15 ++ tools/binman/test/168_fit_missing_blob.dts | 9 +- tools/binman/test/169_atf_bl31.dts | 16 ++ .../binman/test/171_fit_fdt_missing_prop.dts | 54 +++++ tools/binman/test/172_fit_fdt.dts | 55 +++++ 22 files changed, 734 insertions(+), 158 deletions(-) delete mode 100755 board/sunxi/mksunxi_fit_atf.sh create mode 100644 tools/binman/etype/atf_bl31.py create mode 100644 tools/binman/missing-blob-help create mode 100644 tools/binman/test/169_atf_bl31.dts create mode 100644 tools/binman/test/171_fit_fdt_missing_prop.dts create mode 100644 tools/binman/test/172_fit_fdt.dts
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 1/12 binman: Allow entry args to be required
If an entry argument is needed by an entry but the entry argument is not present, then a strange error can occur when trying to read the file.
Fix this by allowing arguments to be required. Select this option for the cros-ec-rw entry. If a filename is provided in the node, allow that to be used.
Also tidy up a few related tests to make the error string easier to find, and fully ignore unused return values.
---
(no changes since v1)
tools/binman/README.entries | 7 ++++++- tools/binman/etype/blob_named_by_arg.py | 10 ++++++---- tools/binman/etype/cros_ec_rw.py | 3 +-- tools/binman/ftest.py | 15 +++++++++++---- 4 files changed, 24 insertions(+), 11 deletions(-)
tools/binman/README.entries +6 -1
@@ -60,7 +60,7 @@ Entry: blob-named-by-arg: A blob entry which gets its filename property from its Properties / Entry arguments: - <xxx>-path: Filename containing the contents of this entry (optional, - defaults to 0) + defaults to None) where <xxx> is the blob_fname argument to the constructor.
@@ -691,6 +691,11 @@ Properties / Entry arguments: (see binman README for more information) name-prefix: Adds a prefix to the name of every entry in the section when writing out the map +Properties: + _allow_missing: True if this section permits external blobs to be + missing their contents. The second will produce an image but of + course it will not work. + Since a section is also an entry, it inherits all the properies of entries too.
tools/binman/etype/blob_named_by_arg.py +6 -4
@@ -17,7 +17,7 @@ class Entry_blob_named_by_arg(Entry_blob): Properties / Entry arguments: - <xxx>-path: Filename containing the contents of this entry (optional, - defaults to 0) + defaults to None) where <xxx> is the blob_fname argument to the constructor.
@@ -28,7 +28,9 @@ class Entry_blob_named_by_arg(Entry_blob): See cros_ec_rw for an example of this. """ - def __init__(self, section, etype, node, blob_fname): + def __init__(self, section, etype, node, blob_fname, required=False): super().__init__(section, etype, node) - self._filename, = self.GetEntryArgsOrProps( - [EntryArg('%s-path' % blob_fname, str)]) + filename, = self.GetEntryArgsOrProps( + [EntryArg('%s-path' % blob_fname, str)], required=required) + if filename: + self._filename = filename
tools/binman/etype/cros_ec_rw.py +1 -2
@@ -7,7 +7,6 @@ from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg - class Entry_cros_ec_rw(Entry_blob_named_by_arg): """A blob entry which contains a Chromium OS read-write EC image
@@ -18,5 +17,5 @@ class Entry_cros_ec_rw(Entry_blob_named_by_arg): updating the EC on startup via software sync. """ def __init__(self, section, etype, node): - super().__init__(section, etype, node, 'cros-ec-rw') + super().__init__(section, etype, node, 'cros-ec-rw', required=True) self.external = True
tools/binman/ftest.py +11 -4
@@ -1382,8 +1382,9 @@ class TestFunctional(unittest.TestCase): } with self.assertRaises(ValueError) as e: self._DoReadFileDtb('064_entry_args_required.dts') - self.assertIn("Node '/binman/_testing': Missing required " - 'properties/entry args: test-str-arg, test-int-fdt, test-int-arg', + self.assertIn("Node '/binman/_testing': " + 'Missing required properties/entry args: test-str-arg, ' + 'test-int-fdt, test-int-arg', str(e.exception)) def testEntryArgsInvalidFormat(self):
@@ -1487,8 +1488,7 @@ class TestFunctional(unittest.TestCase): entry_args = { 'cros-ec-rw-path': 'ecrw.bin', } - data, _, _, _ = self._DoReadFileDtb('068_blob_named_by_arg.dts', - entry_args=entry_args) + self._DoReadFileDtb('068_blob_named_by_arg.dts', entry_args=entry_args) def testFill(self): """Test for an fill entry type"""
@@ -3523,5 +3523,12 @@ class TestFunctional(unittest.TestCase): err = stderr.getvalue() self.assertRegex(err, "Image 'main-section'.*missing.*: blob-ext") + def testBlobNamedByArgMissing(self): + """Test handling of a missing entry arg""" + with self.assertRaises(ValueError) as e: + self._DoReadFile('068_blob_named_by_arg.dts') + self.assertIn("Missing required properties/entry args: cros-ec-rw-path", + str(e.exception)) + if __name__ == "__main__": unittest.main()
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 1/12 binman: Allow entry args to be required
If an entry argument is needed by an entry but the entry argument is not present, then a strange error can occur when trying to read the file.
Fix this by allowing arguments to be required. Select this option for the cros-ec-rw entry. If a filename is provided in the node, allow that to be used.
Also tidy up a few related tests to make the error string easier to find, and fully ignore unused return values.
---
(no changes since v1)
tools/binman/README.entries | 7 ++++++- tools/binman/etype/blob_named_by_arg.py | 10 ++++++---- tools/binman/etype/cros_ec_rw.py | 3 +-- tools/binman/ftest.py | 15 +++++++++++---- 4 files changed, 24 insertions(+), 11 deletions(-)
Applied to u-boot-dm/next, thanks!
PATCH v3 1/12 binman: Allow entry args to be required
Hi Simon,
Quoted 15 lines · Simon Glass
If an entry argument is needed by an entry but the entry argument is not present, then a strange error can occur when trying to read the file.
Fix this by allowing arguments to be required. Select this option for the cros-ec-rw entry. If a filename is provided in the node, allow that to be used.
Also tidy up a few related tests to make the error string easier to find, and fully ignore unused return values.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v1)
Quoted 7 lines
tools/binman/README.entries | 7 ++++++- tools/binman/etype/blob_named_by_arg.py | 10 ++++++---- tools/binman/etype/cros_ec_rw.py | 3 +-- tools/binman/ftest.py | 15 +++++++++++---- 4 files changed, 24 insertions(+), 11 deletions(-)Applied to u-boot-dm/next, thanks!
Did you start to use patman for sending this?
Just curios because I am missing indentation in origin message.
Thanks,
Michal
PATCH v3 1/12 binman: Allow entry args to be required
Hi Michal,
Quoted 25 lines · Michal Simek
Hi Simon,
Quoted 21 lines · Simon Glass
If an entry argument is needed by an entry but the entry argument is not present, then a strange error can occur when trying to read the file.
Fix this by allowing arguments to be required. Select this option for the cros-ec-rw entry. If a filename is provided in the node, allow that to be used.
Also tidy up a few related tests to make the error string easier to find, and fully ignore unused return values.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v1)
tools/binman/README.entries | 7 ++++++- tools/binman/etype/blob_named_by_arg.py | 10 ++++++---- tools/binman/etype/cros_ec_rw.py | 3 +-- tools/binman/ftest.py | 15 +++++++++++---- 4 files changed, 24 insertions(+), 11 deletions(-)
Quoted 4 lines
Quoted 1 line
Applied to u-boot-dm/next, thanks!
Did you start to use patman for sending this?
Just curios because I am missing indentation in origin message.
No that is done with a gmail script. It would be interesting to use patman though. I am using patman to collect review tags from patchwork, so using it to send out the 'applied' emails would help complete the circle.
Regards,
Simon
PATCH v3 2/12 binman: Fix up a few missing comments
In reply to Simon GlassTidy up a few test functions which lack argument comments. Rename one that has the same name as a different test.
Also fix up the comment for PrepareImagesAndDtbs().
---
(no changes since v1)
tools/binman/control.py | 5 +++++ tools/binman/ftest.py | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)
tools/binman/control.py +5 -0
@@ -346,6 +346,11 @@ def PrepareImagesAndDtbs(dtb_fname, select_images, update_fdt): dtb_fname: Filename of the device tree file to use (.dts or .dtb) selected_images: List of images to output, or None for all update_fdt: True to update the FDT wth entry offsets, etc. + + Returns: + OrderedDict of images: + key: Image name (str) + value: Image object """ # Import these here in case libfdt.py is not available, in which case # the above help option still works.
tools/binman/ftest.py +21 -1
@@ -298,6 +298,13 @@ class TestFunctional(unittest.TestCase): key: arg name value: value of that arg images: List of image names to build + use_real_dtb: True to use the test file as the contents of + the u-boot-dtb entry. Normally this is not needed and the + test contents (the U_BOOT_DTB_DATA string) can be used. + But in some test we need the real contents. + verbosity: Verbosity level to use (0-3, None=don't set it) + allow_missing: Set the '--allow-missing' flag so that missing + external binaries just produce a warning instead of an error """ args = [] if debug:
@@ -357,6 +364,13 @@ class TestFunctional(unittest.TestCase): We still want the DTBs for SPL and TPL to be different though, since otherwise it is confusing to know which one we are looking at. So add an 'spl' or 'tpl' property to the top-level node. + + Args: + dtb_data: dtb data to modify (this should be a value devicetree) + name: Name of a new property to add + + Returns: + New dtb data with the property added """ dtb = fdt.Fdt.FromData(dtb_data) dtb.Scan()
@@ -384,6 +398,12 @@ class TestFunctional(unittest.TestCase): map: True to output map files for the images update_dtb: Update the offset and size of each entry in the device tree before packing it into the image + entry_args: Dict of entry args to supply to binman + key: arg name + value: value of that arg + reset_dtbs: With use_real_dtb the test dtb is overwritten by this + function. If reset_dtbs is True, then the original test dtb + is written back before this function finishes Returns: Tuple:
@@ -3467,7 +3487,7 @@ class TestFunctional(unittest.TestCase): self.assertEqual(len(U_BOOT_SPL_DTB_DATA), int(data_sizes[1].split()[0])) def testFitExternal(self): - """Test an image with an FIT""" + """Test an image with an FIT with external images""" data = self._DoReadFile('162_fit_external.dts') fit_data = data[len(U_BOOT_DATA):-2] # _testing is 2 bytes
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 2/12 binman: Fix up a few missing comments
Tidy up a few test functions which lack argument comments. Rename one that has the same name as a different test.
Also fix up the comment for PrepareImagesAndDtbs().
---
(no changes since v1)
tools/binman/control.py | 5 +++++ tools/binman/ftest.py | 22 +++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-)
Applied to u-boot-dm/next, thanks!
PATCH v3 3/12 libfdt: Detected out-of-space with fdt_finish()
In reply to Simon GlassAt present the Python sequential-write interface can produce an error when it calls fdt_finish(), since this needs to add a terminating tag to the end of the struct section.
Fix this by automatically expanding the buffer if needed.
---
(no changes since v1)
scripts/dtc/pylibfdt/libfdt.i_shipped | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/dtc/pylibfdt/libfdt.i_shipped +2 -1
@@ -786,7 +786,8 @@ class FdtSw(FdtRo): Fdt object allowing access to the newly created device tree """ fdtsw = bytearray(self._fdt) - check_err(fdt_finish(fdtsw)) + while self.check_space(fdt_finish(fdtsw)): + fdtsw = bytearray(self._fdt) return Fdt(fdtsw) def check_space(self, val):
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 3/12 libfdt: Detected out-of-space with fdt_finish()
At present the Python sequential-write interface can produce an error when it calls fdt_finish(), since this needs to add a terminating tag to the end of the struct section.
Fix this by automatically expanding the buffer if needed.
---
(no changes since v1)
scripts/dtc/pylibfdt/libfdt.i_shipped | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Applied to u-boot-dm/next, thanks!
PATCH v3 4/12 binman: Move 'external' support into base class
In reply to Simon GlassAt present we have an Entry_blob_ext which implement a blob which holds an external binary. We need to support other entry types that hold external binaries, e.g. Entry_blob_named_by_arg. Move the support into the base Entry class to allow this.
---
(no changes since v2)
Changes in v2:
- Add new patch to move 'external' support into base class
tools/binman/README.entries | 2 +- tools/binman/entry.py | 14 ++++++++++++++ tools/binman/etype/blob.py | 8 +++++++- tools/binman/etype/blob_ext.py | 11 ----------- tools/binman/etype/section.py | 14 ++------------ 5 files changed, 24 insertions(+), 25 deletions(-)
tools/binman/README.entries +1 -1
@@ -692,7 +692,7 @@ Properties / Entry arguments: (see binman README for more information) when writing out the map Properties: - _allow_missing: True if this section permits external blobs to be + allow_missing: True if this section permits external blobs to be missing their contents. The second will produce an image but of course it will not work.
tools/binman/entry.py +14 -0
@@ -57,6 +57,10 @@ class Entry(object): compress: Compression algoithm used (e.g. 'lz4'), 'none' if none orig_offset: Original offset value read from node orig_size: Original size value read from node + missing: True if this entry is missing its contents + allow_missing: Allow children of this entry to be missing (used by + subclasses such as Entry_section) + external: True if this entry contains an external binary blob """ def __init__(self, section, etype, node, name_prefix=''): # Put this here to allow entry-docs and help to work without libfdt
@@ -83,6 +87,8 @@ class Entry(object): self._expand_size = False self.compress = 'none' self.missing = False + self.external = False + self.allow_missing = False @staticmethod def Lookup(node_path, etype):
@@ -813,3 +819,11 @@ features to produce new behaviours. """ if self.missing: missing_list.append(self) + + def GetAllowMissing(self): + """Get whether a section allows missing external blobs + + Returns: + True if allowed, False if not allowed + """ + return self.allow_missing
tools/binman/etype/blob.py +7 -1
@@ -37,7 +37,13 @@ class Entry_blob(Entry): def ObtainContents(self): self._filename = self.GetDefaultFilename() - self._pathname = tools.GetInputFilename(self._filename) + self._pathname = tools.GetInputFilename(self._filename, + self.section.GetAllowMissing()) + # Allow the file to be missing + if self.external and not self._pathname: + self.SetContents(b'') + self.missing = True + return True self.ReadBlobContents() return True
tools/binman/etype/blob_ext.py +0 -11
@@ -26,14 +26,3 @@ class Entry_blob_ext(Entry_blob): def __init__(self, section, etype, node): Entry_blob.__init__(self, section, etype, node) self.external = True - - def ObtainContents(self): - self._filename = self.GetDefaultFilename() - self._pathname = tools.GetInputFilename(self._filename, - self.section.GetAllowMissing()) - # Allow the file to be missing - if not self._pathname: - self.SetContents(b'') - self.missing = True - return True - return super().ObtainContents()
tools/binman/etype/section.py +2 -12
@@ -35,7 +35,7 @@ class Entry_section(Entry): when writing out the map Properties: - _allow_missing: True if this section permits external blobs to be + allow_missing: True if this section permits external blobs to be missing their contents. The second will produce an image but of course it will not work.
@@ -54,8 +54,6 @@ class Entry_section(Entry): self._sort = False self._skip_at_start = None self._end_4gb = False - self._allow_missing = False - self.missing = False def ReadNode(self): """Read properties from the image node"""
@@ -549,18 +547,10 @@ class Entry_section(Entry): Args: allow_missing: True if allowed, False if not allowed """ - self._allow_missing = allow_missing + self.allow_missing = allow_missing for entry in self._entries.values(): entry.SetAllowMissing(allow_missing) - def GetAllowMissing(self): - """Get whether a section allows missing external blobs - - Returns: - True if allowed, False if not allowed - """ - return self._allow_missing - def CheckMissing(self, missing_list): """Check if any entries in this section have missing external blobs
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 4/12 binman: Move 'external' support into base class
At present we have an Entry_blob_ext which implement a blob which holds an external binary. We need to support other entry types that hold external binaries, e.g. Entry_blob_named_by_arg. Move the support into the base Entry class to allow this.
---
(no changes since v2)
Changes in v2:
- Add new patch to move 'external' support into base class
tools/binman/README.entries | 2 +- tools/binman/entry.py | 14 ++++++++++++++ tools/binman/etype/blob.py | 8 +++++++- tools/binman/etype/blob_ext.py | 11 ----------- tools/binman/etype/section.py | 14 ++------------ 5 files changed, 24 insertions(+), 25 deletions(-)
Applied to u-boot-dm/next, thanks!
PATCH v3 5/12 binman: Add support for ATF BL31
In reply to Simon GlassAdd an entry for ARM Trusted Firmware's 'BL31' payload, which is the device's main firmware. Typically this is U-Boot.
---
Changes in v3:
- Rebase on top of earlier binman series
Changes in v2:
- Add the URL of ARM Trusted Firmware and mention of U-Boot docs
- Fix copyright year
- Update docs to indicate that BL31 is loaded from SPL
- Update docs to mention both bl31.bin and bl31.elf
tools/binman/README.entries | 14 ++++++++++++++ tools/binman/etype/atf_bl31.py | 24 ++++++++++++++++++++++++ tools/binman/ftest.py | 9 +++++++++ tools/binman/test/169_atf_bl31.dts | 16 ++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 tools/binman/etype/atf_bl31.py create mode 100644 tools/binman/test/169_atf_bl31.dts
tools/binman/README.entries +14 -0
@@ -11,6 +11,20 @@ features to produce new behaviours. +Entry: atf-bl31: Entry containing an ARM Trusted Firmware (ATF) BL31 blob +------------------------------------------------------------------------- + +Properties / Entry arguments: + - atf-bl31-path: Filename of file to read into entry. This is typically + called bl31.bin or bl31.elf + +This entry holds the run-time firmware, typically started by U-Boot SPL. +See the U-Boot README for your architecture or board for how to use it. See +https://github.com/ARM-software/arm-trusted-firmware for more information +about ATF. + + + Entry: blob: Entry containing an arbitrary binary blob ------------------------------------------------------
tools/binman/etype/atf_bl31.py new file +24 -0
@@ -0,0 +1,24 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright 2020 Google LLC +# Written by Simon Glass <[email protected]> +# +# Entry-type module for Intel Management Engine binary blob +# + +from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg + +class Entry_atf_bl31(Entry_blob_named_by_arg): + """Entry containing an ARM Trusted Firmware (ATF) BL31 blob + + Properties / Entry arguments: + - atf-bl31-path: Filename of file to read into entry. This is typically + called bl31.bin or bl31.elf + + This entry holds the run-time firmware, typically started by U-Boot SPL. + See the U-Boot README for your architecture or board for how to use it. See + https://github.com/ARM-software/arm-trusted-firmware for more information + about ATF. + """ + def __init__(self, section, etype, node): + super().__init__(section, etype, node, 'atf-bl31') + self.external = True
tools/binman/ftest.py +9 -0
@@ -74,6 +74,7 @@ REFCODE_DATA = b'refcode' FSP_M_DATA = b'fsp_m' FSP_S_DATA = b'fsp_s' FSP_T_DATA = b'fsp_t' +ATF_BL31_DATA = b'bl31' # The expected size for the device tree in some tests EXTRACT_DTB_SIZE = 0x3c9
@@ -167,6 +168,7 @@ class TestFunctional(unittest.TestCase): os.path.join(cls._indir, 'files')) TestFunctional._MakeInputFile('compress', COMPRESS_DATA) + TestFunctional._MakeInputFile('bl31.bin', ATF_BL31_DATA) # Travis-CI may have an old lz4 cls.have_lz4 = True
@@ -3550,5 +3552,12 @@ class TestFunctional(unittest.TestCase): self.assertIn("Missing required properties/entry args: cros-ec-rw-path", str(e.exception)) + def testPackBl31(self): + """Test that an image with an ATF BL31 binary can be created""" + data = self._DoReadFile('169_atf_bl31.dts') + self.assertEqual(ATF_BL31_DATA, data[:len(ATF_BL31_DATA)]) + +ATF_BL31_DATA + if __name__ == "__main__": unittest.main()
tools/binman/test/169_atf_bl31.dts new file +16 -0
@@ -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"; + }; + }; +};
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 5/12 binman: Add support for ATF BL31
Add an entry for ARM Trusted Firmware's 'BL31' payload, which is the device's main firmware. Typically this is U-Boot.
---
Changes in v3:
- Rebase on top of earlier binman series
Changes in v2:
- Add the URL of ARM Trusted Firmware and mention of U-Boot docs
- Fix copyright year
- Update docs to indicate that BL31 is loaded from SPL
- Update docs to mention both bl31.bin and bl31.elf
tools/binman/README.entries | 14 ++++++++++++++ tools/binman/etype/atf_bl31.py | 24 ++++++++++++++++++++++++ tools/binman/ftest.py | 9 +++++++++ tools/binman/test/169_atf_bl31.dts | 16 ++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 tools/binman/etype/atf_bl31.py create mode 100644 tools/binman/test/169_atf_bl31.dts
Applied to u-boot-dm/next, thanks!
Samuel Holland
maintainerPATCH v3 5/12 binman: Add support for ATF BL31
In reply to Simon GlassQuoted 15 lines · Simon Glass
Add an entry for ARM Trusted Firmware's 'BL31' payload, which is the device's main firmware. Typically this is U-Boot.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Rebase on top of earlier binman seriesChanges in v2:
- Add the URL of ARM Trusted Firmware and mention of U-Boot docs
- Fix copyright year
- Update docs to indicate that BL31 is loaded from SPL
- Update docs to mention both bl31.bin and bl31.elf
Quoted 7 lines
tools/binman/README.entries | 14 ++++++++++++++ tools/binman/etype/atf_bl31.py | 24 ++++++++++++++++++++++++ tools/binman/ftest.py | 9 +++++++++ tools/binman/test/169_atf_bl31.dts | 16 ++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 tools/binman/etype/atf_bl31.py create mode 100644 tools/binman/test/169_atf_bl31.dts
Does this mean every kind of firmware blob referenced by FIT generator scripts (TEE fimware, SCP firmware, OpenSBI firmware, etc.) needs its own Python package?
What if you need multiple versions of ATF BL31 and TEE firmware for different configurations, like Rockchip currently does? You would need dynamic argument names, but then how do you get them in the Makefile?
This approach doesn't seem very flexible or scalable.
Why not have a generic Entry_blob_named_by_env, with a "filename-var" (or similar) property in addition to "filename"? Then the existing interface of the FIT generator scripts could be maintained without tons of boilerplate.
PATCH v3 5/12 binman: Add support for ATF BL31
Hi Samuel,
Quoted 25 lines · Samuel Holland
Quoted 15 lines · Simon Glass
Add an entry for ARM Trusted Firmware's 'BL31' payload, which is the device's main firmware. Typically this is U-Boot.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Rebase on top of earlier binman seriesChanges in v2:
- Add the URL of ARM Trusted Firmware and mention of U-Boot docs
- Fix copyright year
- Update docs to indicate that BL31 is loaded from SPL
- Update docs to mention both bl31.bin and bl31.elfQuoted 7 lines
tools/binman/README.entries | 14 ++++++++++++++ tools/binman/etype/atf_bl31.py | 24 ++++++++++++++++++++++++ tools/binman/ftest.py | 9 +++++++++ tools/binman/test/169_atf_bl31.dts | 16 ++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 tools/binman/etype/atf_bl31.py create mode 100644 tools/binman/test/169_atf_bl31.dts
Quoted 2 lines
Does this mean every kind of firmware blob referenced by FIT generator scripts (TEE fimware, SCP firmware, OpenSBI firmware, etc.) needs its own Python package?
No, but in general I would like to do that if possible. It is easier that having random filenames in the description.
Quoted 3 lines
What if you need multiple versions of ATF BL31 and TEE firmware for different configurations, like Rockchip currently does?
You can always specify a filename in the node.
Quoted 2 lines
You would need dynamic argument
names, but then how do you get them in theMakefile?
Using the -a flag.
Quoted 6 lines
This approach doesn't seem very flexible or scalable.
Why not have a generic
Entry_blob_named_by_env, with a "filename-var" (or similar) property in addition to "filename"? Then the existing interface of the FIT generator scripts could be maintained without tons of boilerplate.
You can do that if you like (see blob-named-by-arg and -a), but the idea with binman is that it knows how to deal with various types of binaries, and each one has a name. This makes it easier to see what is going on, I think.
Also we get documentation about each binary type in README.entries
Regards,
Simon
PATCH v3 6/12 binman: Support generating FITs with multiple dtbs
In reply to Simon GlassIn some cases it is useful to generate a FIT which has a number of DTB images, selectable by configuration. Add support for this in binman, using a simple iterator and string substitution.
---
Changes in v3:
- Rebase on top of earlier binman series
Changes in v2:
- Add a check for a missing fit,fdt-list property
- Add a check for a missing of-list property
- Add a check for an empty of-list
tools/binman/README.entries | 48 +++++++- tools/binman/etype/fit.py | 94 +++++++++++++++- tools/binman/ftest.py | 106 +++++++++++++++++- tools/binman/test/170_fit_fdt.dts | 55 +++++++++ .../binman/test/171_fit_fdt_missing_prop.dts | 54 +++++++++ 5 files changed, 346 insertions(+), 11 deletions(-) create mode 100644 tools/binman/test/170_fit_fdt.dts create mode 100644 tools/binman/test/171_fit_fdt_missing_prop.dts
tools/binman/README.entries +47 -1
@@ -339,6 +339,7 @@ For example, this creates an image containing a FIT with U-Boot SPL: binman { fit { description = "Test FIT"; + fit,fdt-list = "of-list"; images { kernel at 1 {
@@ -357,7 +358,52 @@ For example, this creates an image containing a FIT with U-Boot SPL: }; }; -Properties: +U-Boot supports creating fdt and config nodes automatically. To do this, +pass an of-list property (e.g. -a of-list=file1 file2). This tells binman +that you want to generates nodes for two files: file1.dtb and file2.dtb +The fit,fdt-list property (see above) indicates that of-list should be used. +If the property is missing you will get an error. + +Then add a 'generator node', a node with a name starting with '@': + + images { + @fdt-SEQ { + description = "fdt-NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + +This tells binman to create nodes fdt-1 and fdt-2 for each of your two +files. All the properties you specify will be included in the node. This +node acts like a template to generate the nodes. The generator node itself +does not appear in the output - it is replaced with what binman generates. + +You can create config nodes in a similar way: + + configurations { + default = "@config-DEFAULT-SEQ"; + @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ"; + }; + }; + +This tells binman to create nodes config-1 and config-2, i.e. a config for +each of your two files. + +Available substitutions for '@' nodes are: + + SEQ Sequence number of the generated fdt (1, 2, ...) + NAME Name of the dtb as provided (i.e. without adding '.dtb') + +Note that if no devicetree files are provided (with '-a of-list' as above) +then no nodes will be generated. + + +Properties (in the 'fit' node itself): fit,external-offset: Indicates that the contents of the FIT are external and provides the external offset. This is passsed to mkimage via the -E and -p flags.
tools/binman/etype/fit.py +88 -6
133 lines not on this page · raw message
tools/binman/ftest.py +102 -4
160 lines not on this page · raw message
tools/binman/test/170_fit_fdt.dts new file +55 -0
55 lines not on this page · raw message
tools/binman/test/171_fit_fdt_missing_prop.dts new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 6/12 binman: Support generating FITs with multiple dtbs
In some cases it is useful to generate a FIT which has a number of DTB images, selectable by configuration. Add support for this in binman, using a simple iterator and string substitution.
---
Changes in v3:
- Rebase on top of earlier binman series
Changes in v2:
- Add a check for a missing fit,fdt-list property
- Add a check for a missing of-list property
- Add a check for an empty of-list
tools/binman/README.entries | 48 +++++++- tools/binman/etype/fit.py | 94 +++++++++++++++- tools/binman/ftest.py | 106 +++++++++++++++++- tools/binman/test/170_fit_fdt.dts | 55 +++++++++ .../binman/test/171_fit_fdt_missing_prop.dts | 54 +++++++++ 5 files changed, 346 insertions(+), 11 deletions(-) create mode 100644 tools/binman/test/170_fit_fdt.dts create mode 100644 tools/binman/test/171_fit_fdt_missing_prop.dts
Applied to u-boot-dm/next, thanks!
Samuel Holland
maintainerPATCH v3 6/12 binman: Support generating FITs with multiple dtbs
In reply to Simon GlassQuoted 23 lines · Simon Glass
In some cases it is useful to generate a FIT which has a number of DTB images, selectable by configuration. Add support for this in binman, using a simple iterator and string substitution.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Rebase on top of earlier binman seriesChanges in v2:
- Add a check for a missing fit,fdt-list property
- Add a check for a missing of-list property
- Add a check for an empty of-listtools/binman/README.entries | 48 +++++++- tools/binman/etype/fit.py | 94 +++++++++++++++- tools/binman/ftest.py | 106 +++++++++++++++++- tools/binman/test/170_fit_fdt.dts | 55 +++++++++ .../binman/test/171_fit_fdt_missing_prop.dts | 54 +++++++++ 5 files changed, 346 insertions(+), 11 deletions(-) create mode 100644 tools/binman/test/170_fit_fdt.dts create mode 100644 tools/binman/test/171_fit_fdt_missing_prop.dts
[snip]
Quoted 15 lines
tools/binman/README.entries +10
-1@@ -357,7 +358,52 @@ For example, this creates an image containing a FIT with U-Boot SPL: }; }; -Properties: +U-Boot supports creating fdt and config nodes automatically. To do this, +pass an of-list property (e.g. -a of-list=file1 file2). This tells binman +that you want to generates nodes for two files: file1.dtb and file2.dtb +The fit,fdt-list property (see above) indicates that of-list should be used. +If the property is missing you will get an error. + +Then add a 'generator node', a node with a name starting with '@': + + images { + @fdt-SEQ {
tools/binman/README.entries For example, this creates an image containing a FIT with U-Boot SPL: · line 380
Quoted 10 lines
tools/binman/README.entries +10
-0+ description = "fdt-NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + +This tells binman to create nodes fdt-1 and fdt-2 for each of your two +files. All the properties you specify will be included in the node. This +node acts like a template to generate the nodes. The generator node itself +does not appear in the output - it is replaced with what binman generates.
Is this output written anywhere? The compiled DTB has the unprocessed template in it, and the final image created by binman requires some dissection to get to the FIT ITS.
Quoted 10 lines
tools/binman/README.entries +10
-0+ +You can create config nodes in a similar way: + + configurations { + default = "@config-DEFAULT-SEQ"; + @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ";
tools/binman/README.entries For example, this creates an image containing a FIT with U-Boot SPL: · line 400
Quoted 10 lines
tools/binman/README.entries +10
-0+ }; + }; + +This tells binman to create nodes config-1 and config-2, i.e. a config for +each of your two files. + +Available substitutions for '@' nodes are: + + SEQ Sequence number of the generated fdt (1, 2, ...) + NAME Name of the dtb as provided (i.e. without adding '.dtb')
There is no mention of DEFAULT-SEQ here.
Quoted 9 lines
tools/binman/README.entries +6
-0+ +Note that if no devicetree files are provided (with '-a of-list' as above) +then no nodes will be generated. + + +Properties (in the 'fit' node itself): fit,external-offset: Indicates that the contents of the FIT are external and provides the external offset. This is passsed to mkimage via the -E and -p flags.
[snip]
Samuel Holland
maintainerPATCH v3 6/12 binman: Support generating FITs with multiple dtbs
Quoted 71 lines · Samuel Holland
Quoted 23 lines · Simon Glass
In some cases it is useful to generate a FIT which has a number of DTB images, selectable by configuration. Add support for this in binman, using a simple iterator and string substitution.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Rebase on top of earlier binman seriesChanges in v2:
- Add a check for a missing fit,fdt-list property
- Add a check for a missing of-list property
- Add a check for an empty of-listtools/binman/README.entries | 48 +++++++- tools/binman/etype/fit.py | 94 +++++++++++++++- tools/binman/ftest.py | 106 +++++++++++++++++- tools/binman/test/170_fit_fdt.dts | 55 +++++++++ .../binman/test/171_fit_fdt_missing_prop.dts | 54 +++++++++ 5 files changed, 346 insertions(+), 11 deletions(-) create mode 100644 tools/binman/test/170_fit_fdt.dts create mode 100644 tools/binman/test/171_fit_fdt_missing_prop.dts[snip]
Quoted 15 lines
tools/binman/README.entries +10
-1@@ -357,7 +358,52 @@ For example, this creates an image containing a FIT with U-Boot SPL: }; }; -Properties: +U-Boot supports creating fdt and config nodes automatically. To do this, +pass an of-list property (e.g. -a of-list=file1 file2). This tells binman +that you want to generates nodes for two files: file1.dtb and file2.dtb +The fit,fdt-list property (see above) indicates that of-list should be used. +If the property is missing you will get an error. + +Then add a 'generator node', a node with a name starting with '@': + + images { + @fdt-SEQ {tools/binman/README.entries For example, this creates an image containing a FIT with U-Boot SPL: · line 380
Quoted 10 lines
tools/binman/README.entries +10
-0+ description = "fdt-NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + +This tells binman to create nodes fdt-1 and fdt-2 for each of your two +files. All the properties you specify will be included in the node. This +node acts like a template to generate the nodes. The generator node itself +does not appear in the output - it is replaced with what binman generates.Is this output written anywhere? The compiled DTB has the unprocessed template in it, and the final image created by binman requires some dissection to get to the FIT ITS.
Quoted 14 lines
tools/binman/README.entries +14
-0+ +You can create config nodes in a similar way: + + configurations { + default = "@config-DEFAULT-SEQ"; + @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ"; + }; + }; + +This tells binman to create nodes config-1 and config-2, i.e. a config for
Quoted 8 lines
tools/binman/README.entries For example, this creates an image containing a FIT with U-Boot SPL: · line 400
Quoted 6 lines
tools/binman/README.entries +6
-0+each of your two files. + +Available substitutions for '@' nodes are: + + SEQ Sequence number of the generated fdt (1, 2, ...) + NAME Name of the dtb as provided (i.e. without adding '.dtb')There is no mention of DEFAULT-SEQ here.
I see now that you added DEFAULT-SEQ in a later patch, even though it's present in the example above(?). The comment here and on the sunxi dtsi still apply, whichever patch the change should go in.
Quoted 12 lines
Quoted 9 lines
tools/binman/README.entries +6
-0+ +Note that if no devicetree files are provided (with '-a of-list' as above) +then no nodes will be generated. + + +Properties (in the 'fit' node itself): fit,external-offset: Indicates that the contents of the FIT are external and provides the external offset. This is passsed to mkimage via the -E and -p flags.[snip]
PATCH v3 6/12 binman: Support generating FITs with multiple dtbs
Hi Samuel,
Quoted 82 lines · Samuel Holland
Quoted 71 lines · Samuel Holland
Quoted 23 lines · Simon Glass
In some cases it is useful to generate a FIT which has a number of DTB images, selectable by configuration. Add support for this in binman, using a simple iterator and string substitution.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Rebase on top of earlier binman seriesChanges in v2:
- Add a check for a missing fit,fdt-list property
- Add a check for a missing of-list property
- Add a check for an empty of-listtools/binman/README.entries | 48 +++++++- tools/binman/etype/fit.py | 94 +++++++++++++++- tools/binman/ftest.py | 106 +++++++++++++++++- tools/binman/test/170_fit_fdt.dts | 55 +++++++++ .../binman/test/171_fit_fdt_missing_prop.dts | 54 +++++++++ 5 files changed, 346 insertions(+), 11 deletions(-) create mode 100644 tools/binman/test/170_fit_fdt.dts create mode 100644 tools/binman/test/171_fit_fdt_missing_prop.dts[snip]
Quoted 15 lines
tools/binman/README.entries +10
-1@@ -357,7 +358,52 @@ For example, this creates an image containing a FIT with U-Boot SPL: }; }; -Properties: +U-Boot supports creating fdt and config nodes automatically. To do this, +pass an of-list property (e.g. -a of-list=file1 file2). This tells binman +that you want to generates nodes for two files: file1.dtb and file2.dtb +The fit,fdt-list property (see above) indicates that of-list should be used. +If the property is missing you will get an error. + +Then add a 'generator node', a node with a name starting with '@': + + images { + @fdt-SEQ {tools/binman/README.entries For example, this creates an image containing a FIT with U-Boot SPL: · line 380
Quoted 10 lines
tools/binman/README.entries +10
-0+ description = "fdt-NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + +This tells binman to create nodes fdt-1 and fdt-2 for each of your two +files. All the properties you specify will be included in the node. This +node acts like a template to generate the nodes. The generator node itself +does not appear in the output - it is replaced with what binman generates.Is this output written anywhere? The compiled DTB has the unprocessed template in it, and the final image created by binman requires some dissection to get to the FIT ITS.
Quoted 14 lines
tools/binman/README.entries +14
-0+ +You can create config nodes in a similar way: + + configurations { + default = "@config-DEFAULT-SEQ"; + @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ"; + }; + }; + +This tells binman to create nodes config-1 and config-2, i.e. a config forQuoted 8 lines
tools/binman/README.entries For example, this creates an image containing a FIT with U-Boot SPL: · line 400
Quoted 6 lines
tools/binman/README.entries +6
-0+each of your two files. + +Available substitutions for '@' nodes are: + + SEQ Sequence number of the generated fdt (1, 2, ...) + NAME Name of the dtb as provided (i.e. without adding '.dtb')There is no mention of DEFAULT-SEQ here.
Quoted 3 lines
I see now that you added DEFAULT-SEQ in a later patch, even though it's present in the example above(?). The comment here and on the sunxi dtsi still apply, whichever patch the change should go in.
OK. Well the existing has something that is documented in a later patch, unfortunately.
Quoted 14 lines
Quoted 13 lines
Quoted 10 lines
tools/binman/README.entries +6
-0+ +Note that if no devicetree files are provided (with '-a of-list' as above) +then no nodes will be generated. + + +Properties (in the 'fit' node itself): fit,external-offset: Indicates that the contents of the FIT are external and provides the external offset. This is passsed to mkimage via the -E and -p flags.[snip]
Regards,
Simon
PATCH v3 6/12 binman: Support generating FITs with multiple dtbs
In reply to Samuel HollandHi Samuel,
Quoted 49 lines · Samuel Holland
Quoted 23 lines · Simon Glass
In some cases it is useful to generate a FIT which has a number of DTB images, selectable by configuration. Add support for this in binman, using a simple iterator and string substitution.
Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Rebase on top of earlier binman seriesChanges in v2:
- Add a check for a missing fit,fdt-list property
- Add a check for a missing of-list property
- Add a check for an empty of-listtools/binman/README.entries | 48 +++++++- tools/binman/etype/fit.py | 94 +++++++++++++++- tools/binman/ftest.py | 106 +++++++++++++++++- tools/binman/test/170_fit_fdt.dts | 55 +++++++++ .../binman/test/171_fit_fdt_missing_prop.dts | 54 +++++++++ 5 files changed, 346 insertions(+), 11 deletions(-) create mode 100644 tools/binman/test/170_fit_fdt.dts create mode 100644 tools/binman/test/171_fit_fdt_missing_prop.dts[snip]
Quoted 21 lines
tools/binman/README.entries +16
-1@@ -357,7 +358,52 @@ For example, this creates an image containing a FIT with U-Boot SPL: }; }; -Properties: +U-Boot supports creating fdt and config nodes automatically. To do this, +pass an of-list property (e.g. -a of-list=file1 file2). This tells binman +that you want to generates nodes for two files: file1.dtb and file2.dtb +The fit,fdt-list property (see above) indicates that of-list should be used. +If the property is missing you will get an error. + +Then add a 'generator node', a node with a name starting with '@': + + images { + @fdt-SEQ { + description = "fdt-NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; +
Quoted 8 lines
tools/binman/README.entries For example, this creates an image containing a FIT with U-Boot SPL: · line 380
Quoted 4 lines
tools/binman/README.entries +4
-0+This tells binman to create nodes fdt-1 and fdt-2 for each of your two +files. All the properties you specify will be included in the node. This +node acts like a template to generate the nodes. The generator node itself +does not appear in the output - it is replaced with what binman generates.Is this output written anywhere? The compiled DTB has the unprocessed template in it, and the final image created by binman requires some dissection to get to the FIT ITS.
Yes both the input to mkimage and the output are written out. See the build directory for these files, which are named after the node names.
Quoted 15 lines
Quoted 15 lines
tools/binman/README.entries +14
-0+ +You can create config nodes in a similar way: + + configurations { + default = "@config-DEFAULT-SEQ"; + @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ"; + }; + }; + +This tells binman to create nodes config-1 and config-2, i.e. a config for
Quoted 8 lines
tools/binman/README.entries For example, this creates an image containing a FIT with U-Boot SPL: · line 400
Quoted 6 lines
tools/binman/README.entries +6
-0+each of your two files. + +Available substitutions for '@' nodes are: + + SEQ Sequence number of the generated fdt (1, 2, ...) + NAME Name of the dtb as provided (i.e. without adding '.dtb')There is no mention of DEFAULT-SEQ here.
That feature is added in a later patch. I will make sure it is documented here.
Quoted 12 lines
Quoted 10 lines
tools/binman/README.entries +6
-0+ +Note that if no devicetree files are provided (with '-a of-list' as above) +then no nodes will be generated. + + +Properties (in the 'fit' node itself): fit,external-offset: Indicates that the contents of the FIT are external and provides the external offset. This is passsed to mkimage via the -E and -p flags.[snip]
Regards,
Simon
PATCH v3 7/12 Makefile: Support missing external blobs always
In reply to Simon GlassAt present binman warns about missing external blobs only when the BUILD_ROM is defined. Enable this behaviour always, since many boards are starting to use these (e.g. ARM Trusted Firmware's BL31).
---
(no changes since v2)
Changes in v2:
- Add new patch to support missing external blobs always
Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Makefile +1 -2
@@ -1334,8 +1334,7 @@ quiet_cmd_binman = BINMAN $@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ --toolpath $(objtree)/tools \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ - build -u -d u-boot.dtb -O . \ - $(if $(BUILD_ROM),,-m --allow-missing) \ + build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ $(BINMAN_$(@F))
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 7/12 Makefile: Support missing external blobs always
At present binman warns about missing external blobs only when the BUILD_ROM is defined. Enable this behaviour always, since many boards are starting to use these (e.g. ARM Trusted Firmware's BL31).
---
(no changes since v2)
Changes in v2:
- Add new patch to support missing external blobs always
Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Applied to u-boot-dm/next, thanks!
PATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
In reply to Simon GlassAt present 64-bit sunxi boards use the Makefile to create a FIT, using USE_SPL_FIT_GENERATOR. This is deprecated.
Update sunxi to use binman instead.
---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit message
Kconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)
Kconfig +1 -2
@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXI config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCV
Makefile +2 -16
@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin
@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE
@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif - OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) u-boot-app.efi: u-boot FORCE $(call if_changed,zobjcopy)
arch/arm/dts/sunxi-u-boot.dtsi +60 -1
74 lines not on this page · raw message
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
Samuel Holland
maintainerPATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
Quoted 24 lines · Simon Glass
At present 64-bit sunxi boards use the
Makefileto create a FIT, usingUSE_SPL_FIT_GENERATOR. This is deprecated.Update sunxi to use binman instead.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit messageKconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)Kconfig +0
-0
Kconfig config SPL_FIT_SOURCE · line 662
Quoted 5 lines
Kconfig +1
-1@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXI
Now make u-boot.itb doesn't work.
u-boot.itb is helpful to have because, with CONFIG_OF_LIST, it can be shared across all boards of a platform. Only SPL is board-specific (on arm64 sunxi, at least).
Is there a way to make binman also write the FIT without the SPL? Would that require duplicating the whole binman node?
Quoted 47 lines
Kconfig +0
-1config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCVMakefile +2
-9@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
Makefile u-boot-x86-reset16.bin: u-boot FORCE · line 1634
Quoted 10 lines
Makefile +0
-7@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif -
Now make u-boot-sunxi-with-spl.bin doesn't work.
This is less of an issue, but still probably breaks some scripts. It breaks mine, at least.
Quoted 11 lines
Makefile +0
-0OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) u-boot-app.efi: u-boot FORCE $(call if_changed,zobjcopy)arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -5,14 +5,73 @@ mmc1 = &mmc2; };
arch/arm/dts/sunxi-u-boot.dtsi line 16
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +7
-1- binman { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-sunxi-with-spl { filename = "u-boot-sunxi-with-spl.bin"; pad-byte = <0xff>;
style: blank line here (and above "atf" and "@config-SEQ" below).
Quoted 16 lines
arch/arm/dts/sunxi-u-boot.dtsi +13
-0blob { filename = "spl/sunxi-spl.bin"; }; +#ifdef CONFIG_ARM64 + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,fdt-list = "of-list"; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = <0x4a000000>;
arch/arm/dts/sunxi-u-boot.dtsi line 42
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +10
-0+ + u-boot-nodtb { + }; + }; + atf { + description = "ARM Trusted Firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; +/* TODO: Do this with an overwrite in this board's dtb? */
This address is determined by the physical SRAM layout, so it is per-SoC, not per-board. I would suggest omitting load/entry here entirely, and putting them in the $SOC-u-boot.dtsi.
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +10
-0+#ifdef CONFIG_MACH_SUN50I_H6 + load = <0x104000>; + entry = <0x104000>; +#else + load = <0x44000>; + entry = <0x44000>; +#endif + atf-bl31 { + }; + };
arch/arm/dts/sunxi-u-boot.dtsi line 62
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +10
-0+ + @fdt-SEQ { + description = "NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + + configurations { + default = "config-1";
I would expect @DEFAULT-SEQ here.
Quoted 16 lines
arch/arm/dts/sunxi-u-boot.dtsi +10
-0+ @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ"; + }; + }; + }; +#else u-boot-img { offset = <CONFIG_SPL_PAD_TO>; }; +#endif }; };
Samuel Holland
maintainerPATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
Quoted 158 lines · Samuel Holland
Quoted 24 lines · Simon Glass
At present 64-bit sunxi boards use the
Makefileto create a FIT, usingUSE_SPL_FIT_GENERATOR. This is deprecated.Update sunxi to use binman instead.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit messageKconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)Kconfig +0
-0Kconfig config SPL_FIT_SOURCE · line 662
Quoted 5 lines
Kconfig +1
-1@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXINow
make u-boot.itbdoesn't work.u-boot.itb is helpful to have because, with
CONFIG_OF_LIST, it can be shared across all boards of a platform. Only SPL is board-specific (on arm64 sunxi, at least).Is there a way to make binman also write the FIT without the SPL? Would that require duplicating the whole binman node?
Quoted 47 lines
Kconfig +0
-1config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCVMakefile +2
-9@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihexMakefile u-boot-x86-reset16.bin: u-boot FORCE · line 1634
Quoted 10 lines
Makefile +0
-7@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif -Now
make u-boot-sunxi-with-spl.bindoesn't work.This is less of an issue, but still probably breaks some scripts. It breaks mine, at least.
Quoted 11 lines
Makefile +0
-0OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) u-boot-app.efi: u-boot FORCE $(call if_changed,zobjcopy)arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -5,14 +5,73 @@ mmc1 = &mmc2; };arch/arm/dts/sunxi-u-boot.dtsi line 16
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +7
-1- binman { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-sunxi-with-spl { filename = "u-boot-sunxi-with-spl.bin"; pad-byte = <0xff>;style: blank line here (and above "atf" and "@config-SEQ" below).
Quoted 16 lines
arch/arm/dts/sunxi-u-boot.dtsi +13
-0blob { filename = "spl/sunxi-spl.bin"; }; +#ifdef CONFIG_ARM64 + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,fdt-list = "of-list"; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = <0x4a000000>;arch/arm/dts/sunxi-u-boot.dtsi line 42
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +10
-0+ + u-boot-nodtb { + }; + }; + atf { + description = "ARM Trusted Firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; +/* TODO: Do this with an overwrite in this board's dtb? */This address is determined by the physical SRAM layout, so it is per-SoC, not per-board. I would suggest omitting load/entry here entirely, and putting them in the $SOC-u-boot.dtsi.
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi line 50
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi +8
-0+#ifdef CONFIG_MACH_SUN50I_H6 + load = <0x104000>; + entry = <0x104000>; +#else + load = <0x44000>; + entry = <0x44000>; +#endif + atf-bl31 {
Another regression: you need
filename = "bl31.bin";
here to match the behavior when the environment variable is not defined.
Quoted 32 lines
arch/arm/dts/sunxi-u-boot.dtsi line 62
Quoted 12 lines
arch/arm/dts/sunxi-u-boot.dtsi +12
-0+ }; + }; + + @fdt-SEQ { + description = "NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + + configurations { + default = "config-1";I would expect @DEFAULT-SEQ here.
Quoted 16 lines
arch/arm/dts/sunxi-u-boot.dtsi +10
-0+ @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ"; + }; + }; + }; +#else u-boot-img { offset = <CONFIG_SPL_PAD_TO>; }; +#endif }; };
PATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
Hi Samuel,
Quoted 171 lines · Samuel Holland
Quoted 158 lines · Samuel Holland
Quoted 24 lines · Simon Glass
At present 64-bit sunxi boards use the
Makefileto create a FIT, usingUSE_SPL_FIT_GENERATOR. This is deprecated.Update sunxi to use binman instead.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit messageKconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)Kconfig +0
-0Kconfig config SPL_FIT_SOURCE · line 662
Quoted 5 lines
Kconfig +1
-1@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXINow
make u-boot.itbdoesn't work.u-boot.itb is helpful to have because, with
CONFIG_OF_LIST, it can be shared across all boards of a platform. Only SPL is board-specific (on arm64 sunxi, at least).Is there a way to make binman also write the FIT without the SPL? Would that require duplicating the whole binman node?
Quoted 47 lines
Kconfig +0
-1config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCVMakefile +2
-9@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihexMakefile u-boot-x86-reset16.bin: u-boot FORCE · line 1634
Quoted 10 lines
Makefile +0
-7@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif -Now
make u-boot-sunxi-with-spl.bindoesn't work.This is less of an issue, but still probably breaks some scripts. It breaks mine, at least.
Quoted 11 lines
Makefile +0
-0OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) u-boot-app.efi: u-boot FORCE $(call if_changed,zobjcopy)arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -5,14 +5,73 @@ mmc1 = &mmc2; };arch/arm/dts/sunxi-u-boot.dtsi line 16
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +7
-1- binman { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-sunxi-with-spl { filename = "u-boot-sunxi-with-spl.bin"; pad-byte = <0xff>;style: blank line here (and above "atf" and "@config-SEQ" below).
Quoted 16 lines
arch/arm/dts/sunxi-u-boot.dtsi +13
-0blob { filename = "spl/sunxi-spl.bin"; }; +#ifdef CONFIG_ARM64 + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,fdt-list = "of-list"; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = <0x4a000000>;arch/arm/dts/sunxi-u-boot.dtsi line 42
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +10
-0+ + u-boot-nodtb { + }; + }; + atf { + description = "ARM Trusted Firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; +/* TODO: Do this with an overwrite in this board's dtb? */This address is determined by the physical SRAM layout, so it is per-SoC, not per-board. I would suggest omitting load/entry here entirely, and putting them in the $SOC-u-boot.dtsi.
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi line 50
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi +8
-0+#ifdef CONFIG_MACH_SUN50I_H6 + load = <0x104000>; + entry = <0x104000>; +#else + load = <0x44000>; + entry = <0x44000>; +#endif + atf-bl31 {Another regression: you need
Quoted 3 lines
filename = "bl31.bin";here to match the behavior when the environment variable is not defined.
That would be better to go in the code. If U-Boot passes an empty filename to binman then it needs special handling, if we want a default.
Quoted 25 lines
Quoted 25 lines
arch/arm/dts/sunxi-u-boot.dtsi line 62
Quoted 13 lines
arch/arm/dts/sunxi-u-boot.dtsi +12
-0+ }; + }; + + @fdt-SEQ { + description = "NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + + configurations { + default = "config-1";I would expect @DEFAULT-SEQ here.
Quoted 9 lines
arch/arm/dts/sunxi-u-boot.dtsi +9
-0+ @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ"; + }; + }; + }; +#else
Quoted 9 lines
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi line 77
Quoted 7 lines
arch/arm/dts/sunxi-u-boot.dtsi +1
-0u-boot-img { offset = <CONFIG_SPL_PAD_TO>; }; +#endif }; };
Regards,
Simon
PATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
In reply to Samuel HollandHi Samuel,
Quoted 34 lines · Samuel Holland
Quoted 24 lines · Simon Glass
At present 64-bit sunxi boards use the
Makefileto create a FIT, usingUSE_SPL_FIT_GENERATOR. This is deprecated.Update sunxi to use binman instead.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit messageKconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)Kconfig +0
-0Kconfig config SPL_FIT_SOURCE · line 662
Quoted 5 lines
Kconfig +1
-1@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXINow
make u-boot.itbdoesn't work.
Quoted 3 lines
u-boot.itb is helpful to have because, with
CONFIG_OF_LIST, it can be shared across all boards of a platform. Only SPL is board-specific (on arm64 sunxi, at least).
It is generated, just with a different filename.
Quoted 3 lines
Is there a way to make binman also write the FIT without the SPL? Would that require duplicating the whole binman node?
Yes it would. We could get more complicated and allow an image to build on another perhaps. I'm not sure what is easiest here.
Quoted 61 lines
Quoted 48 lines
Kconfig +0
-1config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCVMakefile +2
-9@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihexMakefile u-boot-x86-reset16.bin: u-boot FORCE · line 1634
Quoted 10 lines
Makefile +0
-7@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif -Now
make u-boot-sunxi-with-spl.bindoesn't work.
Quoted 2 lines
This is less of an issue, but still probably breaks some scripts. It breaks mine, at least.
Why do you specify a target? Doesn't it build the file without the target?
One problem with buildman is that there is no definitely of what files it will produce when run, or at least there is, but it is in the binman description itself.
This means that 'make clean' doesn't work fully, for example. I can think of a few ways to implement this. One would be to put a list of target files into a text file and have 'make clean' use that. We could also have an option to tell binman to produce a list of files it would generate if run. Then we might be able to tell binman to generate a particular file.
Quoted 12 lines
Quoted 12 lines
Makefile +0
-0OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) u-boot-app.efi: u-boot FORCE $(call if_changed,zobjcopy)arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -5,14 +5,73 @@ mmc1 = &mmc2; };
Quoted 12 lines
arch/arm/dts/sunxi-u-boot.dtsi line 16
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +7
-1- binman { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-sunxi-with-spl { filename = "u-boot-sunxi-with-spl.bin"; pad-byte = <0xff>;style: blank line here (and above "atf" and "@config-SEQ" below).
I'll send a fix-up patch.
Quoted 23 lines
Quoted 23 lines
arch/arm/dts/sunxi-u-boot.dtsi +19
-0blob { filename = "spl/sunxi-spl.bin"; }; +#ifdef CONFIG_ARM64 + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,fdt-list = "of-list"; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = <0x4a000000>; + + u-boot-nodtb { + }; + }; + atf { + description = "ARM Trusted Firmware";
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi line 42
Quoted 4 lines
arch/arm/dts/sunxi-u-boot.dtsi +4
-0+ type = "firmware"; + arch = "arm64"; + compression = "none"; +/* TODO: Do this with an overwrite in this board's dtb? */This address is determined by the physical SRAM layout, so it is per-SoC, not per-board. I would suggest omitting load/entry here entirely, and putting them in the $SOC-u-boot.dtsi.
That's fine also. I just don't like having #ifdefs here.
Quoted 15 lines
Quoted 15 lines
arch/arm/dts/sunxi-u-boot.dtsi +14
-0+#ifdef CONFIG_MACH_SUN50I_H6 + load = <0x104000>; + entry = <0x104000>; +#else + load = <0x44000>; + entry = <0x44000>; +#endif + atf-bl31 { + }; + }; + + @fdt-SEQ { + description = "NAME"; + type = "flat_dt";
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi line 62
Quoted 6 lines
arch/arm/dts/sunxi-u-boot.dtsi +6
-0+ compression = "none"; + }; + }; + + configurations { + default = "config-1";I would expect @DEFAULT-SEQ here.
For some reason the old script just used config-1.
Quoted 18 lines
Quoted 7 lines
arch/arm/dts/sunxi-u-boot.dtsi +5
-0+ @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ";arch/arm/dts/sunxi-u-boot.dtsi line 77
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +5
-0+ }; + }; + }; +#else u-boot-img { offset = <CONFIG_SPL_PAD_TO>; }; +#endif }; };
Regards,
Simon
Samuel Holland
maintainerPATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
Simon,
Quoted 34 lines · Simon Glass
Quoted 33 lines · Samuel Holland
Quoted 24 lines · Simon Glass
At present 64-bit sunxi boards use the
Makefileto create a FIT, usingUSE_SPL_FIT_GENERATOR. This is deprecated.Update sunxi to use binman instead.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit messageKconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)Kconfig +0
-0Kconfig config SPL_FIT_SOURCE · line 662
Quoted 5 lines
Kconfig +1
-1@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXINow
make u-boot.itbdoesn't work.
Quoted 5 lines
Quoted 3 lines
u-boot.itb is helpful to have because, with
CONFIG_OF_LIST, it can be shared across all boards of a platform. Only SPL is board-specific (on arm64 sunxi, at least).It is generated, just with a different filename.
Thanks. From looking at the code and comparing with u-boot-sunxi-with-spl.bin, it seems that u-boot-sunxi-with-spl.fit.fit is the "final" ITB file. My only hesitation is that it seems like an implementation detail, but I guess it's fine for now.
Quoted 6 lines
Quoted 3 lines
Is there a way to make binman also write the FIT without the SPL? Would that require duplicating the whole binman node?
Yes it would. We could get more complicated and allow an image to build on another perhaps. I'm not sure what is easiest here.
u-boot-sunxi-with-spl.fit.fit is good enough for my purposes, but others may have an opinion.
Quoted 61 lines
Quoted 61 lines
Quoted 48 lines
Kconfig +0
-1config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCVMakefile +2
-9@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihexMakefile u-boot-x86-reset16.bin: u-boot FORCE · line 1634
Quoted 10 lines
Makefile +0
-7@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif -Now
make u-boot-sunxi-with-spl.bindoesn't work.
Quoted 4 lines
Quoted 2 lines
This is less of an issue, but still probably breaks some scripts. It breaks mine, at least.
Why do you specify a target? Doesn't it build the file without the target?
Yes, the file is built either way. I provide a specific target to avoid building other files I don't need -- for example, a plain make used to rebuild the hello world EFI application every time.
Quoted 10 lines
One problem with buildman is that there is no definitely of what files it will produce when run, or at least there is, but it is in the binman description itself.
This means that 'make clean' doesn't work fully, for example. I can think of a few ways to implement this. One would be to put a list of target files into a text file and have 'make clean' use that. We could also have an option to tell binman to produce a list of files it would generate if run. Then we might be able to tell binman to generate a particular file.
Yes, having binman generate a Makefile fragment would be ideal. That would also solve binman being forced to re-run every make invocation. For now a plain make/make all is fine. The forced rebuilds seem to be better under control now.
Quoted 59 lines
Quoted 12 lines
Quoted 12 lines
Makefile +0
-0OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) u-boot-app.efi: u-boot FORCE $(call if_changed,zobjcopy)arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -5,14 +5,73 @@ mmc1 = &mmc2; };Quoted 12 lines
arch/arm/dts/sunxi-u-boot.dtsi line 16
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +7
-1- binman { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-sunxi-with-spl { filename = "u-boot-sunxi-with-spl.bin"; pad-byte = <0xff>;style: blank line here (and above "atf" and "@config-SEQ" below).
I'll send a fix-up patch.
Quoted 23 lines
Quoted 23 lines
arch/arm/dts/sunxi-u-boot.dtsi +19
-0blob { filename = "spl/sunxi-spl.bin"; }; +#ifdef CONFIG_ARM64 + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,fdt-list = "of-list"; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = <0x4a000000>; + + u-boot-nodtb { + }; + }; + atf { + description = "ARM Trusted Firmware";Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi line 42
Quoted 4 lines
arch/arm/dts/sunxi-u-boot.dtsi +4
-0+ type = "firmware"; + arch = "arm64"; + compression = "none"; +/* TODO: Do this with an overwrite in this board's dtb? */This address is determined by the physical SRAM layout, so it is per-SoC, not per-board. I would suggest omitting load/entry here entirely, and putting them in the $SOC-u-boot.dtsi.
Quoted 1 line
That's fine also. I just don't like having #ifdefs here.
I tried implementing this, and I ran into the problem that sunxi doesn't define CONFIG_SYS_VENDOR. So this file (from CONFIG_SYS_SOC) and the board-DTS-specific file are the only two magic u-boot.dtsi files available, and I don't think we want a u-boot.dtsi for every board.
A possible improvement would be defining BL31_ADDR (and later SCP_ADDR) as macros at the top of the file, like the shell script does.
Quoted 11 lines
Quoted 11 lines
arch/arm/dts/sunxi-u-boot.dtsi line 50
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi +8
-0+#ifdef CONFIG_MACH_SUN50I_H6 + load = <0x104000>; + entry = <0x104000>; +#else + load = <0x44000>; + entry = <0x44000>; +#endif + atf-bl31 {Another regression: you need
Quoted 7 lines
Quoted 3 lines
filename = "bl31.bin";here to match the behavior when the environment variable is not defined.
That would be better to go in the code. If U-Boot passes an empty filename to binman then it needs special handling, if we want a default.
(merging the threads here)
What special handling are you thinking of? In blob_named_by_arg.py, the default filename is only overwritten from the arg if the arg is not empty. So the code already does the right thing, matching the baseline script: if no environment variable was defined, use a file with the default name in the current directory. It just needs a default name defined here.
Quoted 15 lines
Quoted 6 lines
Quoted 6 lines
arch/arm/dts/sunxi-u-boot.dtsi +6
-0+ }; + }; + + @fdt-SEQ { + description = "NAME"; + type = "flat_dt";Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi line 62
Quoted 6 lines
arch/arm/dts/sunxi-u-boot.dtsi +6
-0+ compression = "none"; + }; + }; + + configurations { + default = "config-1";I would expect @DEFAULT-SEQ here.
Quoted 1 line
For some reason the old script just used config-1.
Probably because determining the index of CONFIG_DEFAULT_DEVICE_TREE in CONFIG_OF_LIST in POSIX sh is nontrivial. sunxi SPL always explicitly chooses the config matching CONFIG_DEFAULT_DEVICE_TREE, so "1" vs "DEFAULT-SEQ" would only make a difference if CONFIG_DEFAULT_DEVICE_TREE was not included in CONFIG_OF_LIST. (If using "DEFAULT-SEQ", that would be an error, so it would require that the SPL and FIT were built separately).
Quoted 18 lines
Quoted 8 lines
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi +8
-0+ @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ"; + }; + }; + };Quoted 9 lines
arch/arm/dts/sunxi-u-boot.dtsi line 77
Quoted 8 lines
arch/arm/dts/sunxi-u-boot.dtsi +2
-0+#else u-boot-img { offset = <CONFIG_SPL_PAD_TO>; }; +#endif }; };
Quoted 3 lines
Regards,
Simon
Regards,
Samuel
PATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
Hi Samuel,
Quoted 203 lines · Samuel Holland
Simon,
Quoted 34 lines · Simon Glass
Quoted 33 lines · Samuel Holland
Quoted 24 lines · Simon Glass
At present 64-bit sunxi boards use the
Makefileto create a FIT, usingUSE_SPL_FIT_GENERATOR. This is deprecated.Update sunxi to use binman instead.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit messageKconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)Kconfig +0
-0Kconfig config SPL_FIT_SOURCE · line 662
Quoted 5 lines
Kconfig +1
-1@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXINow
make u-boot.itbdoesn't work.Quoted 5 lines
Quoted 3 lines
u-boot.itb is helpful to have because, with
CONFIG_OF_LIST, it can be shared across all boards of a platform. Only SPL is board-specific (on arm64 sunxi, at least).It is generated, just with a different filename.
Thanks. From looking at the code and comparing with u-boot-sunxi-with-spl.bin, it seems that u-boot-sunxi-with-spl.fit.fit is the "final" ITB file. My only hesitation is that it seems like an implementation detail, but I guess it's fine for now.
Quoted 6 lines
Quoted 3 lines
Is there a way to make binman also write the FIT without the SPL? Would that require duplicating the whole binman node?
Yes it would. We could get more complicated and allow an image to build on another perhaps. I'm not sure what is easiest here.
u-boot-sunxi-with-spl.fit.fit is good enough for my purposes, but others may have an opinion.
Quoted 61 lines
Quoted 61 lines
Quoted 48 lines
Kconfig +0
-1config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCVMakefile +2
-9@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihexMakefile u-boot-x86-reset16.bin: u-boot FORCE · line 1634
Quoted 10 lines
Makefile +0
-7@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif -Now
make u-boot-sunxi-with-spl.bindoesn't work.Quoted 4 lines
Quoted 2 lines
This is less of an issue, but still probably breaks some scripts. It breaks mine, at least.
Why do you specify a target? Doesn't it build the file without the target?
Yes, the file is built either way. I provide a specific target to avoid building other files I don't need -- for example, a plain
makeused to rebuild the hello world EFI application every time.Quoted 10 lines
One problem with buildman is that there is no definitely of what files it will produce when run, or at least there is, but it is in the binman description itself.
This means that 'make clean' doesn't work fully, for example. I can think of a few ways to implement this. One would be to put a list of target files into a text file and have 'make clean' use that. We could also have an option to tell binman to produce a list of files it would generate if run. Then we might be able to tell binman to generate a particular file.
Yes, having binman generate a
Makefilefragment would be ideal. That would also solve binman being forced to re-run everymakeinvocation. For now a plainmake/make allis fine. The forced rebuilds seem to be better under control now.Quoted 59 lines
Quoted 12 lines
Quoted 12 lines
Makefile +0
-0OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) u-boot-app.efi: u-boot FORCE $(call if_changed,zobjcopy)arch/arm/dts/sunxi-u-boot.dtsi +0
-0@@ -5,14 +5,73 @@ mmc1 = &mmc2; };Quoted 12 lines
arch/arm/dts/sunxi-u-boot.dtsi line 16
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +7
-1- binman { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-sunxi-with-spl { filename = "u-boot-sunxi-with-spl.bin"; pad-byte = <0xff>;style: blank line here (and above "atf" and "@config-SEQ" below).
I'll send a fix-up patch.
Quoted 31 lines
Quoted 17 lines
arch/arm/dts/sunxi-u-boot.dtsi +13
-0blob { filename = "spl/sunxi-spl.bin"; }; +#ifdef CONFIG_ARM64 + fit { + description = "Configuration to load ATF before U-Boot"; + #address-cells = <1>; + fit,fdt-list = "of-list"; + + images { + uboot { + description = "U-Boot (64-bit)"; + type = "standalone"; + arch = "arm64"; + compression = "none"; + load = <0x4a000000>;arch/arm/dts/sunxi-u-boot.dtsi line 42
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +10
-0+ + u-boot-nodtb { + }; + }; + atf { + description = "ARM Trusted Firmware"; + type = "firmware"; + arch = "arm64"; + compression = "none"; +/* TODO: Do this with an overwrite in this board's dtb? */This address is determined by the physical SRAM layout, so it is per-SoC, not per-board. I would suggest omitting load/entry here entirely, and putting them in the $SOC-u-boot.dtsi.
Quoted 6 lines
Quoted 1 line
That's fine also. I just don't like having #ifdefs here.
I tried implementing this, and I ran into the problem that sunxi doesn't define
CONFIG_SYS_VENDOR. So this file (fromCONFIG_SYS_SOC) and the board-DTS-specific file are the only two magicu-boot.dtsifiles available, and I don't think we want au-boot.dtsifor every board.
No that would be painful.
Quoted 3 lines
A possible improvement would be defining
BL31_ADDR(and laterSCP_ADDR) as macros at the top of the file, like the shell script does.
Yes that might be better I suppose.
Quoted 20 lines
Quoted 12 lines
Quoted 12 lines
arch/arm/dts/sunxi-u-boot.dtsi line 50
Quoted 9 lines
arch/arm/dts/sunxi-u-boot.dtsi +8
-0+#ifdef CONFIG_MACH_SUN50I_H6 + load = <0x104000>; + entry = <0x104000>; +#else + load = <0x44000>; + entry = <0x44000>; +#endif + atf-bl31 {Another regression: you need
Quoted 7 lines
Quoted 3 lines
filename = "bl31.bin";here to match the behavior when the environment variable is not defined.
That would be better to go in the code. If U-Boot passes an empty filename to binman then it needs special handling, if we want a default.
Quoted 7 lines
(merging the threads here)
What special handling are you thinking of? In
blob_named_by_arg.py, the default filename is only overwritten from the arg if the arg is not empty. So the code already does the right thing, matching the baseline script: if no environment variable was defined, use a file with the default name in the current directory. It just needs a default name defined here.
Well Entry_aft_bl31 uses Entry_named_blob_by_arg which uses Entry_blob which reads the filename. So we would need to do some refactoring to avoid overriding the default filename, as I read it.
Quoted 16 lines
Quoted 16 lines
Quoted 15 lines
arch/arm/dts/sunxi-u-boot.dtsi line 62
Quoted 13 lines
arch/arm/dts/sunxi-u-boot.dtsi +12
-0+ }; + }; + + @fdt-SEQ { + description = "NAME"; + type = "flat_dt"; + compression = "none"; + }; + }; + + configurations { + default = "config-1";I would expect @DEFAULT-SEQ here.
Quoted 8 lines
Quoted 1 line
For some reason the old script just used config-1.
Probably because determining the index of
CONFIG_DEFAULT_DEVICE_TREEinCONFIG_OF_LISTin POSIX sh is nontrivial. sunxi SPL always explicitly chooses the config matchingCONFIG_DEFAULT_DEVICE_TREE, so "1" vs "DEFAULT-SEQ" would only make a difference ifCONFIG_DEFAULT_DEVICE_TREEwas not included inCONFIG_OF_LIST. (If using "DEFAULT-SEQ", that would be an error, so it would require that the SPL and FIT were built separately).
OK.
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 6 lines
arch/arm/dts/sunxi-u-boot.dtsi +5
-0+ @config-SEQ { + description = "NAME"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt-SEQ";arch/arm/dts/sunxi-u-boot.dtsi line 77
Quoted 10 lines
arch/arm/dts/sunxi-u-boot.dtsi +5
-0+ }; + }; + }; +#else u-boot-img { offset = <CONFIG_SPL_PAD_TO>; }; +#endif }; };
Regards,
Simon
PATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
In reply to Simon GlassHi,
Quoted 120 lines · Simon Glass
Hi Samuel,
Quoted 34 lines · Samuel Holland
Quoted 24 lines · Simon Glass
At present 64-bit sunxi boards use the
Makefileto create a FIT, usingUSE_SPL_FIT_GENERATOR. This is deprecated.Update sunxi to use binman instead.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit messageKconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)Kconfig +0
-0Kconfig config SPL_FIT_SOURCE · line 662
Quoted 5 lines
Kconfig +1
-1@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXINow
make u-boot.itbdoesn't work.Quoted 3 lines
u-boot.itb is helpful to have because, with
CONFIG_OF_LIST, it can be shared across all boards of a platform. Only SPL is board-specific (on arm64 sunxi, at least).It is generated, just with a different filename.
Quoted 3 lines
Is there a way to make binman also write the FIT without the SPL? Would that require duplicating the whole binman node?
Yes it would. We could get more complicated and allow an image to build on another perhaps. I'm not sure what is easiest here.
Quoted 61 lines
Quoted 48 lines
Kconfig +0
-1config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCVMakefile +2
-9@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihexMakefile u-boot-x86-reset16.bin: u-boot FORCE · line 1634
Quoted 10 lines
Makefile +0
-7@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif -Now
make u-boot-sunxi-with-spl.bindoesn't work.Quoted 2 lines
This is less of an issue, but still probably breaks some scripts. It breaks mine, at least.
Why do you specify a target? Doesn't it build the file without the target?
One problem with buildman is that there is no definitely of what files it will produce when run, or at least there is, but it is in the binman description itself.
Quoted 6 lines
This means that 'make clean' doesn't work fully, for example. I can think of a few ways to implement this. One would be to put a list of target files into a text file and have 'make clean' use that. We could also have an option to tell binman to produce a list of files it would generate if run. Then we might be able to tell binman to generate a particular file.
Why not just to generate all binman images to specific folder?
Thanks,
Michal
PATCH v3 8/12 sunxi: Convert 64-bit boards to use binman
Hi Michal,
Quoted 124 lines · Michal Simek
Hi,
Quoted 120 lines · Simon Glass
Hi Samuel,
Quoted 34 lines · Samuel Holland
Quoted 24 lines · Simon Glass
At present 64-bit sunxi boards use the
Makefileto create a FIT, usingUSE_SPL_FIT_GENERATOR. This is deprecated.Update sunxi to use binman instead.
Signed-off-by Simon Glass <[email protected]>---
(no changes since v2)
Changes in v2:
- Add a 'fit-fdt-list' property
- Fix 'board' typo in commit messageKconfig | 3 +- Makefile | 18 ++-------- arch/arm/dts/sunxi-u-boot.dtsi | 61 +++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 19 deletions(-)Kconfig +0
-0Kconfig config SPL_FIT_SOURCE · line 662
Quoted 5 lines
Kconfig +1
-1@@ -659,12 +659,11 @@ config SPL_FIT_SOURCE config USE_SPL_FIT_GENERATOR bool "Use a script to generate the .its script" - default y if SPL_FIT + default y if SPL_FIT && !ARCH_SUNXINow
make u-boot.itbdoesn't work.Quoted 3 lines
u-boot.itb is helpful to have because, with
CONFIG_OF_LIST, it can be shared across all boards of a platform. Only SPL is board-specific (on arm64 sunxi, at least).It is generated, just with a different filename.
Quoted 3 lines
Is there a way to make binman also write the FIT without the SPL? Would that require duplicating the whole binman node?
Yes it would. We could get more complicated and allow an image to build on another perhaps. I'm not sure what is easiest here.
Quoted 61 lines
Quoted 48 lines
Kconfig +0
-1config SPL_FIT_GENERATOR string ".its file generator script for U-Boot FIT image" depends on USE_SPL_FIT_GENERATOR - default "board/sunxi/mksunxi_fit_atf.sh" if SPL_LOAD_FIT && ARCH_SUNXI default "arch/arm/mach-rockchip/make_fit_atf.py" if SPL_LOAD_FIT && ARCH_ROCKCHIP default "arch/arm/mach-zynqmp/mkimage_fit_atf.sh" if SPL_LOAD_FIT && ARCH_ZYNQMP default "arch/riscv/lib/mkimage_fit_opensbi.sh" if SPL_LOAD_FIT && RISCVMakefile +2
-9@@ -923,11 +923,6 @@ INPUTS-$(CONFIG_REMAKE_ELF) += u-boot.elf INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi -# Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) -INPUTS-y += u-boot-sunxi-with-spl.bin -endif - # Generate this input file for binman ifeq ($(CONFIG_SPL),) INPUTS-$(CONFIG_ARCH_MEDIATEK) += u-boot-mtk.bin@@ -1024,13 +1019,9 @@ PHONY += inputs inputs: $(INPUTS-y) all: .binman_stamp inputs -# Hack for sunxi which doesn't have a proper binman definition for -# 64-bit boards -ifneq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64),yy) ifeq ($(CONFIG_BINMAN),y) $(call if_changed,binman) endif -endif # Timestamp file to make sure that binman always runs .binman_stamp: FORCE@@ -1336,6 +1327,8 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ $(if $(BINMAN_VERBOSE),-v$(BINMAN_VERBOSE)) \ build -u -d u-boot.dtb -O . -m --allow-missing \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ + -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ + -a atf-bl31-path=${BL31} \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihexMakefile u-boot-x86-reset16.bin: u-boot FORCE · line 1634
Quoted 10 lines
Makefile +0
-7@@ -1625,13 +1618,6 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 -ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),y) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE - $(call if_changed,cat) -endif -endif -Now
make u-boot-sunxi-with-spl.bindoesn't work.Quoted 2 lines
This is less of an issue, but still probably breaks some scripts. It breaks mine, at least.
Why do you specify a target? Doesn't it build the file without the target?
One problem with buildman is that there is no definitely of what files it will produce when run, or at least there is, but it is in the binman description itself.
Quoted 8 lines
Quoted 6 lines
This means that 'make clean' doesn't work fully, for example. I can think of a few ways to implement this. One would be to put a list of target files into a text file and have 'make clean' use that. We could also have an option to tell binman to produce a list of files it would generate if run. Then we might be able to tell binman to generate a particular file.
Why not just to generate all binman images to specific folder?
We need to put at least some of them in the build directory. We could perhaps have a 'binman' subdir of that where intermediate images go.
Regards,
SImon
PATCH v3 9/12 sunxi: Drop the FIT-generator script
In reply to Simon GlassThis file is no-longer used. Drop it.
---
(no changes since v1)
board/sunxi/mksunxi_fit_atf.sh | 87 ---------------------------------- 1 file changed, 87 deletions(-) delete mode 100755 board/sunxi/mksunxi_fit_atf.sh
board/sunxi/mksunxi_fit_atf.sh deleted +0 -87
@@ -1,87 +0,0 @@ -#!/bin/sh -# -# script to generate FIT image source for 64-bit sunxi boards with -# ARM Trusted Firmware and multiple device trees (given on the command line) -# -# usage: $0 <dt_name> [<dt_name> [<dt_name] ...] - -[ -z "$BL31" ] && BL31="bl31.bin" - -if [ ! -f $BL31 ]; then - echo "WARNING: BL31 file $BL31 NOT found, resulting binary is non-functional" >&2 - echo "Please read the section on ARM Trusted Firmware (ATF) in board/sunxi/README.sunxi64" >&2 - BL31=/dev/null -fi - -if grep -q "^CONFIG_MACH_SUN50I_H6=y" .config; then - BL31_ADDR=0x104000 -else - BL31_ADDR=0x44000 -fi - -cat << __HEADER_EOF -/dts-v1/; - -/ { - description = "Configuration to load ATF before U-Boot"; - #address-cells = <1>; - - images { - uboot { - description = "U-Boot (64-bit)"; - data = /incbin/("u-boot-nodtb.bin"); - type = "standalone"; - arch = "arm64"; - compression = "none"; - load = <0x4a000000>; - }; - atf { - description = "ARM Trusted Firmware"; - data = /incbin/("$BL31"); - type = "firmware"; - arch = "arm64"; - compression = "none"; - load = <$BL31_ADDR>; - entry = <$BL31_ADDR>; - }; -__HEADER_EOF - -cnt=1 -for dtname in $* -do - cat << __FDT_IMAGE_EOF - fdt_$cnt { - description = "$(basename $dtname .dtb)"; - data = /incbin/("$dtname"); - type = "flat_dt"; - compression = "none"; - }; -__FDT_IMAGE_EOF - cnt=$((cnt+1)) -done - -cat << __CONF_HEADER_EOF - }; - configurations { - default = "config_1"; - -__CONF_HEADER_EOF - -cnt=1 -for dtname in $* -do - cat << __CONF_SECTION_EOF - config_$cnt { - description = "$(basename $dtname .dtb)"; - firmware = "uboot"; - loadables = "atf"; - fdt = "fdt_$cnt"; - }; -__CONF_SECTION_EOF - cnt=$((cnt+1)) -done - -cat << __ITS_EOF - }; -}; -__ITS_EOF
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 10/12 binman: Allow selecting default FIT configuration
In reply to Simon GlassAdd a new entry argument to the fit entry which allows selection of the default configuration to use. This is the 'default' property in the 'configurations' node.
Update the Makefile to pass in the value of DEVICE_TREE or CONFIG_DEFAULT_DEVICE_TREE to provide this information.
---
Changes in v3:
- Rebase on top of earlier binman series
Changes in v2:
- Add new patch to allow selecting default FIT configuration
Makefile | 2 +
tools/binman/README.entries | 4 ++
tools/binman/etype/fit.py | 22 ++++++++++
tools/binman/ftest.py | 41 +++++++++++++++++--
.../test/{170_fit_fdt.dts => 172_fit_fdt.dts} | 2 +-
5 files changed, 67 insertions(+), 4 deletions(-)
rename tools/binman/test/{170_fit_fdt.dts => 172_fit_fdt.dts} (95%)Makefile +2 -0
@@ -1321,6 +1321,7 @@ u-boot.ldr: u-boot # binman # --------------------------------------------------------------------------- # Use 'make BINMAN_DEBUG=1' to enable debugging +default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE)) quiet_cmd_binman = BINMAN $@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ --toolpath $(objtree)/tools \
@@ -1329,6 +1330,7 @@ cmd_binman = $(srctree)/tools/binman/binman $(if $(BINMAN_DEBUG),-D) \ -I . -I $(srctree) -I $(srctree)/board/$(BOARDDIR) \ -I arch/$(ARCH)/dts -a of-list=$(CONFIG_OF_LIST) \ -a atf-bl31-path=${BL31} \ + -a default-dt=$(default_dt) \ $(BINMAN_$(@F)) OBJCOPYFLAGS_u-boot.ldr.hex := -I binary -O ihex
tools/binman/README.entries +4 -0
@@ -402,6 +402,10 @@ Available substitutions for '@' nodes are: Note that if no devicetree files are provided (with '-a of-list' as above) then no nodes will be generated. +The 'default' property, if present, will be automatically set to the name +if of configuration whose devicetree matches the 'default-dt' entry +argument, e.g. with '-a default-dt=sun50i-a64-pine64-lts'. + Properties (in the 'fit' node itself): fit,external-offset: Indicates that the contents of the FIT are external
tools/binman/etype/fit.py +22 -0
@@ -90,6 +90,10 @@ class Entry_fit(Entry): Note that if no devicetree files are provided (with '-a of-list' as above) then no nodes will be generated. + The 'default' property, if present, will be automatically set to the name + if of configuration whose devicetree matches the 'default-dt' entry + argument, e.g. with '-a default-dt=sun50i-a64-pine64-lts'. + Properties (in the 'fit' node itself): fit,external-offset: Indicates that the contents of the FIT are external
@@ -121,6 +125,8 @@ class Entry_fit(Entry): [EntryArg(self._fit_list_prop.value, str)]) if fdts is not None: self._fdts = fdts.split() + self._fit_default_dt = self.GetEntryArgsOrProps([EntryArg('default-dt', + str)])[0] def ReadNode(self): self._ReadSubnodes()
@@ -142,6 +148,22 @@ class Entry_fit(Entry): """ for pname, prop in node.props.items(): if not pname.startswith('fit,'): + if pname == 'default': + val = prop.value + # Handle the 'default' property + if val.startswith('@'): + if not self._fdts: + continue + if not self._fit_default_dt: + self.Raise("Generated 'default' node requires default-dt entry argument") + if self._fit_default_dt not in self._fdts: + self.Raise("default-dt entry argument '%s' not found in fdt list: %s" % + (self._fit_default_dt, + ', '.join(self._fdts))) + seq = self._fdts.index(self._fit_default_dt) + val = val[1:].replace('DEFAULT-SEQ', str(seq + 1)) + fsw.property_string(pname, val) + continue fsw.property(pname, prop.bytes) rel_path = node.path[len(base_node.path):]
tools/binman/ftest.py +38 -3
66 lines not on this page · raw message
tools/binman/test/172_fit_fdt.dts renamed from tools/binman/test/170_fit_fdt.dts +1 -1
@@ -40,7 +40,7 @@ }; configurations { - default = "config-1"; + default = "@config-DEFAULT-SEQ"; @config-SEQ { description = "conf-NAME.dtb"; firmware = "uboot";
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 11/12 binman: Support help messages for missing blobs
In reply to Simon GlassWhen an external blob is missing it can be quite confusing for the user. Add a way to provide a help message that is shown.
---
Changes in v3:
- Add a way to show help messages for missing blobs
tools/binman/README | 6 ++ tools/binman/control.py | 69 +++++++++++++++++++++- tools/binman/entry.py | 9 +++ tools/binman/ftest.py | 18 +++++- tools/binman/missing-blob-help | 11 ++++ tools/binman/test/168_fit_missing_blob.dts | 9 ++- 6 files changed, 119 insertions(+), 3 deletions(-) create mode 100644 tools/binman/missing-blob-help
tools/binman/README +6 -0
@@ -343,6 +343,12 @@ compress: Sets the compression algortihm to use (for blobs only). See the entry documentation for details. +missing-msg: + Sets the tag of the message to show if this entry is missing. This is + used for external blobs. When they are missing it is helpful to show + information about what needs to be fixed. See missing-blob-help for the + message for each tag. + The attributes supported for images and sections are described below. Several are similar to those for entries.
tools/binman/control.py +68 -1
99 lines not on this page · raw message
tools/binman/entry.py +9 -0
@@ -178,6 +178,7 @@ class Entry(object): self.align_end = fdt_util.GetInt(self._node, 'align-end') self.offset_unset = fdt_util.GetBool(self._node, 'offset-unset') self.expand_size = fdt_util.GetBool(self._node, 'expand-size') + self.missing_msg = fdt_util.GetString(self._node, 'missing-msg') def GetDefaultFilename(self): return None
@@ -827,3 +828,11 @@ features to produce new behaviours. True if allowed, False if not allowed """ return self.allow_missing + + def GetHelpTags(self): + """Get the tags use for missing-blob help + + Returns: + list of possible tags, most desirable first + """ + return list(filter(None, [self.missing_msg, self.name, self.etype]))
tools/binman/ftest.py +17 -1
@@ -3561,7 +3561,7 @@ class TestFunctional(unittest.TestCase): self._DoTestFile('168_fit_missing_blob.dts', allow_missing=True) err = stderr.getvalue() - self.assertRegex(err, "Image 'main-section'.*missing.*: blob-ext") + self.assertRegex(err, "Image 'main-section'.*missing.*: atf-bl31") def testBlobNamedByArgMissing(self): """Test handling of a missing entry arg"""
@@ -3692,5 +3692,21 @@ class TestFunctional(unittest.TestCase): self.assertIn("default-dt entry argument 'test-fdt3' not found in fdt list: test-fdt1, test-fdt2", str(e.exception)) + def testFitExtblobMissingHelp(self): + """Test display of help messages when an external blob is missing""" + control.missing_blob_help = control._ReadMissingBlobHelp() + control.missing_blob_help['wibble'] = 'Wibble test' + control.missing_blob_help['another'] = 'Another test' + with test_util.capture_sys_output() as (stdout, stderr): + self._DoTestFile('168_fit_missing_blob.dts', + allow_missing=True) + err = stderr.getvalue() + + # We can get the tag from the name, the type or the missing-msg + # property. Check all three. + self.assertIn('You may need to build ARM Trusted', err) + self.assertIn('Wibble test', err) + self.assertIn('Another test', err) + if __name__ == "__main__": unittest.main()
tools/binman/missing-blob-help new file +11 -0
@@ -0,0 +1,11 @@ +# This file contains help messages for missing external blobs. Each message has +# a tag (MUST be just lower-case text, digits and hyphens) starting in column 1, +# followed by a colon (:) to indicate its start. The message can include any +# number of lines, including blank lines. +# +# When looking for a tag, Binman uses the value of 'missing-msg' for the entry, +# the entry name or the entry type, in that order + +atf-bl31: +See the documentation for your board. You may need to build ARM Trusted +Firmware and build with BL31=/path/to/bl31.bin
tools/binman/test/168_fit_missing_blob.dts +8 -1
@@ -29,9 +29,16 @@ hash-2 { algo = "sha1"; }; - blob-ext { + atf-bl31 { filename = "missing"; }; + cros-ec-rw { + type = "atf-bl31"; + missing-msg = "wibble"; + }; + another { + type = "atf-bl31"; + }; }; }; };
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
PATCH v3 12/12 binman: sunxi: Add help message for missing sunxi ATF BL31
In reply to Simon GlassAdd a special help message pointing to the relevant README.
---
(no changes since v1)
arch/arm/dts/sunxi-u-boot.dtsi | 1 + tools/binman/missing-blob-help | 4 ++++ 2 files changed, 5 insertions(+)
arch/arm/dts/sunxi-u-boot.dtsi +1 -0
@@ -48,6 +48,7 @@ entry = <0x44000>; #endif atf-bl31 { + missing-msg = "atf-bl31-sunxi"; }; };
tools/binman/missing-blob-help +4 -0
@@ -9,3 +9,7 @@ atf-bl31: See the documentation for your board. You may need to build ARM Trusted Firmware and build with BL31=/path/to/bl31.bin + +atf-bl31-sunxi: +Please read the section on ARM Trusted Firmware (ATF) in +board/sunxi/README.sunxi64
Signature · 1 line
2.28.0.402.g5ffc5be6b7-goog
v3 cover binman: Add support for generating more complex FITs
In reply to Simon GlassHi Simon,
Quoted 10 lines · Simon Glass
This series allows binman to generate FITs that include multiple DTB images and the configuration to use them.
It is then possible to remove the sunxi FIT generator script, so this series handles that also.
With this, sunxi is fully converted to use binman.
Note: This series is available at u-boot-dm/binman-working and is based on u-boot-dm/testing
I continue on testing this series on ZynqMP and reach one issue. One of our usecase is to put u-boot on memory above 32bit address space. To be accurate to this memory range.
reg = <0x8 0x00000000 0x0 0x80000000>;
One way to get there is to setup TEXT_BASE to for example 0x808000000. Then u-boot.itb fragment for binmap looks like this.
u-boot-itb {
filename = "u-boot.itb";
fit {
description = "FIT image with ATF support";
fit,fdt-list = "of-list";
#address-cells = <2>;
images {
uboot {
description = "U-Boot (64-bit)";
type = "firmware";
os = "u-boot";
arch = "arm64";
compression = "none";
load = <8 0x8000000>;
entry = <8 0x8000000>;
u-boot-nodtb {
};
};...
The key properties are load/entry. In example above I have address-cells = 2 and entries written by hand and it works fine.
But I want to use CONFIG_SYS_TEXT_BASE there which is already in 64bit format.
When this is used I get
Error: arch/arm/dts/zynqmp-u-boot.dtsi:31.14-25 Value out of range for 32-bit array element
Error: arch/arm/dts/zynqmp-u-boot.dtsi:32.15-26 Value out of range for 32-bit array element
Which is understandable but my question is how to handle 64bit addresses which are properly filled via Kconfig?
I have the same issue with one more DT property.
Thanks,
Michal
v3 cover binman: Add support for generating more complex FITs
Hi Michal,
Quoted 48 lines · Michal Simek
Hi Simon,
Quoted 10 lines · Simon Glass
This series allows binman to generate FITs that include multiple DTB images and the configuration to use them.
It is then possible to remove the sunxi FIT generator script, so this series handles that also.
With this, sunxi is fully converted to use binman.
Note: This series is available at u-boot-dm/binman-working and is based on u-boot-dm/testing
I continue on testing this series on ZynqMP and reach one issue. One of our usecase is to put u-boot on memory above 32bit address space. To be accurate to this memory range.
reg = <0x80x000000000x00x80000000>;One way to get there is to setup
TEXT_BASEto for example0x808000000. Then u-boot.itb fragment for binmap looks like this.u-boot-itb { filename = "u-boot.itb"; fit { description = "FIT image with ATF support"; fit,fdt-list = "of-list"; #address-cells = <2>; images { uboot { description = "U-Boot (64-bit)"; type = "firmware"; os = "u-boot"; arch = "arm64"; compression = "none"; load = <8 0x8000000>; entry = <8 0x8000000>; u-boot-nodtb { }; };...
The key properties are load/entry. In example above I have address-cells = 2 and entries written by hand and it works fine.
But I want to useCONFIG_SYS_TEXT_BASEthere which is already in 64bit format.
Quoted 8 lines
When this is used I get
Error: arch/arm/dts/zynqmp-u-boot.dtsi:31.14-25 Value out of range for 32-bit array element
Error: arch/arm/dts/zynqmp-u-boot.dtsi:32.15-26 Value out of range for 32-bit array elementWhich is understandable but my question is how to handle 64bit addresses which are properly filled via
Kconfig?
If I understand the problem correctly, you can add 64-bit values like this:
load = /bits/ 64 <CONFIG_SYS_TEXT_BASE>;
Quoted 8 lines
I have the same issue with one more DT property.
Thanks,
Michal
v3 cover binman: Add support for generating more complex FITs
Hi Simon,
Quoted 57 lines · Simon Glass
Hi Michal,
Quoted 54 lines · Michal Simek
Hi Simon,
Quoted 10 lines · Simon Glass
This series allows binman to generate FITs that include multiple DTB images and the configuration to use them.
It is then possible to remove the sunxi FIT generator script, so this series handles that also.
With this, sunxi is fully converted to use binman.
Note: This series is available at u-boot-dm/binman-working and is based on u-boot-dm/testing
I continue on testing this series on ZynqMP and reach one issue. One of our usecase is to put u-boot on memory above 32bit address space. To be accurate to this memory range.
reg = <0x80x000000000x00x80000000>;One way to get there is to setup
TEXT_BASEto for example0x808000000. Then u-boot.itb fragment for binmap looks like this.u-boot-itb { filename = "u-boot.itb"; fit { description = "FIT image with ATF support"; fit,fdt-list = "of-list"; #address-cells = <2>; images { uboot { description = "U-Boot (64-bit)"; type = "firmware"; os = "u-boot"; arch = "arm64"; compression = "none"; load = <8 0x8000000>; entry = <8 0x8000000>; u-boot-nodtb { }; };...
The key properties are load/entry. In example above I have address-cells = 2 and entries written by hand and it works fine.
But I want to useCONFIG_SYS_TEXT_BASEthere which is already in 64bit format.When this is used I get
Error: arch/arm/dts/zynqmp-u-boot.dtsi:31.14-25 Value out of range for 32-bit array element
Error: arch/arm/dts/zynqmp-u-boot.dtsi:32.15-26 Value out of range for 32-bit array element
Quoted 6 lines
Quoted 2 lines
Which is understandable but my question is how to handle 64bit addresses which are properly filled via
Kconfig?If I understand the problem correctly, you can add 64-bit values like this:
load = /bits/ 64 <
CONFIG_SYS_TEXT_BASE>;
ok. This works - thanks for that.
I have sent 2 patches for adding 64bit support to use this feature.
Thanks,
Michal