From cc562e74101d800b0b0ee3422fb7f4f8321ae2b7 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Thu, 31 Mar 2022 14:42:11 +0200 Subject: [PATCH] fix(bl2): define RAM_NOLOAD for XIP If BL2_IN_XIP_MEM is enabled, BL2 fails to compile because RAM_NOLOAD symbol is not defined. As we could have a no-load region even if BL2_IN_XIP_MEM is enabled, just put its definition outside the #if/#else for this flag. Signed-off-by: Yann Gautier Change-Id: I9169ea799635f8a72790280f3f148d1cba4cd408 --- bl2/bl2_el3.ld.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bl2/bl2_el3.ld.S b/bl2/bl2_el3.ld.S index 6aa7afd61..c95706ce8 100644 --- a/bl2/bl2_el3.ld.S +++ b/bl2/bl2_el3.ld.S @@ -17,12 +17,12 @@ MEMORY { RAM (rwx): ORIGIN = BL2_RW_BASE, LENGTH = BL2_RW_LIMIT - BL2_RW_BASE #else RAM (rwx): ORIGIN = BL2_BASE, LENGTH = BL2_LIMIT - BL2_BASE +#endif #if SEPARATE_BL2_NOLOAD_REGION RAM_NOLOAD (rw!a): ORIGIN = BL2_NOLOAD_START, LENGTH = BL2_NOLOAD_LIMIT - BL2_NOLOAD_START #else #define RAM_NOLOAD RAM #endif -#endif } #if !BL2_IN_XIP_MEM