Patrick Williams | 2390b1b | 2022-11-03 13:47:49 -0500 | [diff] [blame] | 1 | From 492c887c8dff97ea1b8a11b4e729620d3744ac38 Mon Sep 17 00:00:00 2001 |
| 2 | From: Satish Kumar <satish.kumar01@arm.com> |
| 3 | Date: Mon, 30 May 2022 12:38:23 +0100 |
| 4 | Subject: [PATCH 6/6] corstone1000: remove two partition configuration |
| 5 | |
| 6 | Previously to run tf-m test, a larger partition was created |
| 7 | which allowed all default test binaries to be included. |
| 8 | The patch revert the change because any partition might |
| 9 | not be enough to hold all test binaries in the future. |
| 10 | So its better to run few test at a time instead of creating |
| 11 | a larger partition. |
| 12 | |
| 13 | Signed-off-by: Satish Kumar <satish.kumar01@arm.com> |
| 14 | Change-Id: I223fe45f2de014dbcadc6ac12c321c524701116a |
| 15 | Upstream-Status: Accepted [TF-Mv1.7.0] |
| 16 | --- |
| 17 | platform/ext/target/arm/corstone1000/bl1/CMakeLists.txt | 1 - |
| 18 | platform/ext/target/arm/corstone1000/partition/flash_layout.h | 4 ---- |
| 19 | 2 files changed, 5 deletions(-) |
| 20 | |
| 21 | diff --git a/platform/ext/target/arm/corstone1000/bl1/CMakeLists.txt b/platform/ext/target/arm/corstone1000/bl1/CMakeLists.txt |
| 22 | index d39c5ae91d..f1ae1ebd47 100644 |
| 23 | --- a/platform/ext/target/arm/corstone1000/bl1/CMakeLists.txt |
| 24 | +++ b/platform/ext/target/arm/corstone1000/bl1/CMakeLists.txt |
| 25 | @@ -291,7 +291,6 @@ target_compile_definitions(signing_layout_for_bl2 |
| 26 | PRIVATE |
| 27 | MCUBOOT_IMAGE_NUMBER=${BL1_IMAGE_NUMBER} |
| 28 | BL1 |
| 29 | - $<$<BOOL:${TFM_S_REG_TEST}>:TFM_S_REG_TEST> |
| 30 | ) |
| 31 | |
| 32 | target_include_directories(signing_layout_for_bl2 |
| 33 | diff --git a/platform/ext/target/arm/corstone1000/partition/flash_layout.h b/platform/ext/target/arm/corstone1000/partition/flash_layout.h |
| 34 | index b0319bb319..50a0a11fc8 100644 |
| 35 | --- a/platform/ext/target/arm/corstone1000/partition/flash_layout.h |
| 36 | +++ b/platform/ext/target/arm/corstone1000/partition/flash_layout.h |
| 37 | @@ -119,11 +119,7 @@ |
| 38 | * |
| 39 | */ |
| 40 | #define SE_BL2_PARTITION_SIZE (0x19000) /* 100 KB */ |
| 41 | -#ifdef TFM_S_REG_TEST |
| 42 | -#define TFM_PARTITION_SIZE (0x61C00) /* 391 KB */ |
| 43 | -#else |
| 44 | #define TFM_PARTITION_SIZE (0x5E000) /* 376 KB */ |
| 45 | -#endif |
| 46 | #define FIP_PARTITION_SIZE (0x200000) /* 2 MB */ |
| 47 | #define KERNEL_PARTITION_SIZE (0xC00000) /* 12 MB */ |
| 48 | |
| 49 | -- |
| 50 | 2.25.1 |
| 51 | |