[PATCH 2/7] fip: mark predefined toc_entries array const

[Ahmad Fatoum]

There is no use case for modifying these mapping structure used by the
fiptool command, so mark them appropriately.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 commands/fiptool.c | 4 ++--
 include/fiptool.h  | 4 ++--
 lib/fip.c          | 2 +-
 lib/tbbr_config.c  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/commands/fiptool.c b/commands/fiptool.c
index 46b5ed29c317..ccf99491bf66 100644
--- a/commands/fiptool.c
+++ b/commands/fiptool.c
@@ -115,9 +115,9 @@ static int info_cmd(struct fip_state *fip, int argc, char *argv[])
 
 static int uuid_cmd(struct fip_state *fip, int argc, char *argv[])
 {
-	for (toc_entry_t *t = toc_entries; t->cmdline_name != NULL; t++)
+	for (const toc_entry_t *t = toc_entries; t->cmdline_name != NULL; t++)
 		printf("%pU\t%-16s\t%s\n", &t->uuid, t->cmdline_name, t->name);
-	for (toc_entry_t *t = plat_def_toc_entries; t->cmdline_name != NULL; t++)
+	for (const toc_entry_t *t = plat_def_toc_entries; t->cmdline_name != NULL; t++)
 		printf("%pU\t%-16s\t%s\n", &t->uuid, t->cmdline_name, t->name);
 	return 0;
 }
diff --git a/include/fiptool.h b/include/fiptool.h
index 1b70824a8694..1a0dbe0e6975 100644
--- a/include/fiptool.h
+++ b/include/fiptool.h
@@ -91,8 +91,8 @@ typedef struct toc_entry {
 	char         *cmdline_name;
 } toc_entry_t;
 
-extern toc_entry_t toc_entries[];
-extern toc_entry_t plat_def_toc_entries[];
+extern const toc_entry_t toc_entries[];
+extern const toc_entry_t plat_def_toc_entries[];
 
 #define fip_for_each_desc(fip, e) \
         list_for_each_entry(e, &(fip)->descs, list)
diff --git a/lib/fip.c b/lib/fip.c
index f3754bdc29af..9470aa5d3398 100644
--- a/lib/fip.c
+++ b/lib/fip.c
@@ -105,7 +105,7 @@ void fip_free(struct fip_state *fip)
 
 void fip_fill_image_descs(struct fip_state *fip)
 {
-	toc_entry_t *toc_entry;
+	const toc_entry_t *toc_entry;
 
 	for (toc_entry = toc_entries;
 	     toc_entry->cmdline_name != NULL;
diff --git a/lib/tbbr_config.c b/lib/tbbr_config.c
index 3d777e5648a9..9e5f51029beb 100644
--- a/lib/tbbr_config.c
+++ b/lib/tbbr_config.c
@@ -5,7 +5,7 @@
 #include <fiptool.h>
 
 /* The images used depends on the platform. */
-toc_entry_t toc_entries[] = {
+const toc_entry_t toc_entries[] = {
 	{
 		.name = "SCP Firmware Updater Configuration FWU SCP_BL2U",
 		.uuid = UUID_TRUSTED_UPDATE_FIRMWARE_SCP_BL2U,
@@ -187,7 +187,7 @@ toc_entry_t toc_entries[] = {
 	}
 };
 
-toc_entry_t plat_def_toc_entries[] = {
+const toc_entry_t plat_def_toc_entries[] = {
 #ifdef CONFIG_ARCH_STM32MP
 	{
 		.name = "STM32MP CONFIG CERT",
-- 
2.39.5