Patrick Williams | 8e7b46e | 2023-05-01 14:19:06 -0500 | [diff] [blame^] | 1 | From 535d366137d2dd0804d3e67ada78151e0e318eeb Mon Sep 17 00:00:00 2001 |
| 2 | From: Emekcan Aras <emekcan.aras@arm.com> |
| 3 | Date: Fri, 3 Mar 2023 12:25:04 +0000 |
| 4 | Subject: [PATCH 3/6] Platform: corstone1000: Reorganize bl2 files |
| 5 | |
| 6 | From: Mohamed Omar Asaker <mohamed.omarasaker@arm.com> |
| 7 | |
| 8 | To be consistnant, organize bl2 files same as bl1 files |
| 9 | |
| 10 | Upstream-Status: Submitted [https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/20555] |
| 11 | Signed-off-by: Mohamed Omar Asaker <mohamed.omarasaker@arm.com> |
| 12 | Change-Id: I3332f4dbbde1c5f2cde5a187b038dc3430b9503f |
| 13 | --- |
| 14 | platform/ext/target/arm/corstone1000/CMakeLists.txt | 6 +++--- |
| 15 | .../ext/target/arm/corstone1000/{ => bl2}/boot_hal_bl2.c | 0 |
| 16 | .../corstone1000/{bl2_flash_map.c => bl2/flash_map_bl2.c} | 0 |
| 17 | .../{bl2_security_cnt.c => bl2/security_cnt_bl2.c} | 0 |
| 18 | 4 files changed, 3 insertions(+), 3 deletions(-) |
| 19 | rename platform/ext/target/arm/corstone1000/{ => bl2}/boot_hal_bl2.c (100%) |
| 20 | rename platform/ext/target/arm/corstone1000/{bl2_flash_map.c => bl2/flash_map_bl2.c} (100%) |
| 21 | rename platform/ext/target/arm/corstone1000/{bl2_security_cnt.c => bl2/security_cnt_bl2.c} (100%) |
| 22 | |
| 23 | diff --git a/platform/ext/target/arm/corstone1000/CMakeLists.txt b/platform/ext/target/arm/corstone1000/CMakeLists.txt |
| 24 | index a4fe28c08..3d4c787a6 100644 |
| 25 | --- a/platform/ext/target/arm/corstone1000/CMakeLists.txt |
| 26 | +++ b/platform/ext/target/arm/corstone1000/CMakeLists.txt |
| 27 | @@ -196,7 +196,7 @@ target_sources(platform_bl2 |
| 28 | Native_Driver/arm_watchdog_drv.c |
| 29 | fip_parser/fip_parser.c |
| 30 | fw_update_agent/fwu_agent.c |
| 31 | - bl2_security_cnt.c |
| 32 | + bl2/security_cnt_bl2.c |
| 33 | $<$<NOT:$<BOOL:${PLATFORM_DEFAULT_OTP}>>:${PLATFORM_DIR}/ext/accelerator/cc312/otp_cc312.c> |
| 34 | io/io_block.c |
| 35 | io/io_flash.c |
| 36 | @@ -235,8 +235,8 @@ target_compile_definitions(platform_bl2 |
| 37 | # platform_init/quit* apis symbol collision in bl1. |
| 38 | target_sources(bl2 |
| 39 | PRIVATE |
| 40 | - bl2_flash_map.c |
| 41 | - boot_hal_bl2.c |
| 42 | + bl2/flash_map_bl2.c |
| 43 | + bl2/boot_hal_bl2.c |
| 44 | ) |
| 45 | |
| 46 | target_link_libraries(bl2 |
| 47 | diff --git a/platform/ext/target/arm/corstone1000/boot_hal_bl2.c b/platform/ext/target/arm/corstone1000/bl2/boot_hal_bl2.c |
| 48 | similarity index 100% |
| 49 | rename from platform/ext/target/arm/corstone1000/boot_hal_bl2.c |
| 50 | rename to platform/ext/target/arm/corstone1000/bl2/boot_hal_bl2.c |
| 51 | diff --git a/platform/ext/target/arm/corstone1000/bl2_flash_map.c b/platform/ext/target/arm/corstone1000/bl2/flash_map_bl2.c |
| 52 | similarity index 100% |
| 53 | rename from platform/ext/target/arm/corstone1000/bl2_flash_map.c |
| 54 | rename to platform/ext/target/arm/corstone1000/bl2/flash_map_bl2.c |
| 55 | diff --git a/platform/ext/target/arm/corstone1000/bl2_security_cnt.c b/platform/ext/target/arm/corstone1000/bl2/security_cnt_bl2.c |
| 56 | similarity index 100% |
| 57 | rename from platform/ext/target/arm/corstone1000/bl2_security_cnt.c |
| 58 | rename to platform/ext/target/arm/corstone1000/bl2/security_cnt_bl2.c |
| 59 | -- |
| 60 | 2.17.1 |
| 61 | |