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.8 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,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 B5F98C04FF3 for ; Mon, 24 May 2021 20:20:58 +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 144FD613CC for ; Mon, 24 May 2021 20:20:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 144FD613CC 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 5C79182EED; Mon, 24 May 2021 22:20:07 +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="Qzg26Cis"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2639482ED9; Mon, 24 May 2021 22:19:52 +0200 (CEST) Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) (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 22EF482EA6 for ; Mon, 24 May 2021 22:19:49 +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-ot1-x334.google.com with SMTP id n3-20020a9d74030000b029035e65d0a0b8so5041449otk.9 for ; Mon, 24 May 2021 13:19:49 -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=//GEgdo/nPebcqhdX2UHl7lvbRvi7Oa70I4vaqYbPe8=; b=Qzg26Cisl3Fq4zmqco2yiOBpzJa6eI1L5iKn/2iGWQYnfbJ3ypd+QMa/9QSO7fmr57 8DDtjmUvGFenJnzKDF7caEP/sadJlrn0xVCtUxuI8blTcPrtDnZxc6AxbNpXZZOBud1h RCX/LDCBayBGVhWU6zCbUwy7p99jOsQAq6yGrYH6EylgwiInR5Eut30G0jzJJPGBBayc bwsZqaEeO0YT2fe/Wvocxq9oeYupKgPx4MPCOW1jy+JYhmjZP/P1xKESGZoAM/MdEwJ7 ZW4fYR5Tk+M26FDAnL73X02E9v6zelvR3TthYooOjUSQizT3fLRZILKF6x2mJ/lDwvGK eiYg== 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=//GEgdo/nPebcqhdX2UHl7lvbRvi7Oa70I4vaqYbPe8=; b=DsIgIiKHN/jcgFdhQ50YuGQSyqzF8NmBkORti5co0xnAbWcMjoP0o5juhYpigS3PBB N4YUEoWZOnTdVt6WDNtvzc6P/oPPZ+wxavu6yo+zGaajqPkK5iE75BTuPSDa2fy7GCPJ ws8INW8rqkdWkKCFM51yrL9eNN4bddEakvwTTxR4Mcg1w1Az0ArGa3Mbm7OanpibmN4f 45atijMNnLxLSpcWz1Ee94wMkti0NbiHbE5LQAapN086lfUMOCG7c34Rc1Hl95Ycrn8S HeD7HF18Su61IJrEKlyVQ2srDY8DOt2TJbgP2yIqHhV5XZGzqe8xJ5A2ArxhIJPrKqkT QPRw== X-Gm-Message-State: AOAM5307k031asoxfWtNpeqXC3+KtXexY0rRSY1R0Yj0EPkHD0Xy1yTw g3KepwAXW5sLNESTTl0ttl9HNJ/ojl6dAg== X-Google-Smtp-Source: ABdhPJzso3O3TpsKrKoEu5BJnMOeTZhUoisVx3/CupGLEwSuIN87b1R02R9AUZXR3vJp3ib8D8XNxA== X-Received: by 2002:a05:6830:12d6:: with SMTP id a22mr20705330otq.66.1621887587801; Mon, 24 May 2021 13:19:47 -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 w13sm2816338otp.10.2021.05.24.13.19.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 13:19:47 -0700 (PDT) From: Alexandru Gagniuc To: u-boot@lists.denx.de, sjg@chromium.org Cc: trini@konsulko.com, michal.simek@xilinx.com, rasmus.villemoes@prevas.dk, Alexandru Gagniuc Subject: [PATCH v2 08/18] image: Drop IMAGE_ENABLE_BEST_MATCH Date: Mon, 24 May 2021 15:19:29 -0500 Message-Id: <20210524201939.1491676-9-mr.nuke.me@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524201939.1491676-1-mr.nuke.me@gmail.com> References: <20210524201939.1491676-1-mr.nuke.me@gmail.com> 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.102.4 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 c0c75e92ba..5df2cf8571 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 aa03f0a722..dbb24993f1 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