Hi Simon, > -----Original Message----- > From: Simon Glass <s...@chromium.org> > Sent: Monday, February 22, 2021 5:21 PM > To: Lim, Elly Siew Chin <elly.siew.chin....@intel.com> > Cc: U-Boot Mailing List <u-boot@lists.denx.de>; Marek Vasut > <ma...@denx.de>; Tan, Ley Foon <ley.foon....@intel.com>; See, Chin Liang > <chin.liang....@intel.com>; Simon Goldschmidt > <simon.k.r.goldschm...@gmail.com>; Chee, Tien Fong > <tien.fong.c...@intel.com>; Westergreen, Dalon > <dalon.westergr...@intel.com>; Gan, Yau Wai <yau.wai....@intel.com> > Subject: Re: [v2] arm: include: secure: Don't include asm\global_data.h in .S > file > > Hi Siew, > > On Sun, 21 Feb 2021 at 18:56, Siew Chin Lim <elly.siew.chin....@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. Update secure.h to only include asm/global_data.h in > > non-assembly section. > > > > Signed-off-by: Siew Chin Lim <elly.siew.chin....@intel.com> > > > > --- > > v2 : Update "asm\global_data.h" to "asm/global_data.h" in commit message. > > --- > > --- > > arch/arm/include/asm/secure.h | 23 ++++++++++++----------- > > 1 file changed, 12 insertions(+), 11 deletions(-) > > If you look at the asm-generic version of global_data.h it actually includes > an > #ifdef for __ASSEMBLY__ > > Perhaps we should do the same for arch/arm/include/asm/global_data .h ? To > me, it seems better to allow global_data.h to be included always. >
Thanks for the suggestion. Adding "#ifndef __ASSEMBLY__" in asm/global_data.h looks better. Please ignore this patch. I have already send another patch which adding "#ifndef __ASSEMBLY__" in asm/global_data.h. Thanks, Siew Chin > Regards, > Simon