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 <pbrobinson@gmail.com>
diff --git a/tools/binman/entries.rst b/tools/binman/entries.rst
index a8c0881..3006c59 100644
--- a/tools/binman/entries.rst
+++ b/tools/binman/entries.rst
@@ -197,7 +197,7 @@
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 aca21a4..9d2eec8 100755
--- a/tools/binman/fip_util.py
+++ b/tools/binman/fip_util.py
@@ -427,7 +427,7 @@
"""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 @@
"""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 @@
"""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 @@
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 @@
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 @@
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: