Andrew Geissler | 2daf84b | 2023-03-31 09:57:23 -0500 | [diff] [blame^] | 1 | From c385b628aa3588aeb6f86f8b98fd3bdb304a296c Mon Sep 17 00:00:00 2001 |
| 2 | From: Mohamed Omar Asaker <mohamed.omarasaker@arm.com> |
| 3 | Date: Wed, 11 Jan 2023 12:47:45 +0000 |
| 4 | Subject: [PATCH 10/10] Platform: corstone1000:flash_layout simplification |
| 5 | |
| 6 | Complete the simplification of the flash layout. |
| 7 | The flash layout contains only the static definitions |
| 8 | that describe the static layout and the boundries of the dynamic |
| 9 | regions. |
| 10 | |
| 11 | The dynamic regions addresses are known by the GPT parser. |
| 12 | |
| 13 | Signed-off-by: Mohamed Omar Asaker <mohamed.omarasaker@arm.com> |
| 14 | Upstream-Status: Pending [Not submitted to upstream yet] |
| 15 | --- |
| 16 | .../arm/corstone1000/partition/flash_layout.h | 44 ------------------- |
| 17 | 1 file changed, 44 deletions(-) |
| 18 | |
| 19 | diff --git a/platform/ext/target/arm/corstone1000/partition/flash_layout.h b/platform/ext/target/arm/corstone1000/partition/flash_layout.h |
| 20 | index c5cf94a52c..b01a3621b3 100644 |
| 21 | --- a/platform/ext/target/arm/corstone1000/partition/flash_layout.h |
| 22 | +++ b/platform/ext/target/arm/corstone1000/partition/flash_layout.h |
| 23 | @@ -142,28 +142,9 @@ |
| 24 | * Host: FIP and Kernel image |
| 25 | */ |
| 26 | |
| 27 | -/****** TODO: START : NEED SIMPLIFICATION BASED ON GPT *******************/ |
| 28 | /* Bank configurations */ |
| 29 | #define BANK_PARTITION_SIZE (0xFE0000) /* 15.875 MB */ |
| 30 | #define TFM_PARTITION_SIZE (0x5E000) /* 376 KB */ |
| 31 | -#define FIP_PARTITION_SIZE (0x200000) /* 2 MB */ |
| 32 | -#define KERNEL_PARTITION_SIZE (0xC00000) /* 12 MB */ |
| 33 | - |
| 34 | -/************************************************************/ |
| 35 | -/* Bank : Images flash offsets are with respect to the bank */ |
| 36 | -/************************************************************/ |
| 37 | - |
| 38 | -/* Image 0: BL2 primary and secondary images */ |
| 39 | -#define FLASH_AREA_8_ID (1) |
| 40 | -#define FLASH_AREA_8_OFFSET (0) /* starting from 0th offset of the bank */ |
| 41 | -#define FLASH_AREA_8_SIZE (SE_BL2_PARTITION_SIZE) |
| 42 | - |
| 43 | -#define FLASH_AREA_9_ID (FLASH_AREA_8_ID + 1) |
| 44 | -#define FLASH_AREA_9_OFFSET (FLASH_AREA_8_OFFSET + FLASH_AREA_8_SIZE) |
| 45 | -#define FLASH_AREA_9_SIZE (SE_BL2_PARTITION_SIZE) |
| 46 | - |
| 47 | -#define FWU_METADATA_IMAGE_0_OFFSET (FLASH_AREA_8_OFFSET) |
| 48 | -#define FWU_METADATA_IMAGE_0_SIZE_LIMIT (FLASH_AREA_8_SIZE + FLASH_AREA_9_SIZE) |
| 49 | |
| 50 | /* Macros needed to imgtool.py, used when creating BL2 signed image */ |
| 51 | #define BL2_IMAGE_LOAD_ADDRESS (SRAM_BASE + TFM_PARTITION_SIZE + BL2_DATA_GAP_SIZE) |
| 52 | @@ -172,33 +153,16 @@ |
| 53 | |
| 54 | /* Image 1: TF-M primary and secondary images */ |
| 55 | #define FLASH_AREA_0_ID (1) |
| 56 | -#define FLASH_AREA_0_OFFSET (FLASH_AREA_9_OFFSET + \ |
| 57 | - FLASH_AREA_9_SIZE) |
| 58 | #define FLASH_AREA_0_SIZE (TFM_PARTITION_SIZE) |
| 59 | - |
| 60 | #define FLASH_AREA_1_ID (FLASH_AREA_0_ID + 1) |
| 61 | -#define FLASH_AREA_1_OFFSET (FLASH_AREA_0_OFFSET + FLASH_AREA_0_SIZE) |
| 62 | #define FLASH_AREA_1_SIZE (TFM_PARTITION_SIZE) |
| 63 | |
| 64 | -#define FWU_METADATA_IMAGE_1_OFFSET (FLASH_AREA_0_OFFSET) |
| 65 | -#define FWU_METADATA_IMAGE_1_SIZE_LIMIT (FLASH_AREA_0_SIZE + FLASH_AREA_1_SIZE) |
| 66 | - |
| 67 | /* Image 2: Host FIP */ |
| 68 | #define FIP_SIGNATURE_AREA_SIZE (0x1000) /* 4 KB */ |
| 69 | |
| 70 | -#define FLASH_FIP_OFFSET (FLASH_AREA_1_OFFSET + \ |
| 71 | - FLASH_AREA_1_SIZE + FIP_SIGNATURE_AREA_SIZE) |
| 72 | -#define FLASH_FIP_ADDRESS (FLASH_BASE_ADDRESS + FLASH_FIP_OFFSET) |
| 73 | -#define FLASH_FIP_SIZE (FIP_PARTITION_SIZE) |
| 74 | - |
| 75 | /* Host BL2 (TF-A) primary and secondary image. */ |
| 76 | #define FLASH_AREA_2_ID (FLASH_AREA_1_ID + 1) |
| 77 | #define FLASH_AREA_3_ID (FLASH_AREA_2_ID + 1) |
| 78 | -#define FLASH_INVALID_OFFSET (0xFFFFFFFF) |
| 79 | -#define FLASH_INVALID_SIZE (0xFFFFFFFF) |
| 80 | - |
| 81 | -#define FWU_METADATA_IMAGE_2_OFFSET (FLASH_FIP_OFFSET) |
| 82 | -#define FWU_METADATA_IMAGE_2_SIZE_LIMIT (FLASH_FIP_SIZE) |
| 83 | |
| 84 | /* Macros needed to imgtool.py, used when creating TF-M signed image */ |
| 85 | #define S_IMAGE_LOAD_ADDRESS (SRAM_BASE) |
| 86 | @@ -216,14 +180,6 @@ |
| 87 | |
| 88 | #define FLASH_AREA_IMAGE_SCRATCH 255 |
| 89 | |
| 90 | -/* Image 3: Kernel image */ |
| 91 | -#define KERNEL_PARTITION_OFFSET (FLASH_FIP_OFFSET + FLASH_FIP_SIZE) |
| 92 | - |
| 93 | -#define FWU_METADATA_IMAGE_3_OFFSET (KERNEL_PARTITION_OFFSET) |
| 94 | -#define FWU_METADATA_IMAGE_3_SIZE_LIMIT (KERNEL_PARTITION_SIZE) |
| 95 | - |
| 96 | -/****** TODO: END : NEED SIMPLIFICATION BASED ON GPT *******************/ |
| 97 | - |
| 98 | /*******************************/ |
| 99 | /*** ITS, PS and NV Counters ***/ |
| 100 | /*******************************/ |
| 101 | -- |
| 102 | 2.25.1 |
| 103 | |