diff options
| author | Joanna Farley <joanna.farley@arm.com> | 2023-10-30 19:28:38 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-10-30 19:28:38 +0100 |
| commit | 83d304d99dad47a156e469eeac007a17c118f898 (patch) | |
| tree | 2ba1a8e6a6324cc18562bce443fa5be7a7016e4f | |
| parent | 11336fb44d6f420440f04a7992defd397a4736f4 (diff) | |
| parent | bfe82cff6f6ab8e557e7ad7db8eae573f1fb02f3 (diff) | |
Merge "fix(versal): type cast addresses to fix integer overflow" into integration
| -rw-r--r-- | plat/xilinx/versal/include/platform_def.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plat/xilinx/versal/include/platform_def.h b/plat/xilinx/versal/include/platform_def.h index 4c02402f7..286a706c4 100644 --- a/plat/xilinx/versal/include/platform_def.h +++ b/plat/xilinx/versal/include/platform_def.h @@ -35,10 +35,10 @@ # define BL31_BASE U(0xfffe0000) # define BL31_LIMIT U(0x100000000) #else -# define BL31_BASE (VERSAL_ATF_MEM_BASE) -# define BL31_LIMIT (VERSAL_ATF_MEM_BASE + VERSAL_ATF_MEM_SIZE) +# define BL31_BASE U(VERSAL_ATF_MEM_BASE) +# define BL31_LIMIT U(VERSAL_ATF_MEM_BASE + VERSAL_ATF_MEM_SIZE) # ifdef VERSAL_ATF_MEM_PROGBITS_SIZE -# define BL31_PROGBITS_LIMIT (VERSAL_ATF_MEM_BASE + VERSAL_ATF_MEM_PROGBITS_SIZE) +# define BL31_PROGBITS_LIMIT U(VERSAL_ATF_MEM_BASE + VERSAL_ATF_MEM_PROGBITS_SIZE) # endif #endif @@ -49,8 +49,8 @@ # define BL32_BASE U(0x60000000) # define BL32_LIMIT U(0x80000000) #else -# define BL32_BASE (VERSAL_BL32_MEM_BASE) -# define BL32_LIMIT (VERSAL_BL32_MEM_BASE + VERSAL_BL32_MEM_SIZE) +# define BL32_BASE U(VERSAL_BL32_MEM_BASE) +# define BL32_LIMIT U(VERSAL_BL32_MEM_BASE + VERSAL_BL32_MEM_SIZE) #endif /******************************************************************************* @@ -59,7 +59,7 @@ #ifndef PRELOADED_BL33_BASE # define PLAT_ARM_NS_IMAGE_BASE U(0x8000000) #else -# define PLAT_ARM_NS_IMAGE_BASE PRELOADED_BL33_BASE +# define PLAT_ARM_NS_IMAGE_BASE U(PRELOADED_BL33_BASE) #endif /******************************************************************************* |