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>
diff --git a/bl2/ext/mcuboot/include/target.h b/bl2/ext/mcuboot/include/target.h
index 28e6cac..97930d7 100644
--- a/bl2/ext/mcuboot/include/target.h
+++ b/bl2/ext/mcuboot/include/target.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2017, Linaro Ltd
- * Copyright (c) 2018, Arm Limited.
+ * Copyright (c) 2018-2019, Arm Limited.
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -21,20 +21,20 @@
#error "FLASH_AREA_IMAGE_SECTOR_SIZE must be defined by the target"
#endif
-#ifndef FLASH_AREA_IMAGE_0_OFFSET
-#error "FLASH_AREA_IMAGE_0_OFFSET must be defined by the target"
+#ifndef FLASH_AREA_IMAGE_PRIMARY_OFFSET
+#error "FLASH_AREA_IMAGE_PRIMARY_OFFSET must be defined by the target"
#endif
-#ifndef FLASH_AREA_IMAGE_0_SIZE
-#error "FLASH_AREA_IMAGE_0_SIZE must be defined by the target"
+#ifndef FLASH_AREA_IMAGE_PRIMARY_SIZE
+#error "FLASH_AREA_IMAGE_PRIMARY_SIZE must be defined by the target"
#endif
-#ifndef FLASH_AREA_IMAGE_1_OFFSET
-#error "FLASH_AREA_IMAGE_1_OFFSET must be defined by the target"
+#ifndef FLASH_AREA_IMAGE_SECONDARY_OFFSET
+#error "FLASH_AREA_IMAGE_SECONDARY_OFFSET must be defined by the target"
#endif
-#ifndef FLASH_AREA_IMAGE_1_SIZE
-#error "FLASH_AREA_IMAGE_1_SIZE must be defined by the target"
+#ifndef FLASH_AREA_IMAGE_SECONDARY_SIZE
+#error "FLASH_AREA_IMAGE_SECONDARY_SIZE must be defined by the target"
#endif
#ifndef FLASH_AREA_IMAGE_SCRATCH_OFFSET