diff options
author | Simon Glass <sjg@chromium.org> | 2021-09-25 19:43:32 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-10-08 15:53:27 -0400 |
commit | 0ab5e027045f78973b7b7d52a71a89a707398f9f (patch) | |
tree | 956d97aeccafa093f76373d380a82cf2e3c20dcd | |
parent | 1eccbb16a2c0427488d91e169572c3c397c4c1d5 (diff) | |
download | u-boot-0ab5e027045f78973b7b7d52a71a89a707398f9f.zip u-boot-0ab5e027045f78973b7b7d52a71a89a707398f9f.tar.gz u-boot-0ab5e027045f78973b7b7d52a71a89a707398f9f.tar.bz2 |
image: Tidy up fit_unsupported_reset()
This function is only used in one place and does not need to use the
preprocessor. Move it to the C file and convert it to a normal function.
Drop fit_unsupported() since it is not used.
Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | common/bootm_os.c | 8 | ||||
-rw-r--r-- | include/image.h | 13 |
2 files changed, 8 insertions, 13 deletions
diff --git a/common/bootm_os.c b/common/bootm_os.c index d635037..39623f9 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -58,6 +58,14 @@ static void copy_args(char *dest, int argc, char *const argv[], char delim) } #endif +static void __maybe_unused fit_unsupported_reset(const char *msg) +{ + if (CONFIG_IS_ENABLED(FIT_VERBOSE)) { + printf("! FIT images not supported for '%s' - must reset board to recover!\n", + msg); + } +} + #ifdef CONFIG_BOOTM_NETBSD static int do_bootm_netbsd(int flag, int argc, char *const argv[], bootm_headers_t *images) diff --git a/include/image.h b/include/image.h index a236180..e397da8 100644 --- a/include/image.h +++ b/include/image.h @@ -1433,19 +1433,6 @@ int fit_image_cipher_get_algo(const void *fit, int noffset, char **algo); struct cipher_algo *image_get_cipher_algo(const char *full_name); -#if CONFIG_IS_ENABLED(FIT_VERBOSE) -#define fit_unsupported(msg) printf("! %s:%d " \ - "FIT images not supported for '%s'\n", \ - __FILE__, __LINE__, (msg)) - -#define fit_unsupported_reset(msg) printf("! %s:%d " \ - "FIT images not supported for '%s' " \ - "- must reset board to recover!\n", \ - __FILE__, __LINE__, (msg)) -#else -#define fit_unsupported(msg) -#define fit_unsupported_reset(msg) -#endif /* FIT_VERBOSE */ #endif /* CONFIG_FIT */ #if !defined(USE_HOSTCC) |