diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 09:13:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-06-14 09:13:35 +0200 |
| commit | 2b948a834c04fb76ca8319c11ee57d752c6e00da (patch) | |
| tree | 41f14595b68447a8854a49b1db15c149ebb0b8f7 /include | |
| parent | bfcdde155359436a95e72d6f1606571a75a0a4ed (diff) | |
| parent | d323e9f6e79bbda21affa663d1974cf23979756a (diff) | |
| download | barebox-2b948a834c04fb76ca8319c11ee57d752c6e00da.tar.gz barebox-2b948a834c04fb76ca8319c11ee57d752c6e00da.tar.xz | |
Merge branch 'for-next/bootm'
Diffstat (limited to 'include')
| -rw-r--r-- | include/boot.h | 3 | ||||
| -rw-r--r-- | include/image.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/boot.h b/include/boot.h index 8fcbb7f012..8e7a9f11d4 100644 --- a/include/boot.h +++ b/include/boot.h @@ -11,6 +11,7 @@ enum bootm_verify { BOOTM_VERIFY_NONE, BOOTM_VERIFY_HASH, BOOTM_VERIFY_SIGNATURE, + BOOTM_VERIFY_AVAILABLE, }; struct bootm_data { @@ -97,7 +98,7 @@ struct image_handler { int register_image_handler(struct image_handler *handle); -#ifdef CONFIG_CMD_BOOTM_VERBOSE +#ifdef CONFIG_BOOTM_VERBOSE static inline int bootm_verbose(struct image_data *data) { return data->verbose; diff --git a/include/image.h b/include/image.h index 730e3d75b8..07ab0f14d5 100644 --- a/include/image.h +++ b/include/image.h @@ -189,7 +189,7 @@ typedef struct image_header { uint8_t ih_name[IH_NMLEN]; /* Image Name */ } image_header_t; -#if defined(CONFIG_CMD_BOOTM_SHOW_TYPE) || !defined(__BAREBOX__) +#if defined(CONFIG_BOOTM_SHOW_TYPE) || !defined(__BAREBOX__) const char *image_get_os_name(uint8_t os); const char *image_get_arch_name(uint8_t arch); const char *image_get_type_name(uint8_t type); |