diff mbox series

[v2,16/21] fwu: remove the config symbols for number of banks and images

Message ID 20240212074712.3657076-17-sughosh.ganu@linaro.org
State New
Headers show
Series FWU: Migrate FWU metadata to version 2 | expand

Commit Message

Sughosh Ganu Feb. 12, 2024, 7:47 a.m. UTC 
With the migration to the FWU metadata version 2 structure, the values
of number of banks and number of images per bank are now obtained from
the metadata at runtime. Remove the now superfluous config symbols.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
---

Changes since V1: None

 arch/sandbox/Kconfig                     |  6 ------
 board/armltd/corstone1000/corstone1000.c |  2 +-
 lib/fwu_updates/Kconfig                  | 11 -----------
 3 files changed, 1 insertion(+), 18 deletions(-)
diff mbox series

Patch

diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig
index 0ce77de2fc..29013a5673 100644
--- a/arch/sandbox/Kconfig
+++ b/arch/sandbox/Kconfig
@@ -79,9 +79,3 @@  config SYS_FDT_LOAD_ADDR
 	  See `doc/arch/sandbox.rst` for more information.
 
 endmenu
-
-config FWU_NUM_BANKS
-	default 2
-
-config FWU_NUM_IMAGES_PER_BANK
-	default 2
diff --git a/board/armltd/corstone1000/corstone1000.c b/board/armltd/corstone1000/corstone1000.c
index 01c80aaf9d..15de738154 100644
--- a/board/armltd/corstone1000/corstone1000.c
+++ b/board/armltd/corstone1000/corstone1000.c
@@ -109,7 +109,7 @@  void fwu_plat_get_bootidx(uint *boot_idx)
 	 */
 	ret = fwu_get_active_index(boot_idx);
 	if (ret < 0) {
-		*boot_idx = CONFIG_FWU_NUM_BANKS;
+		*boot_idx = 0;
 		log_err("corstone1000: failed to read active index\n");
 	}
 }
diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig
index d35247d0e5..6bb94f88d3 100644
--- a/lib/fwu_updates/Kconfig
+++ b/lib/fwu_updates/Kconfig
@@ -12,17 +12,6 @@  menuconfig FWU_MULTI_BANK_UPDATE
 
 if FWU_MULTI_BANK_UPDATE
 
-config FWU_NUM_BANKS
-	int "Number of Banks defined by the platform"
-	help
-	  Define the number of banks of firmware images on a platform
-
-config FWU_NUM_IMAGES_PER_BANK
-	int "Number of firmware images per bank"
-	help
-	  Define the number of firmware images per bank. This value
-	  should be the same for all the banks.
-
 config FWU_TRIAL_STATE_CNT
 	int "Number of times system boots in Trial State"
 	default 3