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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BBBE2C433EF for ; Sun, 26 Sep 2021 01:47:23 +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 4243A60184 for ; Sun, 26 Sep 2021 01:47:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 4243A60184 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5242D835E6; Sun, 26 Sep 2021 03:46:47 +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="TRq/RDZB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A324883596; Sun, 26 Sep 2021 03:44:43 +0200 (CEST) Received: from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) (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 566F68359E for ; Sun, 26 Sep 2021 03:44:05 +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-ot1-x32e.google.com with SMTP id s36-20020a05683043a400b0054d4c88353dso8043602otv.0 for ; Sat, 25 Sep 2021 18:44:05 -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=nO39rgngl2PfYDiZ8h7TAR4X5HFcRLMD4dQ1dE2FD3g=; b=TRq/RDZBtX2181/myB3iufarm9L/ZKAtKG1IA043UzIQ5egiU8dZetStAzscteN3WL 7yY8Pl6eClBwByviKr9UREvS267oJu2DkJz6IeAskw+13+1tT5iSXxrEYCvKCWfWsMvn vufyxXERloN5FqoXhrzcZz7aPqE0OwnCCB+YY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nO39rgngl2PfYDiZ8h7TAR4X5HFcRLMD4dQ1dE2FD3g=; b=2BKN0I1nGceqn0LbXw6IjGvTh1IgM09iXVLv4/+MMjbDkPSwCAoI+fR/vhsCOpl4vX Wbk95Iij937pwyHRbJN26/NPU27+mvvVdv7DiCe7P2gyJBKb5BxHXJ5O/slzFxQbWT/s tcEVVa+3VgP3Auk+SYLd+P2nbg+x6V2mT9nWgpKW1LZPvqK++JZSZNI+X5dBNN1hVQLO Z8bMFMhSw+bSaJHd0isWuT/rP4quTk8ZkeRFfZgwbOZULRdyTcqB+qNKUE5Rpa2E+nuo hcBHNb0zds3PTRYq+tBuMGc24YpdCur0I52RuDNKVpH0swpiLTzfQT8GHmuump3KfpGy mTFA== X-Gm-Message-State: AOAM5306hCnyp6BEGZaYiCAnWg4lt0l0q0FtyTYzIY/jwYUS5IkT8Gl3 y/OkfQNLqA+TX/ZUKNNzpvFtM/8cpIzPiQ== X-Google-Smtp-Source: ABdhPJwCAT4lWZvKcmngQD5r0TTgxoVXAUbcVd8CCwEqesu4VyJRAz9neglTnhy/dQwyCHdulCb5fw== X-Received: by 2002:a9d:720c:: with SMTP id u12mr11341136otj.167.1632620643854; Sat, 25 Sep 2021 18:44:03 -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 c18sm330378otr.72.2021.09.25.18.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 18:44:03 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Alexandru Gagniuc , Andre Przywara , Rasmus Villemoes , Robert Marko , Masahiro Yamada , Tom Rini , Simon Glass , Joe Hershberger , Marek Vasut Subject: [PATCH v5 14/29] image: Drop IMAGE_OF_SYSTEM_SETUP Date: Sat, 25 Sep 2021 19:43:27 -0600 Message-Id: <20210926014342.127913-8-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.685.g46640cef36-goog In-Reply-To: <20210926014342.127913-1-sjg@chromium.org> References: <20210926014342.127913-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 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 This is not needed with Kconfig, since we can use IS_ENABLED() easily enough. Drop it. Signed-off-by: Simon Glass --- (no changes since v1) common/image-fdt.c | 2 +- include/image.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index cd664649e2c..cf87e455230 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -597,7 +597,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 e1e4148e4c8..e190f59232d 100644 --- a/include/image.h +++ b/include/image.h @@ -49,12 +49,6 @@ struct fdt_region; #include #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 */ -- 2.33.0.685.g46640cef36-goog