imximage: Encase majority of header in __ASSEMBLY__ declaration
authorBryan O'Donoghue <[email protected]>
Mon, 26 Mar 2018 14:36:45 +0000 (15:36 +0100)
committerStefano Babic <[email protected]>
Sun, 15 Apr 2018 09:44:13 +0000 (11:44 +0200)
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 <[email protected]>
Cc: Utkarsh Gupta <[email protected]>
Cc: Breno Lima <[email protected]>
Cc: Fabio Estevam <[email protected]>
Signed-off-by: Bryan O'Donoghue <[email protected]>
Tested-by: Breno Lima <[email protected]>
include/imximage.h

index de1ea8ff147bff7f2b095270d4b4f3554f038da3..553b852367232491894c1cacbcd0965d17d825ca 100644 (file)
@@ -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_ */