[PATCH v2 38/50] image: Drop IMAGE_ENABLE_BEST_MATCH

[Alex G.]

On 5/6/21 9:24 AM, Simon Glass wrote:
> This is not needed with Kconfig, since we can use IS_ENABLED() easily
> enough. Drop it.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>


Reviewed-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>

> ---
> 
> (no changes since v1)
> 
>   common/image-fit.c | 2 +-
>   include/image.h    | 5 -----
>   2 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/common/image-fit.c b/common/image-fit.c
> index e81a0858dc1..a0987fd52c8 100644
> --- a/common/image-fit.c
> +++ b/common/image-fit.c
> @@ -2026,7 +2026,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 12043abd049..b388684cbdc 100644
> --- a/include/image.h
> +++ b/include/image.h
> @@ -1157,11 +1157,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 /* FIT */
>   
>   /*
>