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

diff --git a/include/tools_share/firmware_image_package.h b/include/tools_share/firmware_image_package.h
index 75f3cc6a626b6d939d9d3a1f528925f203053a57..7342c0cedb76a284e8cba289f4297d03efaaad85 100644 (file)
--- 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 70ac3bc042d3dd30a3b8768172dbeeaa66034883..b0ee39a113da5d98ddcbaa4a45f4f93c392c9718 100644 (file)
--- 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 1c5ef5f59d467944cd4e7e89643c8768cf7af5aa..bf721c1fa18e5f0a31587c516351e3bffb012d3b 100644 (file)
--- 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
  */
@@ -68,6 +68,11 @@ toc_entry_t toc_entries[] = {
                .cmdline_name = "nt-fw"
        },
        /* Dynamic Configs */
+       {
+               .name = "FW_CONFIG",
+               .uuid = UUID_FW_CONFIG,
+               .cmdline_name = "fw-config"
+       },
        {
                .name = "HW_CONFIG",
                .uuid = UUID_HW_CONFIG,