diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-10 14:51:55 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-05-10 14:51:58 +0200 |
| commit | 7839011f61c02b42b44e540dfb18464f4bb79fba (patch) | |
| tree | e80f59c4ca1d7a7ee9b9a24941212ef4375bcbd1 /include | |
| parent | ece204a8acea2ae5f4343fef28e9e987a133e9ea (diff) | |
| download | barebox-7839011f61c02b42b44e540dfb18464f4bb79fba.tar.gz barebox-7839011f61c02b42b44e540dfb18464f4bb79fba.tar.xz | |
bootm: Move bootm options to common/Kconfig
bootm has a C API, so the bootm options have to depend on the
option providing the bootm code (CONFIG_BOOTM), not on the
option providing the command (CONFIG_CMD_BOOTM). Fixing the
dependencies makes it possible to fully use bootm from C without
enabling the bootm command support.
This also removes the CMD_ prefix from the options which means
we have to update the defconfigs aswell.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/boot.h | 2 | ||||
| -rw-r--r-- | include/image.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/boot.h b/include/boot.h index 8fcbb7f012..2683d72530 100644 --- a/include/boot.h +++ b/include/boot.h @@ -97,7 +97,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); |