diff options
| author | Peter Robinson <[email protected]> | 2024-10-04 11:40:44 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-10-04 09:00:47 -0600 |
| commit | af69289d61876d8e62449ee2da2dc6683bcb8198 (patch) | |
| tree | d518fd78a5286509afc9043d64ece524a461472a /tools | |
| parent | 1b1ffda4207125c5bc618d4b0ca718b52cf7a4c0 (diff) | |
Update directories for new name of TF-A directories
The TF-A URL was updated, as a result the name of the
directory changed as part of the new git URL and not
all the referenced directories were updated.
Fixes: 0ec0207fe07 ("Update the ARM trusted firmware git URL")
Signed-off-by: Peter Robinson <[email protected]>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binman/entries.rst | 2 | ||||
| -rwxr-xr-x | tools/binman/fip_util.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst index a8c0881aa11..3006c5914d6 100644 --- a/tools/binman/entries.rst +++ b/tools/binman/entries.rst @@ -197,7 +197,7 @@ source files that the tool examples: To run the tool:: - $ tools/binman/fip_util.py -s /path/to/arm-trusted-firmware + $ tools/binman/fip_util.py -s /path/to/trusted-firmware-a Warning: UUID 'UUID_NON_TRUSTED_WORLD_KEY_CERT' is not mentioned in tbbr_config.c file Existing code in 'tools/binman/fip_util.py' is up-to-date diff --git a/tools/binman/fip_util.py b/tools/binman/fip_util.py index aca21a42d3a..9d2eec82a0a 100755 --- a/tools/binman/fip_util.py +++ b/tools/binman/fip_util.py @@ -427,7 +427,7 @@ def parse_macros(srcdir): """parse_macros: Parse the firmware_image_package.h file Args: - srcdir (str): 'arm-trusted-firmware' source directory + srcdir (str): 'trusted-firmware-a' source directory Returns: dict: @@ -472,7 +472,7 @@ def parse_names(srcdir): """parse_names: Parse the tbbr_config.c file Args: - srcdir (str): 'arm-trusted-firmware' source directory + srcdir (str): 'trusted-firmware-a' source directory Returns: tuple: dict of entries: @@ -559,7 +559,7 @@ def parse_atf_source(srcdir, dstfile, oldfile): """parse_atf_source(): Parse the ATF source tree and update this file Args: - srcdir (str): Path to 'arm-trusted-firmware' directory. Get this from: + srcdir (str): Path to 'trusted-firmware-a' directory. Get this from: https://github.com/TrustedFirmware-A/trusted-firmware-a.git dstfile (str): File to write new code to, if an update is needed oldfile (str): Python source file to compare against @@ -573,7 +573,7 @@ def parse_atf_source(srcdir, dstfile, oldfile): if not os.path.exists(readme_fname): raise ValueError( f"Expected file '{readme_fname}' - try using -s to specify the " - 'arm-trusted-firmware directory') + 'trusted-firmware-a directory') readme = tools.read_file(readme_fname, binary=False) first_line = 'Trusted Firmware-A' if readme.splitlines()[0] != first_line: @@ -603,7 +603,7 @@ def main(argv, oldfile): int: 0 (exit code) """ parser = ArgumentParser(epilog='''Creates an updated version of this code, -with a table of FIP-entry types parsed from the arm-trusted-firmware source +with a table of FIP-entry types parsed from the trusted-firmware-a source directory''') parser.add_argument( '-D', '--debug', action='store_true', @@ -613,7 +613,7 @@ directory''') help='Output file to write new fip_util.py file to') parser.add_argument( '-s', '--src', type=str, default='.', - help='Directory containing the arm-trusted-firmware source') + help='Directory containing the trusted-firmware-a source') args = parser.parse_args(argv) if not args.debug: |