diff options
author | Chris Brand <chris.brand@cypress.com> | 2019-10-01 14:11:01 -0700 |
---|---|---|
committer | David Hu <david.hu@arm.com> | 2019-10-17 03:54:14 +0000 |
commit | 827ffd186dd52cd20105b55c39575dcc02e8184e (patch) | |
tree | 3b8386be8a24b5d3e1dc8cd2495a43f04d7af9bf | |
parent | 469df067db8e38ba1da416f8ebc02542ebb944d6 (diff) | |
download | trusted-firmware-m-827ffd186dd52cd20105b55c39575dcc02e8184e.tar.gz |
plat: Fix non-BL2 build (psoc64)
Fixes these errors when building with -DBL2=False:
.../secure_fw/core/tfm_boot_data.c:54:41: error: use of undeclared identifier
'BOOT_TFM_SHARED_DATA_BASE'
boot_data = (struct tfm_boot_data *)BOOT_TFM_SHARED_DATA_BASE;
^
.../secure_fw/core/tfm_boot_data.c:123:41: error: use of undeclared identifier
'BOOT_TFM_SHARED_DATA_BASE'
boot_data = (struct tfm_boot_data *)BOOT_TFM_SHARED_DATA_BASE;
^
.../secure_fw/core/tfm_boot_data.c:124:15: error: use of undeclared identifier
'BOOT_TFM_SHARED_DATA_BASE'
tlv_end = BOOT_TFM_SHARED_DATA_BASE + boot_data->header.tlv_tot_len;
^
.../secure_fw/core/tfm_boot_data.c:125:15: error: use of undeclared identifier
'BOOT_TFM_SHARED_DATA_BASE'
offset = BOOT_TFM_SHARED_DATA_BASE + SHARED_DATA_HEADER_SIZE;
^
4 errors generated.
secure_fw/CMakeFiles/tfm_s_obj_lib.dir/build.make:446: recipe for target 'secure_fw/CMakeFiles/tfm_s_obj_lib.dir/core/tfm_boot_data.o' failed
Note that there are still other issues preventing the build from
completing, but those will be addressed in separate patches.
Change-Id: If2e9b977e684c7b4b9bb0dd7daa1068fab656299
Signed-off-by: Chris Brand <chris.brand@cypress.com>
-rw-r--r-- | platform/ext/target/psoc64/partition/region_defs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/ext/target/psoc64/partition/region_defs.h b/platform/ext/target/psoc64/partition/region_defs.h index f6eed2d915..5a78b6cbfb 100644 --- a/platform/ext/target/psoc64/partition/region_defs.h +++ b/platform/ext/target/psoc64/partition/region_defs.h @@ -192,14 +192,14 @@ #define BL2_DATA_START (S_RAM_ALIAS(S_DATA_PRIV_OFFSET)) #define BL2_DATA_SIZE (S_PRIV_DATA_SIZE) #define BL2_DATA_LIMIT (BL2_DATA_START + BL2_DATA_SIZE - 1) +#endif /* BL2 */ /* Shared data area between bootloader and runtime firmware. * Shared data area is allocated at the beginning of the privileged data area, * it is overlapping with TF-M Secure code's MSP stack */ -#define BOOT_TFM_SHARED_DATA_BASE BL2_DATA_START +#define BOOT_TFM_SHARED_DATA_BASE (S_RAM_ALIAS(S_DATA_PRIV_OFFSET)) #define BOOT_TFM_SHARED_DATA_SIZE 0x400 -#endif /* BL2 */ #endif /* __REGION_DEFS_H__ */ |