| Message ID | 20210223063437.46651-1-elly.siew.chin.lim@intel.com |
|---|---|
| State | Accepted |
| Commit | 2f7aa89703738b0c37e34120319bab567a8672bd |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | common: Add "ifndef __ASSEMBLY__" in asm/global_data.h | expand |
On Tue, 23 Feb 2021 at 01:34, Siew Chin Lim <elly.siew.chin.lim@intel.com> wrote: > > 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> > --- > arch/arm/include/asm/global_data.h | 4 ++++ > 1 file changed, 4 insertions(+) Reviewed-by: Simon Glass <sjg@chromium.org>
On Tue, Feb 23, 2021 at 02:34:37PM +0800, Siew Chin Lim wrote: > 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> Applied to u-boot/master, thanks!
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 */
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> --- arch/arm/include/asm/global_data.h | 4 ++++ 1 file changed, 4 insertions(+)