image: Drop IMAGE_ENABLE_BEST_MATCH

This is not needed with Kconfig, since we can use IS_ENABLED() easily
enough. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

diff --git a/common/image-fit.c b/common/image-fit.c
index 031d9d34c311e24fba4fcfecaea3435f8d87bc44..8e23d51cf255e1e5abfe6c4d42a0793f0f11a60c 100644 (file)
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -2027,7 +2027,7 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
                 * fit_conf_get_node() will try to find default config node
                 */
                bootstage_mark(bootstage_id + BOOTSTAGE_SUB_NO_UNIT_NAME);
-               if (IMAGE_ENABLE_BEST_MATCH && !fit_uname_config) {
+               if (IS_ENABLED(CONFIG_FIT_BEST_MATCH) && !fit_uname_config) {
                        cfg_noffset = fit_conf_find_compat(fit, gd_fdt_blob());
                } else {
                        cfg_noffset = fit_conf_get_node(fit,

diff --git a/include/image.h b/include/image.h
index dbb9bd0174a20c4199ed07814fa45e3b9c7f52e6..8b420f2c02c937e74f85fb00ddc633ac943f931e 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -1221,11 +1221,6 @@ void image_set_host_blob(void *host_blob);
 # define gd_fdt_blob()         (gd->fdt_blob)
 #endif
 
-#ifdef CONFIG_FIT_BEST_MATCH
-#define IMAGE_ENABLE_BEST_MATCH        1
-#else
-#define IMAGE_ENABLE_BEST_MATCH        0
-#endif
 #endif /* IMAGE_ENABLE_FIT */
 
 /*