commit 8bdfc2d24603e792599a2887383e9c88e244f3c8
author David Vincze <david.vincze@arm.com> Mon Mar 18 15:49:23 2019 +0100
committer David Vincze <david.vincze@arm.com> Wed Aug 28 16:51:05 2019 +0200
tree 8cc9e67ef0679bdfe954ac72ca17e77c2df70411
parent 54d05556f6932f8c145a55f85d6c465310d4360f

Boot: Replace flash partitioning terminology

This change replaces the slot 0/1 terminology with
primary/secondary slot and replaces FLASH_AREA_IMAGE_0/1
with FLASH_AREA_IMAGE_PRIMARY/SECONDARY. This naming
convention fits better to platforms with multiple images
and it is also an architecture agnostic alternative.

Change-Id: I5def429a076024831a702700736d9769a0b2301f
Signed-off-by: David Vincze <david.vincze@arm.com>

bl2/ext/mcuboot/flash_map.c

diff --git a/bl2/ext/mcuboot/flash_map.c b/bl2/ext/mcuboot/flash_map.c
index 937c18e..fddceef 100644
--- a/bl2/ext/mcuboot/flash_map.c
+++ b/bl2/ext/mcuboot/flash_map.c
@@ -58,25 +58,25 @@
 
 /*
  * The flash area describes essentially the partition table of the
- * flash.  In this case, it starts with FLASH_AREA_IMAGE_0.
+ * flash.  In this case, it starts with FLASH_AREA_IMAGE_PRIMARY.
  */
 static struct flash_map_entry part_map[] = {
     {
         .magic = FLASH_MAP_ENTRY_MAGIC,
         .area = {
-            .fa_id = FLASH_AREA_IMAGE_0,
+            .fa_id = FLASH_AREA_IMAGE_PRIMARY,
             .fa_device_id = FLASH_DEVICE_ID,
-            .fa_off = FLASH_AREA_IMAGE_0_OFFSET,
-            .fa_size = FLASH_AREA_IMAGE_0_SIZE,
+            .fa_off = FLASH_AREA_IMAGE_PRIMARY_OFFSET,
+            .fa_size = FLASH_AREA_IMAGE_PRIMARY_SIZE,
         },
     },
     {
         .magic = FLASH_MAP_ENTRY_MAGIC,
         .area = {
-            .fa_id = FLASH_AREA_IMAGE_1,
+            .fa_id = FLASH_AREA_IMAGE_SECONDARY,
             .fa_device_id = FLASH_DEVICE_ID,
-            .fa_off = FLASH_AREA_IMAGE_1_OFFSET,
-            .fa_size = FLASH_AREA_IMAGE_1_SIZE,
+            .fa_off = FLASH_AREA_IMAGE_SECONDARY_OFFSET,
+            .fa_size = FLASH_AREA_IMAGE_SECONDARY_SIZE,
         },
     },
     {
@@ -246,12 +246,12 @@
 }
 
 /*
- * This depends on the mappings defined in sysflash.h, and assumes
- * that slot 0, slot 1, and the scratch area area contiguous.
+ * This depends on the mappings defined in sysflash.h, and assumes that the
+ * primary slot, the secondary slot, and the scratch area are contiguous.
  */
 int flash_area_id_from_image_slot(int slot)
 {
-    return slot + FLASH_AREA_IMAGE_0;
+    return slot + FLASH_AREA_IMAGE_PRIMARY;
 }
 
 static int validate_idx(int idx, uint32_t *off, uint32_t *len)
@@ -262,13 +262,13 @@
      */
 
     switch (idx) {
-    case FLASH_AREA_IMAGE_0:
-        *off = FLASH_AREA_IMAGE_0_OFFSET;
-        *len = FLASH_AREA_IMAGE_0_SIZE;
+    case FLASH_AREA_IMAGE_PRIMARY:
+        *off = FLASH_AREA_IMAGE_PRIMARY_OFFSET;
+        *len = FLASH_AREA_IMAGE_PRIMARY_SIZE;
         break;
-    case FLASH_AREA_IMAGE_1:
-        *off = FLASH_AREA_IMAGE_1_OFFSET;
-        *len = FLASH_AREA_IMAGE_1_SIZE;
+    case FLASH_AREA_IMAGE_SECONDARY:
+        *off = FLASH_AREA_IMAGE_SECONDARY_OFFSET;
+        *len = FLASH_AREA_IMAGE_SECONDARY_SIZE;
         break;
     case FLASH_AREA_IMAGE_SCRATCH:
         *off = FLASH_AREA_IMAGE_SCRATCH_OFFSET;