Message ID | 20210503231136.744283-10-sjg@chromium.org |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=cz5Zi4JI; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FYzXs4h61z9sCD for <incoming@patchwork.ozlabs.org>; Tue, 4 May 2021 09:22:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7914382CE1; Tue, 4 May 2021 01:22:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="cz5Zi4JI"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 55E7F82B5E; Tue, 4 May 2021 01:22:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 90C2582D2C for <u-boot@lists.denx.de>; Tue, 4 May 2021 01:12:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd32.google.com with SMTP id l21so5531565iob.1 for <u-boot@lists.denx.de>; Mon, 03 May 2021 16:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Upzxa+32uWwuzUjUUh4FEU6OSL8jh9doW09Ll/ELIV8=; b=cz5Zi4JIuaON05gxXxyTFIPMmfSG9dzXQr8rA8mD2kG5ke/cGbJjkl8wi3rx1fkxjc XMQ0xqdKbcgH9Ft/MVn/3CkvQkEVbkLGOhP12WhAKIBhz/QH/ohbLQIxnWC+JT9+HMoA qwpCT2Eoj4PIAFGzQACM6TWTF6qp8ZW40TtS4= 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=Upzxa+32uWwuzUjUUh4FEU6OSL8jh9doW09Ll/ELIV8=; b=EebbOHKNlxuEixy9xkcksBVq52qs8QDmi9OhqfslIsXU5EJzQfFqyQDh2/fiKVAoKh 9W5aZCFamLqJ37ILYP7Hf+IN54EUL5UNzOUZeidZLSVhXgeduUMiCKk8KNKdlyu6wrT6 DHSA4z3RjQPkfeyvnkRIOk9o5aQ/CcILGi904VDKyHALbOp5fFN93ul8eYW2tw6YOsbm hHqvWwUNMf7q7ysuwSkoPleO7H+MwLh0G1ZYUTV4UJ95+d1DunFxu8RdblakAMomm4sI dJUbg4ySD/FT5+xI+3OFNvVq8bnfmJmRd/ONDx7vihGbHYsohbxGXQHpMU14nbHEjiWz /c6w== X-Gm-Message-State: AOAM533JREVvDczmZ4Qw5yWXrX3Bi/9oHhbT1N0M9VUlJGt3XAbgFjLa zVn1wDbUpTKzenuxVI/hDqqPUoqmyUrF4g== X-Google-Smtp-Source: ABdhPJwrP7NE8/oE4GiYl29e2R16iPnuj5bnaYCcTbl1YL04PRLt7AP6Vr6UMVC78agnAtCkeik9Bw== X-Received: by 2002:a5d:948e:: with SMTP id v14mr16413611ioj.92.1620083547202; Mon, 03 May 2021 16:12:27 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id o6sm422727ioa.21.2021.05.03.16.12.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 16:12:26 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Tom Rini <trini@konsulko.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Bin Meng <bmeng.cn@gmail.com>, Robert Marko <robert.marko@sartura.hr>, Andre Przywara <andre.przywara@arm.com>, Masahiro Yamada <masahiroy@kernel.org>, Simon Glass <sjg@chromium.org>, AKASHI Takahiro <takahiro.akashi@linaro.org>, Alexandru Gagniuc <mr.nuke.me@gmail.com>, Joe Hershberger <joe.hershberger@ni.com>, Joel Stanley <joel@jms.id.au>, Marek Vasut <marex@denx.de>, Michal Simek <michal.simek@xilinx.com>, Naoki Hayama <naoki.hayama@lineo.co.jp>, Reuben Dowle <reubendowle0@gmail.com>, Sebastian Reichel <sebastian.reichel@collabora.com> Subject: [PATCH 37/49] image: Drop IMAGE_ENABLE_BEST_MATCH Date: Mon, 3 May 2021 17:11:24 -0600 Message-Id: <20210503231136.744283-10-sjg@chromium.org> X-Mailer: git-send-email 2.31.1.527.g47e6f16901-goog In-Reply-To: <20210503231136.744283-1-sjg@chromium.org> References: <20210503231136.744283-1-sjg@chromium.org> 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
image: Reduce #ifdefs and ad-hoc defines in image code
|
expand
|
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 */ /*
This is not needed with Kconfig, since we can use IS_ENABLED() easily enough. Drop it. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) common/image-fit.c | 2 +- include/image.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-)