Message ID | 20210503231136.744283-7-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=RfNrTleS; 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 4FYzRw6fDfz9sCD for <incoming@patchwork.ozlabs.org>; Tue, 4 May 2021 09:18:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 54BD482D31; Tue, 4 May 2021 01:18:06 +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="RfNrTleS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7660582D03; Tue, 4 May 2021 01:17:51 +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-il1-x12c.google.com (mail-il1-x12c.google.com [IPv6:2607:f8b0:4864:20::12c]) (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 1C88582D1D for <u-boot@lists.denx.de>; Tue, 4 May 2021 01:12:25 +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-il1-x12c.google.com with SMTP id p15so4919731iln.3 for <u-boot@lists.denx.de>; Mon, 03 May 2021 16:12:25 -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=C6rYWW2Hx9NXAbtvlMGkYD5CAEe1D2FGppKzADuuY3c=; b=RfNrTleSR1kq9pznTKHmmRoE6RPIwTQoPqUavGCkv6zTwDFwJZMj0lGffXt5ZCXf02 cFxW3p1i1A7fRmKQnuIxrBNWRXX1uoM9set4NyKhSBTtrwGU9+EhEGjQ26/KFgSRFjPw U1eHgCqbeKzQZISrKKcKPcQr3bjFt0DjlcgFE= 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=C6rYWW2Hx9NXAbtvlMGkYD5CAEe1D2FGppKzADuuY3c=; b=haxcQyC48+uc4DrWBN3frrDSqBo39rom+IG53DwriqX+vb4cZKGy1guvG5qRIkdpqS +tyBW5NGdFqxjcP4LotTSWu17f5Car8l5odUCNUTGFYsqytd17tsUSUXFxl+8Oj14T63 4xmuB+QxDSH0UZX5sfOjqgFJ7afFQTqAdnYL9Vxp3vO5JPMTZOuzXRNjaLQJWKqVIkZh u0c3Cn5XHgTX96Mcqigy6T2g2jI9Vr9b4pJwgvOc/0/v9wIKZE8sO+rijlZLJWXJLRjK lzV/en/ITwF/iRx96KQGl0EIHPOcDNO0+nX/Kdh2xeS9QrU6SMDEdWjWBQsTezWJBavq //sw== X-Gm-Message-State: AOAM530P2ECpHHhfA3HH8CHOLRaKsEDUJo3fx65XCaygSSAc/rjyJHF4 PBmgxtTAVkDkCkNP+ABAi0Xm0lX1zxCyKA== X-Google-Smtp-Source: ABdhPJyXTg1hGayU+HG4DfqVLGDzyx56zYYpSfsJVePnk/qDwwNhB101HJqkKOU2WIA2oqtfwsFWYQ== X-Received: by 2002:a05:6e02:12aa:: with SMTP id f10mr10486202ilr.44.1620083543657; Mon, 03 May 2021 16:12:23 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 May 2021 16:12:23 -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>, Etienne Carriere <etienne.carriere@linaro.org>, =?utf-8?q?Fr=C3=A9d=C3=A9ri?= =?utf-8?q?c_Danis?= <frederic.danis@collabora.com>, Hongwei Zhang <hongweiz@ami.com>, Joe Hershberger <joe.hershberger@ni.com>, Marek Vasut <marex@denx.de>, Naoki Hayama <naoki.hayama@lineo.co.jp>, Patrick Delaunay <patrick.delaunay@foss.st.com>, Reuben Dowle <reubendowle0@gmail.com>, Tero Kristo <t-kristo@ti.com>, Wasim Khan <wasim.khan@nxp.com>, chenshuo <chenshuo@eswin.com> Subject: [PATCH 34/49] image: Drop IMAGE_OF_SYSTEM_SETUP Date: Mon, 3 May 2021 17:11:21 -0600 Message-Id: <20210503231136.744283-7-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-fdt.c b/common/image-fdt.c index c2d9710bfaa..80bfa625ab2 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -590,7 +590,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, } } } - if (IMAGE_OF_SYSTEM_SETUP) { + if (IS_ENABLED(CONFIG_OF_SYSTEM_SETUP)) { fdt_ret = ft_system_setup(blob, gd->bd); if (fdt_ret) { printf("ERROR: system-specific fdt fixup failed: %s\n", diff --git a/include/image.h b/include/image.h index deb690d168b..eb5ca8a32d3 100644 --- a/include/image.h +++ b/include/image.h @@ -49,12 +49,6 @@ struct fdt_region; #endif /* FIT */ -#ifdef CONFIG_OF_SYSTEM_SETUP -# define IMAGE_OF_SYSTEM_SETUP 1 -#else -# define IMAGE_OF_SYSTEM_SETUP 0 -#endif - extern ulong image_load_addr; /* Default Load Address */ extern ulong image_save_addr; /* Default Save Address */ extern ulong image_save_size; /* Default Save Size */
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-fdt.c | 2 +- include/image.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-)