diff options
| author | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2020-06-11 21:02:03 +0100 |
|---|---|---|
| committer | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2020-06-24 08:44:26 +0100 |
| commit | ce10f9f4629181ce9cb0b574c9cde1fad94a5027 (patch) | |
| tree | 8883705994a35224ff8b8d59fa03fa3fb72a624d | |
| parent | 3cb84a54258e148ba0240fc5fbe4ef828339c13d (diff) | |
| download | platform_external_arm-trusted-firmware-ce10f9f4629181ce9cb0b574c9cde1fad94a5027.tar.gz platform_external_arm-trusted-firmware-ce10f9f4629181ce9cb0b574c9cde1fad94a5027.tar.bz2 platform_external_arm-trusted-firmware-ce10f9f4629181ce9cb0b574c9cde1fad94a5027.zip | |
fiptool: Add fw_config in FIP
Added support in fiptool to include fw_config image
in FIP.
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Change-Id: Ibbd14723a4141598d9d7f6bfcf88a0ef92cf87bc
| -rw-r--r-- | include/tools_share/firmware_image_package.h | 4 | ||||
| -rw-r--r-- | lib/debugfs/devfip.c | 1 | ||||
| -rw-r--r-- | tools/fiptool/tbbr_config.c | 7 |
3 files changed, 10 insertions, 2 deletions
diff --git a/include/tools_share/firmware_image_package.h b/include/tools_share/firmware_image_package.h index 75f3cc6a6..7342c0ced 100644 --- a/include/tools_share/firmware_image_package.h +++ b/include/tools_share/firmware_image_package.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -77,6 +77,8 @@ {{0x26, 0x25, 0x7c, 0x1a}, {0xdb, 0xc6}, {0x7f, 0x47}, 0x8d, 0x96, {0xc4, 0xc4, 0xb0, 0x24, 0x80, 0x21} } #define UUID_NT_FW_CONFIG \ {{0x28, 0xda, 0x98, 0x15}, {0x93, 0xe8}, {0x7e, 0x44}, 0xac, 0x66, {0x1a, 0xaf, 0x80, 0x15, 0x50, 0xf9} } +#define UUID_FW_CONFIG \ + {{0x58, 0x07, 0xe1, 0x6a}, {0x84, 0x59}, {0x47, 0xbe}, 0x8e, 0xd5, {0x64, 0x8e, 0x8d, 0xdd, 0xab, 0x0e} } typedef struct fip_toc_header { uint32_t name; diff --git a/lib/debugfs/devfip.c b/lib/debugfs/devfip.c index 70ac3bc04..b0ee39a11 100644 --- a/lib/debugfs/devfip.c +++ b/lib/debugfs/devfip.c @@ -73,6 +73,7 @@ static const struct uuidnames uuidnames[] = { {"soc-fw.cfg", UUID_SOC_FW_CONFIG}, {"tos-fw.cfg", UUID_TOS_FW_CONFIG}, {"nt-fw.cfg", UUID_NT_FW_CONFIG}, + {"fw.cfg", UUID_FW_CONFIG}, {"rot-k.crt", UUID_ROT_KEY_CERT}, {"nt-k.crt", UUID_NON_TRUSTED_WORLD_KEY_CERT}, {"sip-sp.crt", UUID_SIP_SECURE_PARTITION_CONTENT_CERT} diff --git a/tools/fiptool/tbbr_config.c b/tools/fiptool/tbbr_config.c index 1c5ef5f59..bf721c1fa 100644 --- a/tools/fiptool/tbbr_config.c +++ b/tools/fiptool/tbbr_config.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -69,6 +69,11 @@ toc_entry_t toc_entries[] = { }, /* Dynamic Configs */ { + .name = "FW_CONFIG", + .uuid = UUID_FW_CONFIG, + .cmdline_name = "fw-config" + }, + { .name = "HW_CONFIG", .uuid = UUID_HW_CONFIG, .cmdline_name = "hw-config" |