* [PATCH] common: Add "ifndef __ASSEMBLY__" in asm/global_data.h
@ 2021-02-23 6:34 Siew Chin Lim
2021-02-23 15:58 ` Simon Glass
2021-02-25 13:31 ` Tom Rini
0 siblings, 2 replies; 3+ messages in thread
From: Siew Chin Lim @ 2021-02-23 6:34 UTC (permalink / raw)
To: u-boot
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(+)
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 */
--
2.13.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] common: Add "ifndef __ASSEMBLY__" in asm/global_data.h
2021-02-23 6:34 [PATCH] common: Add "ifndef __ASSEMBLY__" in asm/global_data.h Siew Chin Lim
@ 2021-02-23 15:58 ` Simon Glass
2021-02-25 13:31 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Simon Glass @ 2021-02-23 15:58 UTC (permalink / raw)
To: u-boot
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>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] common: Add "ifndef __ASSEMBLY__" in asm/global_data.h
2021-02-23 6:34 [PATCH] common: Add "ifndef __ASSEMBLY__" in asm/global_data.h Siew Chin Lim
2021-02-23 15:58 ` Simon Glass
@ 2021-02-25 13:31 ` Tom Rini
1 sibling, 0 replies; 3+ messages in thread
From: Tom Rini @ 2021-02-25 13:31 UTC (permalink / raw)
To: u-boot
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!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210225/27f89997/attachment.sig>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-25 13:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-23 6:34 [PATCH] common: Add "ifndef __ASSEMBLY__" in asm/global_data.h Siew Chin Lim
2021-02-23 15:58 ` Simon Glass
2021-02-25 13:31 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox