summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiew Chin Lim <elly.siew.chin.lim@intel.com>2021-02-23 14:34:37 +0800
committerTom Rini <trini@konsulko.com>2021-02-24 16:51:49 -0500
commit2f7aa89703738b0c37e34120319bab567a8672bd (patch)
tree2e3d22c903796c967a4855a27f996b7705603c74
parentdf88a0e5cd7dfc62921fd0ee3e79c47c2953b2a5 (diff)
downloadu-boot-2f7aa89703738b0c37e34120319bab567a8672bd.tar.gz
common: Add "ifndef __ASSEMBLY__" in asm/global_data.hWIP/2021-02-24-assorted-fixes
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. Add "ifndef __ASSEMBLY__" in asm/global_data.h. Signed-off-by: Siew Chin Lim <elly.siew.chin.lim@intel.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/arm/include/asm/global_data.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h
index 5a935d34e2..fba655f3b9 100644
--- a/arch/arm/include/asm/global_data.h
+++ b/arch/arm/include/asm/global_data.h
@@ -7,6 +7,8 @@
#ifndef __ASM_GBL_DATA_H
#define __ASM_GBL_DATA_H
+#ifndef __ASSEMBLY__
+
#include <asm/types.h>
#include <linux/types.h>
@@ -125,4 +127,6 @@ static inline void set_gd(volatile gd_t *gd_ptr)
#endif
}
+#endif /* __ASSEMBLY__ */
+
#endif /* __ASM_GBL_DATA_H */