diff options
author | Simon Glass <sjg@chromium.org> | 2021-07-15 01:05:36 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-07-16 19:58:55 +0300 |
commit | 70c1c8927e2c1fd97cd174d7924300d672e8313b (patch) | |
tree | 3808e9332bd97a5be0c82b0435712e106bac6e62 | |
parent | 14f061dcb158a4ffbf09df10f2ac2d37c157437c (diff) | |
download | u-boot-70c1c8927e2c1fd97cd174d7924300d672e8313b.tar.xz |
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>
-rw-r--r-- | common/image-fit.c | 2 | ||||
-rw-r--r-- | include/image.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/common/image-fit.c b/common/image-fit.c index 031d9d34c3..8e23d51cf2 100644 --- 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 dbb9bd0174..8b420f2c02 100644 --- 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 */ /* |