[U-Boot] [PATCH v3 1/2] imximage: Encase majority of header in __ASSEMBLY__ declaration

Stefano Babic sbabic at denx.de
Sun Apr 15 10:17:04 UTC 2018



On 26/03/2018 16:36, Bryan O'Donoghue wrote:
> Subsequent patches will want to include imageimage.h but in doing so
> include it on an assembly compile path causing a range of compile errors.
> Fix the errors pre-emptively by encasing the majority of the declarations
> in imximage.h inside an ifdef __ASSEMBLY__ block.
> 
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue at linaro.org>
> Cc: Utkarsh Gupta <utkarsh.gupta at nxp.com>
> Cc: Breno Lima <breno.lima at nxp.com>
> Cc: Fabio Estevam <fabio.estevam at nxp.com>
> ---
>  include/imximage.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/imximage.h b/include/imximage.h
> index de1ea8f..553b852 100644
> --- a/include/imximage.h
> +++ b/include/imximage.h
> @@ -56,6 +56,7 @@
>  #define DCD_CHECK_BITS_SET_PARAM	0x14
>  #define DCD_CHECK_BITS_CLR_PARAM	0x04
>  
> +#ifndef __ASSEMBLY__
>  enum imximage_cmd {
>  	CMD_INVALID,
>  	CMD_IMAGE_VERSION,
> @@ -197,4 +198,5 @@ typedef void (*set_dcd_rst_t)(struct imx_header *imxhdr,
>  typedef void (*set_imx_hdr_t)(struct imx_header *imxhdr, uint32_t dcd_len,
>  		uint32_t entry_point, uint32_t flash_offset);
>  
> +#endif /* __ASSEMBLY__ */
>  #endif /* _IMXIMAGE_H_ */
> 
Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================


More information about the U-Boot mailing list