Platform: Fix issues of cppcheck under platform/ext/common.
As programming issues found in static check, those issues
shall be fixed to make code more stable.
Signed-off-by: Chendi Sun <chendi.sun@arm.com>
Change-Id: I17e7bc0682f3d5ea9933ebb67e9ebd14cda12a0a
diff --git a/platform/ext/common/provisioning.c b/platform/ext/common/provisioning.c
index 358d772..01f482e 100644
--- a/platform/ext/common/provisioning.c
+++ b/platform/ext/common/provisioning.c
@@ -29,7 +29,9 @@
uint8_t iak[32];
uint32_t iak_len;
uint32_t iak_type;
+#if ATTEST_INCLUDE_COSE_KEY_ID
uint8_t iak_id[32];
+#endif /* ATTEST_INCLUDE_COSE_KEY_ID */
uint8_t boot_seed[32];
uint8_t implementation_id[32];
@@ -70,8 +72,10 @@
/* IAK type */
PSA_ECC_FAMILY_SECP_R1,
#endif /* SYMMETRIC_INITIAL_ATTESTATION */
+#if ATTEST_INCLUDE_COSE_KEY_ID
/* IAK id */
"kid@trustedfirmware.example",
+#endif /* ATTEST_INCLUDE_COSE_KEY_ID */
/* boot seed */
{
0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
diff --git a/platform/ext/common/template/flash_otp_nv_counters_backend.c b/platform/ext/common/template/flash_otp_nv_counters_backend.c
index 8b58a07..77013f5 100644
--- a/platform/ext/common/template/flash_otp_nv_counters_backend.c
+++ b/platform/ext/common/template/flash_otp_nv_counters_backend.c
@@ -126,7 +126,7 @@
enum tfm_plat_err_t read_otp_nv_counters_flash(uint32_t offset, void *data, uint32_t cnt)
{
- enum tfm_plat_err_t err = TFM_PLAT_ERR_SUCCESS;
+ int32_t err;
ARM_FLASH_CAPABILITIES DriverCapabilities;
uint8_t data_width;
uint32_t remaining_cnt, read_cnt;
@@ -141,7 +141,7 @@
remaining_cnt = cnt;
read_cnt = 0;
if (remaining_cnt) {
- err = (enum tfm_plat_err_t)OTP_NV_COUNTERS_FLASH_DEV.ReadData(
+ err = OTP_NV_COUNTERS_FLASH_DEV.ReadData(
TFM_OTP_NV_COUNTERS_AREA_ADDR + offset,
data,
cnt / data_width);
@@ -152,7 +152,7 @@
read_cnt += (cnt / data_width) * data_width;
remaining_cnt -= read_cnt;
if (remaining_cnt) {
- err = (enum tfm_plat_err_t)OTP_NV_COUNTERS_FLASH_DEV.ReadData(
+ err = OTP_NV_COUNTERS_FLASH_DEV.ReadData(
TFM_OTP_NV_COUNTERS_AREA_ADDR + offset + read_cnt,
temp_buffer,
1);
@@ -257,7 +257,7 @@
static enum tfm_plat_err_t copy_flash_region(size_t from, size_t to, size_t size)
{
- enum tfm_plat_err_t err = TFM_PLAT_ERR_SUCCESS;
+ int32_t err;
size_t copy_size;
size_t idx;
size_t end;
@@ -272,12 +272,12 @@
for(idx = 0; idx < end; idx += copy_size) {
copy_size = (idx + sizeof(block)) <= end ? sizeof(block) : end - idx;
- err = (enum tfm_plat_err_t)OTP_NV_COUNTERS_FLASH_DEV.ReadData(from + idx, block, copy_size / data_width);
+ err = OTP_NV_COUNTERS_FLASH_DEV.ReadData(from + idx, block, copy_size / data_width);
if (err < 0) {
return TFM_PLAT_ERR_SYSTEM_ERR;
}
- err = (enum tfm_plat_err_t)OTP_NV_COUNTERS_FLASH_DEV.ProgramData(to + idx, block, copy_size / data_width);
+ err = OTP_NV_COUNTERS_FLASH_DEV.ProgramData(to + idx, block, copy_size / data_width);
if (err < 0) {
return TFM_PLAT_ERR_SYSTEM_ERR;
}
@@ -427,8 +427,12 @@
return err;
}
+#if (TFM_HAL_ITS_PROGRAM_UNIT == 1)
+ swap_count = (uint32_t*)(swap_count_buf);
+#else
swap_count = (uint32_t*)(swap_count_buf + (offsetof(struct flash_otp_nv_counters_region_t, swap_count) %
TFM_HAL_ITS_PROGRAM_UNIT));
+#endif
*swap_count += 1;
if (*swap_count == UINT32_MAX) {
*swap_count = 1;
diff --git a/platform/ext/target/arm/mps2/an519/partition/flash_layout.h b/platform/ext/target/arm/mps2/an519/partition/flash_layout.h
index 19cf88c..6624e63 100644
--- a/platform/ext/target/arm/mps2/an519/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps2/an519/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Cypress Semiconductor Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,11 +62,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x80000) /* S partition: 512 KB */
#define FLASH_NS_PARTITION_SIZE (0x80000) /* NS partition: 512 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB */
/* Same as FLASH0_SIZE */
diff --git a/platform/ext/target/arm/mps2/an521/partition/flash_layout.h b/platform/ext/target/arm/mps2/an521/partition/flash_layout.h
index 08470cc..9bd613f 100644
--- a/platform/ext/target/arm/mps2/an521/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps2/an521/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Cypress Semiconductor Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,11 +62,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x80000) /* S partition: 512 KB */
#define FLASH_NS_PARTITION_SIZE (0x80000) /* NS partition: 512 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB */
/* Same as FLASH0_SIZE */
diff --git a/platform/ext/target/arm/mps3/an524/partition/flash_layout.h b/platform/ext/target/arm/mps3/an524/partition/flash_layout.h
index b31605c..c514452 100644
--- a/platform/ext/target/arm/mps3/an524/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps3/an524/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Cypress Semiconductor Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -52,11 +52,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x80000) /* S partition: 512 KB */
#define FLASH_NS_PARTITION_SIZE (0x40000) /* NS partition: 256 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB */
/* Same as FLASH0_SIZE */
diff --git a/platform/ext/target/arm/mps3/an547/partition/flash_layout.h b/platform/ext/target/arm/mps3/an547/partition/flash_layout.h
index 9b1413c..a2b0fa0 100644
--- a/platform/ext/target/arm/mps3/an547/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps3/an547/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2022 Arm Limited. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -59,11 +59,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x60000) /* S partition: 384 KB */
#define FLASH_NS_PARTITION_SIZE (0x60000) /* NS partition: 384 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB */
/* Same as FLASH0_SIZE */
diff --git a/platform/ext/target/arm/mps3/an552/partition/flash_layout.h b/platform/ext/target/arm/mps3/an552/partition/flash_layout.h
index d5104fe..753594b 100644
--- a/platform/ext/target/arm/mps3/an552/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps3/an552/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2022 Arm Limited. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -63,11 +63,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x60000) /* S partition: 384 KB */
#define FLASH_NS_PARTITION_SIZE (0x60000) /* NS partition: 384 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB */
/* Same as FLASH0_SIZE */
diff --git a/platform/ext/target/arm/mps3/corstone310/common/partition/flash_layout.h b/platform/ext/target/arm/mps3/corstone310/common/partition/flash_layout.h
index 111c3d9..0b5f514 100644
--- a/platform/ext/target/arm/mps3/corstone310/common/partition/flash_layout.h
+++ b/platform/ext/target/arm/mps3/corstone310/common/partition/flash_layout.h
@@ -59,11 +59,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x60000) /* S partition: 384 KB */
#define FLASH_NS_PARTITION_SIZE (0x60000) /* NS partition: 384 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB */
/* Same as FLASH0_SIZE */
diff --git a/platform/ext/target/arm/musca_b1/partition/flash_layout.h b/platform/ext/target/arm/musca_b1/partition/flash_layout.h
index 6916023..b965bbd 100644
--- a/platform/ext/target/arm/musca_b1/partition/flash_layout.h
+++ b/platform/ext/target/arm/musca_b1/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Cypress Semiconductor Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -65,11 +65,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x60000) /* S partition: 384 KB */
#define FLASH_NS_PARTITION_SIZE (0x80000) /* NS partition: 512 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the embedded flash hardware */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x4000) /* 16 KB */
#define FLASH_TOTAL_SIZE (0x200000) /* 2 MB */
diff --git a/platform/ext/target/arm/musca_s1/partition/flash_layout.h b/platform/ext/target/arm/musca_s1/partition/flash_layout.h
index b8a9102..82d4eba 100644
--- a/platform/ext/target/arm/musca_s1/partition/flash_layout.h
+++ b/platform/ext/target/arm/musca_s1/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Cypress Semiconductor Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -67,11 +67,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x60000) /* S partition: 384 KB */
#define FLASH_NS_PARTITION_SIZE (0x80000) /* NS partition: 512 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4KB */
#define FLASH_TOTAL_SIZE (0x200000) /* MRAM size 2MB */
diff --git a/platform/ext/target/lairdconnectivity/common/bl5340/partition/flash_layout.h b/platform/ext/target/lairdconnectivity/common/bl5340/partition/flash_layout.h
index ab1c7bc..fbe29ff 100644
--- a/platform/ext/target/lairdconnectivity/common/bl5340/partition/flash_layout.h
+++ b/platform/ext/target/lairdconnectivity/common/bl5340/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Nordic Semiconductor ASA. All rights reserved.
* Copyright (c) 2021 Laird Connectivity. All rights reserved.
*
@@ -71,11 +71,12 @@
/* Without BL2 */
#define FLASH_NS_PARTITION_SIZE (0x58000) /* NS partition: 352 KB */
#endif
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the embedded flash hardware (erase/program) */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB. Flash memory program/erase operations have a page granularity. */
diff --git a/platform/ext/target/nordic_nrf/common/nrf5340/partition/flash_layout.h b/platform/ext/target/nordic_nrf/common/nrf5340/partition/flash_layout.h
index 6071f89..6f40f28 100644
--- a/platform/ext/target/nordic_nrf/common/nrf5340/partition/flash_layout.h
+++ b/platform/ext/target/nordic_nrf/common/nrf5340/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Nordic Semiconductor ASA. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,11 +62,11 @@
#define FLASH_NS_PARTITION_SIZE (0x30000) /* NS partition: 192 kB*/
#endif
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
-
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the embedded flash hardware (erase/program) */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB. Flash memory program/erase operations have a page granularity. */
diff --git a/platform/ext/target/nordic_nrf/common/nrf9160/partition/flash_layout.h b/platform/ext/target/nordic_nrf/common/nrf9160/partition/flash_layout.h
index 1e5e39b..3b13688 100644
--- a/platform/ext/target/nordic_nrf/common/nrf9160/partition/flash_layout.h
+++ b/platform/ext/target/nordic_nrf/common/nrf9160/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Nordic Semiconductor ASA. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -62,11 +62,11 @@
#define FLASH_NS_PARTITION_SIZE (0x30000) /* NS partition: 192 kB*/
#endif
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
-
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the embedded flash hardware (erase/program) */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x1000) /* 4 KB. Flash memory program/erase operations have a page granularity. */
diff --git a/platform/ext/target/nuvoton/m2351/partition/flash_layout.h b/platform/ext/target/nuvoton/m2351/partition/flash_layout.h
index 19181c5..1979e9f 100644
--- a/platform/ext/target/nuvoton/m2351/partition/flash_layout.h
+++ b/platform/ext/target/nuvoton/m2351/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Nuvoton Technology Corp. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,11 +41,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x40000) /* S partition : 192+64 KB */
#define FLASH_NS_PARTITION_SIZE (0x30000) /* NS partition: 256-64 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x800) /* 2 KB */
/* Same as FLASH0_SIZE */
diff --git a/platform/ext/target/nuvoton/m2354/partition/flash_layout.h b/platform/ext/target/nuvoton/m2354/partition/flash_layout.h
index 399c489..924c33f 100644
--- a/platform/ext/target/nuvoton/m2354/partition/flash_layout.h
+++ b/platform/ext/target/nuvoton/m2354/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2022 Arm Limited. All rights reserved.
* Copyright (c) 2020 Nuvoton Technology Corp. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -41,11 +41,12 @@
/* Size of a Secure and of a Non-secure image */
#define FLASH_S_PARTITION_SIZE (0x50000) /* S partition : 192+64+64 KB */
#define FLASH_NS_PARTITION_SIZE (0x90000) /* NS partition: 768-64-64 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Sector size of the flash hardware; same as FLASH0_SECTOR_SIZE */
#define FLASH_AREA_IMAGE_SECTOR_SIZE (0x800) /* 2 KB */
/* Same as FLASH0_SIZE */
diff --git a/platform/ext/target/nxp/lpcxpresso55s69/partition/flash_layout.h b/platform/ext/target/nxp/lpcxpresso55s69/partition/flash_layout.h
index 33f40fa..b5b8d41 100755
--- a/platform/ext/target/nxp/lpcxpresso55s69/partition/flash_layout.h
+++ b/platform/ext/target/nxp/lpcxpresso55s69/partition/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022 Arm Limited. All rights reserved.
* Copyright 2019-2021 NXP. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -65,11 +65,12 @@
#define FLASH_S_PARTITION_SIZE (0x28000) /* S partition: 160 KB */
#define FLASH_NS_PARTITION_SIZE (0x18000) /* NS partition: 96 KB */
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
#else /* NO BL2 */
#define FLASH_S_PARTITION_SIZE (0x50000) /* S partition: 320 kB*/
diff --git a/platform/ext/target/stm/b_u585i_iot02a/include/flash_layout.h b/platform/ext/target/stm/b_u585i_iot02a/include/flash_layout.h
index ffbd265..912f48f 100644
--- a/platform/ext/target/stm/b_u585i_iot02a/include/flash_layout.h
+++ b/platform/ext/target/stm/b_u585i_iot02a/include/flash_layout.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2021 Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022 Arm Limited. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -128,10 +128,11 @@
#define FLASH_PARTITION_SIZE (FLASH_S_PARTITION_SIZE+FLASH_NS_PARTITION_SIZE)
-#define FLASH_MAX_PARTITION_SIZE ((FLASH_S_PARTITION_SIZE > \
- FLASH_NS_PARTITION_SIZE) ? \
- FLASH_S_PARTITION_SIZE : \
- FLASH_NS_PARTITION_SIZE)
+#if (FLASH_S_PARTITION_SIZE > FLASH_NS_PARTITION_SIZE)
+#define FLASH_MAX_PARTITION_SIZE FLASH_S_PARTITION_SIZE
+#else
+#define FLASH_MAX_PARTITION_SIZE FLASH_NS_PARTITION_SIZE
+#endif
/* Secure image primary slot */
#define FLASH_AREA_0_ID (1)
#define FLASH_AREA_0_DEVICE_ID (FLASH_DEVICE_ID-FLASH_DEVICE_ID)