diff options
author | TTornblom <thomas.tornblom@iar.com> | 2019-11-19 12:53:16 +0100 |
---|---|---|
committer | Ken Liu <ken.liu@arm.com> | 2020-04-20 01:51:47 +0000 |
commit | 83d9637fa26444736c06c1486c00cf63d5111525 (patch) | |
tree | 99d18f127623c2c286c5f0ebef7131fa582bcfa6 /bl2/ext | |
parent | 344c29385ae223ac4253fb65ff156ce0da5b5ad3 (diff) | |
download | trusted-firmware-m-83d9637fa26444736c06c1486c00cf63d5111525.tar.gz |
Build: Update to IAR support
Cleaned up #ifdef in secure_fw/services/tfm_spm_db.inc.template
Moved "signals" member to front of spm_partition_runtime_data_t.
The suggestion to move the aggregate types to the front turned
out to be hard to make work for both PSA and non-PSA configs.
Moved REGION_DECLARE macros to new include file,
platform/include/region.h.
Cleaned up type cast in core_test_api.c
Change-Id: I5dce1e7c019d4d7e4c14dc79be5ee2b855ad4f9e
Signed-off-by: Thomas Tornblom <thomas.tornblom@iar.com>
Diffstat (limited to 'bl2/ext')
-rw-r--r-- | bl2/ext/mcuboot/bl2_main.c | 6 | ||||
-rw-r--r-- | bl2/ext/mcuboot/flash_map_extended.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/bl2/ext/mcuboot/bl2_main.c b/bl2/ext/mcuboot/bl2_main.c index 01922cba90..6c55ac805f 100644 --- a/bl2/ext/mcuboot/bl2_main.c +++ b/bl2/ext/mcuboot/bl2_main.c @@ -28,6 +28,7 @@ #include "boot_record.h" #include "security_cnt.h" #include "boot_hal.h" +#include "region.h" #if MCUBOOT_LOG_LEVEL > MCUBOOT_LOG_LEVEL_OFF #include "uart_stdout.h" #endif @@ -42,11 +43,6 @@ __asm(" .global __ARM_use_no_argv\n"); #endif #if defined(__ARM_ARCH_8M_MAIN__) || defined(__ARM_ARCH_8M_BASE__) -/* Macros to pick linker symbols */ -#define REGION(a, b, c) a##b##c -#define REGION_NAME(a, b, c) REGION(a, b, c) -#define REGION_DECLARE(a, b, c) extern uint32_t REGION_NAME(a, b, c) - REGION_DECLARE(Image$$, ARM_LIB_STACK, $$ZI$$Base); #endif diff --git a/bl2/ext/mcuboot/flash_map_extended.c b/bl2/ext/mcuboot/flash_map_extended.c index 887f89be15..f84d698603 100644 --- a/bl2/ext/mcuboot/flash_map_extended.c +++ b/bl2/ext/mcuboot/flash_map_extended.c @@ -28,7 +28,7 @@ int flash_device_base(uint8_t fd_id, uintptr_t *ret) if (fd_id != FLASH_DEVICE_ID) { BOOT_LOG_ERR("invalid flash ID %d; expected %d", fd_id, FLASH_DEVICE_ID); - return -EINVAL; + return -1; } *ret = FLASH_DEVICE_BASE; return 0; @@ -47,7 +47,7 @@ int flash_area_id_from_multi_image_slot(int image_index, int slot) case 2: return FLASH_AREA_IMAGE_SCRATCH; } - return -EINVAL; /* flash_area_open will fail on that */ + return -1; /* flash_area_open will fail on that */ } int flash_area_id_from_image_slot(int slot) |