Commit "common: Drop asm/global_data.h from common header" added asm\global_data.h into secure.h. However, secure.h will be included by psci.S. Adding asm\global_data.h has caused compilation failure in pcsi.S. Update secure.h to only include asm\global_data.h in non-assembly section.
Signed-off-by: Siew Chin Lim elly.siew.chin.lim@intel.com --- arch/arm/include/asm/secure.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/arch/arm/include/asm/secure.h b/arch/arm/include/asm/secure.h index 64e5582c1f..63a21f89ce 100644 --- a/arch/arm/include/asm/secure.h +++ b/arch/arm/include/asm/secure.h @@ -2,7 +2,9 @@ #define __ASM_SECURE_H
#include <config.h> +#ifndef __ASSEMBLY__ #include <asm/global_data.h> +#endif
#define __secure __attribute__ ((section ("._secure.text"))) #define __secure_data __attribute__ ((section ("._secure.data"))) @@ -27,17 +29,6 @@ typedef struct secure_svc_tbl { .id = _id, \ .func = _fn }
-#else - -#ifdef CONFIG_ARMV8_PSCI -#define SECURE_SVC_TBL_OFFSET 16 -#else -#define SECURE_SVC_TBL_OFFSET 8 - -#endif - -#endif /* __ASSEMBLY__ */ - #if defined(CONFIG_ARMV7_SECURE_BASE) || defined(CONFIG_ARMV8_SECURE_BASE) /* * Warning, horror ahead. @@ -58,4 +49,14 @@ typedef struct secure_svc_tbl { #define secure_ram_addr(_fn) (_fn) #endif
+#else /* __ASSEMBLY__ */ + +#ifdef CONFIG_ARMV8_PSCI +#define SECURE_SVC_TBL_OFFSET 16 +#else +#define SECURE_SVC_TBL_OFFSET 8 +#endif + +#endif /* __ASSEMBLY__ */ + #endif