summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan O'Donoghue <bryan.odonoghue@linaro.org>2018-03-26 15:36:45 +0100
committerStefano Babic <sbabic@denx.de>2018-04-15 11:44:13 +0200
commitf4d8fccd3884ea8f76503966b14d0c25129e23eb (patch)
tree2863a117a8c70a076433bf5fa0ae155da268e435
parent852cc548b3fdf6d5b46e2a96f876d14608ccdcf4 (diff)
downloadu-boot-f4d8fccd3884ea8f76503966b14d0c25129e23eb.tar.gz
u-boot-f4d8fccd3884ea8f76503966b14d0c25129e23eb.tar.bz2
u-boot-f4d8fccd3884ea8f76503966b14d0c25129e23eb.zip
imximage: Encase majority of header in __ASSEMBLY__ declaration
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@linaro.org> Cc: Utkarsh Gupta <utkarsh.gupta@nxp.com> Cc: Breno Lima <breno.lima@nxp.com> Cc: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Tested-by: Breno Lima <breno.lima@nxp.com>
-rw-r--r--include/imximage.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/imximage.h b/include/imximage.h
index de1ea8ff14..553b852367 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_ */