From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEDFCC12002 for ; Wed, 14 Jul 2021 22:07:14 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 29429613A9 for ; Wed, 14 Jul 2021 22:07:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 29429613A9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1EFCD829B9; Thu, 15 Jul 2021 00:07:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="o9W3Virt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EC9EE82051; Thu, 15 Jul 2021 00:06:07 +0200 (CEST) Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A20D582992 for ; Thu, 15 Jul 2021 00:06:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=mr.nuke.me@gmail.com Received: by mail-oi1-x22b.google.com with SMTP id w194so4053374oie.5 for ; Wed, 14 Jul 2021 15:06:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aagIhIot33fOxLoPpRqNC3IAtlsLhuG1rxBoDMU8JZY=; b=o9W3Virt6zeS7LJC4mUDbk2AhcEvT4syow0HFRaSBFfLkox72U9irJkUxwTfkWpNBH FulzisPCuYxthyOQCQaa+ZVj3NLkD2RKzVNCPYJW3pr5WG+W0wW3MoXnZ8oIaMLsE3ni ejkEIq60P+KYKrqYUeSPnoWC7Aexc2yOHgouFjeY2h1BRnddfThdGUSt9dXcmsF3RrYl zwj5wXz8DMDwAc/f7DXF2l27XlLS/OOhP5u8enuY6tooXNucDc7JVtZyFfMFB8F1kfyu CbbaOVNvIoOppbrCCozpQz5HTCc70Yrd1JkZUR6hY7qnz1wpBgWG5oAQF4SmP5+BPuF7 MgPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aagIhIot33fOxLoPpRqNC3IAtlsLhuG1rxBoDMU8JZY=; b=BCKPYKq7z7ufAESxNY/T55mQIy2pbHCGX6G0nEOPXQiEsANRQYST8lW3AWHz+c9V28 EkFwrz+hWpGMUODdInlNC0shTlZcYhujZMiUQlfr1CYBRU8nt3xOR6F0S18niDU65BuH P+wG8+R71Avs13WqlUiV9czzfrQt3Iw36imlKzNwKtrDBOrdKqim2d541QsZo3fNbmj0 ezaDNoMsbRFoCYFyW9Plncztn7udavRWOSWP3IdiDw43tUEbiQXRBXHXrhAsrykL/Uva btWr564yvE/R8SPeaAjEDZFxrOJL5lK2h0UmrLqzcZtuP47HK/oXxCh9UPGTdiXwOxd4 1DFQ== X-Gm-Message-State: AOAM530Zj63zBQU677YwZIbjNMnG9EkKbZ0ppy3crW9Ilcz2JWZXlJSI pa3qC1VatjY7VOChhRTQmFIASeCTYoo= X-Google-Smtp-Source: ABdhPJwkjAzzxQShg9R2ykU2P9vROgqeFXKItvvWoFxVWIqOHBOf7EsEE8v5XCArwWM8HMw1lbA+Wg== X-Received: by 2002:a05:6808:10ca:: with SMTP id s10mr4318025ois.163.1626300358913; Wed, 14 Jul 2021 15:05:58 -0700 (PDT) Received: from nuclearis3.lan (c-98-195-139-126.hsd1.tx.comcast.net. [98.195.139.126]) by smtp.gmail.com with ESMTPSA id w64sm687278otb.45.2021.07.14.15.05.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 15:05:58 -0700 (PDT) From: Alexandru Gagniuc To: u-boot@lists.denx.de, trini@konsulko.com Cc: Simon Glass , Alexandru Gagniuc Subject: [PATCH v3 08/19] image: Drop IMAGE_ENABLE_BEST_MATCH Date: Wed, 14 Jul 2021 17:05:36 -0500 Message-Id: <20210714220547.170371-9-mr.nuke.me@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210714211138.GA25256@bill-the-cat> References: <20210714211138.GA25256@bill-the-cat> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Simon Glass This is not needed with Kconfig, since we can use IS_ENABLED() easily enough. Drop it. Signed-off-by: Simon Glass Reviewed-by: Alexandru Gagniuc Signed-off-by: Alexandru Gagniuc --- 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 b7e1d33340..dcdf61844a 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 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 */ /* -- 2.31.1