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>

diff --git a/common/bootm_os.c b/common/bootm_os.c
index d635037064adcbbc93a89fc935c50ebe00ad6f4b..39623f9126b601b4f2fc4edc702e3c56cb43bee4 100644 (file)
--- 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 a236180ccdd9d4471a9ab950f52e6e863c9d03c3..e397da80a55a4237dd76f4b323b2c8ca4cd768d5 100644 (file)
--- 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)