Skip to content

Commit f9b93a5

Browse files
masz-nordiccarlescufi
authored andcommitted
[zep fromlist dirty] {spm, partitions}: include compiler_ext_defs.h last
Since `compiler_ext_defs.h` should define compiler symbols only if they have not been previously defined, it should be included as the last header to avoid redefine warnigns. Fix in all files. Change-Id: I010b8885b4e1b150ec527f0b246b95a4dab4902a Signed-off-by: Marcin Szymczyk <marcin.szymczyk@nordicsemi.no> Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
1 parent 3f878f9 commit f9b93a5

14 files changed

+14
-14
lines changed

secure_fw/partitions/ns_agent_tz/load_info_ns_agent_tz.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include <stdint.h>
1414
#include <stddef.h>
15-
#include "compiler_ext_defs.h"
1615
#include "config_impl.h"
1716
#include "spm.h"
1817
#include "load/partition_defs.h"
@@ -24,6 +23,7 @@
2423
*/
2524
#include "region_defs.h"
2625
#include "tfm_s_linker_alignments.h"
26+
#include "compiler_ext_defs.h"
2727

2828
#define TFM_SP_NS_AGENT_NDEPS (0)
2929
#define TFM_SP_NS_AGENT_NSERVS (0)

secure_fw/partitions/ns_agent_tz/ns_agent_tz.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
*/
1010
#include <stdint.h>
1111

12-
#include "compiler_ext_defs.h"
1312
#include "security_defs.h"
1413
#include "tfm_arch.h"
1514
#include "tfm_hal_platform.h"
15+
#include "compiler_ext_defs.h"
1616

1717
__naked void ns_agent_tz_main(uint32_t c_entry)
1818
{

secure_fw/partitions/ns_agent_tz/ns_agent_tz_v80m.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
*/
1010
#include <stdint.h>
1111

12-
#include "compiler_ext_defs.h"
1312
#include "security_defs.h"
1413
#include "tfm_arch.h"
1514
#include "tfm_hal_platform.h"
15+
#include "compiler_ext_defs.h"
1616

1717
__naked void ns_agent_tz_main(uint32_t c_entry)
1818
{

secure_fw/partitions/ns_agent_tz/psa_api_veneers_v80m.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <stdint.h>
99

1010
#include "cmsis_compiler.h"
11-
#include "compiler_ext_defs.h"
1211
#include "config_impl.h"
1312
#include "security_defs.h"
1413
#include "svc_num.h"
@@ -17,6 +16,7 @@
1716
#include "psa/client.h"
1817
#include "psa/service.h"
1918
#include "tfm_arch.h"
19+
#include "compiler_ext_defs.h"
2020

2121
/*
2222
* This is the veneers of FF-M Client APIs for Armv8.0-m.

secure_fw/spm/core/arch/tfm_arch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
*
66
*/
77

8-
#include "compiler_ext_defs.h"
98
#include "security_defs.h"
109
#include "tfm_arch.h"
1110
#include "tfm_core_trustzone.h"
1211
#include "utilities.h"
1312
#include "config_impl.h"
13+
#include "compiler_ext_defs.h"
1414

1515
#if defined(__ICCARM__) && (CONFIG_TFM_FLOAT_ABI >= 1)
1616
#pragma required = tfm_arch_clear_fp_data

secure_fw/spm/core/arch/tfm_arch_v6m_v7m.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
*/
77

88
#include <inttypes.h>
9-
#include "compiler_ext_defs.h"
109
#include "security_defs.h"
1110
#include "utilities.h"
1211
#include "spm.h"
1312
#include "tfm_arch.h"
1413
#include "tfm_hal_device_header.h"
1514
#include "tfm_svcalls.h"
1615
#include "svc_num.h"
16+
#include "compiler_ext_defs.h"
1717

1818
#if !defined(__ARM_ARCH_6M__) && !defined(__ARM_ARCH_7M__) && \
1919
!defined(__ARM_ARCH_7EM__)

secure_fw/spm/core/arch/tfm_arch_v8m_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010

1111
#include <inttypes.h>
12-
#include "compiler_ext_defs.h"
1312
#include "config_spm.h"
1413
#include "security_defs.h"
1514
#include "spm.h"
@@ -18,6 +17,7 @@
1817
#include "tfm_arch.h"
1918
#include "tfm_svcalls.h"
2019
#include "utilities.h"
20+
#include "compiler_ext_defs.h"
2121

2222
#if !defined(__ARM_ARCH_8M_BASE__)
2323
#error "Unsupported ARM Architecture."

secure_fw/spm/core/arch/tfm_arch_v8m_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include <inttypes.h>
1212

13-
#include "compiler_ext_defs.h"
1413
#include "config_spm.h"
1514
#include "security_defs.h"
1615
#include "region_defs.h"
@@ -22,6 +21,7 @@
2221
#include "utilities.h"
2322
#include "core_ext.h"
2423
#include "ffm/backend.h"
24+
#include "compiler_ext_defs.h"
2525

2626
#if !defined(__ARM_ARCH_8M_MAIN__) && !defined(__ARM_ARCH_8_1M_MAIN__)
2727
#error "Unsupported ARM Architecture."

secure_fw/spm/core/backend_ipc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include "async.h"
1414
#include "config_spm.h"
1515
#include "critical_section.h"
16-
#include "compiler_ext_defs.h"
1716
#include "config_spm.h"
1817
#include "ffm/psa_api.h"
1918
#include "fih.h"
@@ -34,6 +33,7 @@
3433
#include "psa/error.h"
3534
#include "internal_status_code.h"
3635
#include "sprt_partition_metadata_indicator.h"
36+
#include "compiler_ext_defs.h"
3737

3838
#if TFM_PARTITION_NS_AGENT_MAILBOX == 1
3939
#include "psa_manifest/ns_agent_mailbox.h"

secure_fw/spm/core/backend_sfn.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
*/
1010

1111
#include <stdint.h>
12-
#include "compiler_ext_defs.h"
1312
#include "current.h"
1413
#include "runtime_defs.h"
1514
#include "tfm_hal_platform.h"
@@ -24,6 +23,7 @@
2423
#include "spm.h"
2524
#include "memory_symbols.h"
2625
#include "private/assert.h"
26+
#include "compiler_ext_defs.h"
2727

2828
/* SFN Partition state */
2929
#define SFN_PARTITION_STATE_NOT_INITED 0

0 commit comments

Comments
 (0)