[v2] arm: include: secure: Don't include asm\global_data.h in .S file

Simon Glass sjg at chromium.org
Mon Feb 22 10:20:38 CET 2021


Hi Siew,

On Sun, 21 Feb 2021 at 18:56, Siew Chin Lim
<elly.siew.chin.lim at 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.lim at 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.

Regards,
Simon


More information about the U-Boot mailing list