[PATCH 39/49] image: Tidy up fit_unsupported_reset()
Simon Glass
sjg at chromium.org
Tue May 4 01:11:26 CEST 2021
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 at chromium.org>
---
(no changes since v1)
common/bootm_os.c | 8 ++++++++
include/image.h | 13 -------------
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/common/bootm_os.c b/common/bootm_os.c
index 0b6325db660..70fad4efb55 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 9adbda8ab70..d7e0c829841 100644
--- a/include/image.h
+++ b/include/image.h
@@ -1412,19 +1412,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)
--
2.31.1.527.g47e6f16901-goog
More information about the U-Boot
mailing list