diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:36 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-03 08:37:36 +0200 |
commit | c5438404db8c8fecff2cd9791b8e0debe679f0d7 (patch) | |
tree | f9aceef1c34073fbf00e3bf9a17ab126b6362fbb /include | |
parent | e5ed4bea79282a629ac688daddbdd21d991e1d35 (diff) | |
parent | 6ab66787fc15a286b6142b09f9d7c2654dee78a9 (diff) | |
download | barebox-c5438404db8c8fecff2cd9791b8e0debe679f0d7.tar.gz barebox-c5438404db8c8fecff2cd9791b8e0debe679f0d7.tar.xz |
Merge branch 'for-next/imx-bbu-nand-fcb'
Conflicts:
common/Kconfig
Diffstat (limited to 'include')
-rw-r--r-- | include/bbu.h | 14 | ||||
-rw-r--r-- | include/filetype.h | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/bbu.h b/include/bbu.h index af2f84a64e..7277911718 100644 --- a/include/bbu.h +++ b/include/bbu.h @@ -59,4 +59,18 @@ static inline int bbu_register_std_file_update(const char *name, unsigned long f } #endif +#if defined(CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB) +int imx6_bbu_nand_register_handler(const char *name, unsigned long flags); +int imx28_bbu_nand_register_handler(const char *name, unsigned long flags); +#else +static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags) +{ + return -ENOSYS; +} +static inline int imx28_bbu_nand_register_handler(const char *name, unsigned long flags) +{ + return -ENOSYS; +} +#endif + #endif /* __INCLUDE_BBU_H */ diff --git a/include/filetype.h b/include/filetype.h index cca4dad7f3..e452b7ac9d 100644 --- a/include/filetype.h +++ b/include/filetype.h @@ -34,6 +34,7 @@ enum filetype { filetype_ch_image_be, filetype_exe, filetype_xz_compressed, + filetype_mxs_bootstream, filetype_max, }; |