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 60BAFC433EF for ; Sun, 26 Sep 2021 01:47:11 +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 D2C0A60184 for ; Sun, 26 Sep 2021 01:47:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D2C0A60184 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 AEE55835D8; Sun, 26 Sep 2021 03:46:41 +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="C+NZNemo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 849E283562; Sun, 26 Sep 2021 03:44:40 +0200 (CEST) Received: from mail-oi1-x234.google.com (mail-oi1-x234.google.com [IPv6:2607:f8b0:4864:20::234]) (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 49F37835D4 for ; Sun, 26 Sep 2021 03:44:04 +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-oi1-x234.google.com with SMTP id w206so20337147oiw.4 for ; Sat, 25 Sep 2021 18:44:04 -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=oWEQkeUqQBzU1DKz1iSMaNN1IZMYg7htGIztA0uCd2U=; b=C+NZNemo5Lzaa/PsCT78WvbaHwoqQUUHF9F77qDRR9URX8dVyIM5Jt4mn892RK6kFy u3o+2vl+sF7zjnWyeZm8zyrLDkGfHZuNNU9Gf3X1vczBLplRllzNkk5nMlweolOOm+MN Tbpr8sXoXKcloIexnwSBs3lclwIMauWpVQfGU= 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=oWEQkeUqQBzU1DKz1iSMaNN1IZMYg7htGIztA0uCd2U=; b=mqiFqugqiUQx3FIyoYRtfRUGZhQ53qgkSqSelfftTLcjBqF+80tgu0BuKRzCEfsLOa Klg8jpmr9VjuKqdNoojeTC+Hml2WO4bzuzy9FKl2XCLSLblBFbij/hV0pwTgq0Z4r9Aa AOaKv/Z3lK0+3/nuSMmHsiLptmKltIMTpTsCt8ou+xxzLFoBIH2GBXz4dsa2B5FSfC1U ITOwlVIdwd0cAR6dO9kh8fC2iTnpun3UgFVmm855dT27awwPwXxY7Tu9Ld7UvmOnH99L kLP9Mx3gZAEWWsAJDPBYdkjhtW7nB+m/dO1x19En7ahdZMCl3d0RpPf2Eqee7E1yPcj6 iRxA== X-Gm-Message-State: AOAM532RnIPIWjFaQEDnBDPt9GIL/pD9YESdV0r6P8AIe4rLK+LzLYa2 vPEy9qhmd2AROpLbtgG4hYFwr1UL4YZPQw== X-Google-Smtp-Source: ABdhPJw27OeNEeqAD2e2Zsatz5v4i6L7/FkcZZ+INa79atuJx4Obs1f46CxRVvpnMY/SJEKAM9wMpg== X-Received: by 2002:aca:c641:: with SMTP id w62mr6845082oif.102.1632620642833; Sat, 25 Sep 2021 18:44:02 -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.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Sep 2021 18:44:02 -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 13/29] image: Drop IMAGE_OF_BOARD_SETUP Date: Sat, 25 Sep 2021 19:43:26 -0600 Message-Id: <20210926014342.127913-7-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 | 4 ++-- include/image.h | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/common/image-fdt.c b/common/image-fdt.c index 9441e63a3d4..cd664649e2c 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -582,7 +582,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, /* Append PStore configuration */ fdt_fixup_pstore(blob); #endif - if (IMAGE_OF_BOARD_SETUP) { + if (IS_ENABLED(CONFIG_OF_BOARD_SETUP)) { const char *skip_board_fixup; skip_board_fixup = env_get("skip_board_fixup"); @@ -629,7 +629,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, goto err; #if defined(CONFIG_SOC_KEYSTONE) - if (IMAGE_OF_BOARD_SETUP) + if (IS_ENABLED(CONFIG_OF_BOARD_SETUP)) ft_board_setup_ex(blob, gd->bd); #endif diff --git a/include/image.h b/include/image.h index 00a80999584..e1e4148e4c8 100644 --- a/include/image.h +++ b/include/image.h @@ -49,12 +49,6 @@ struct fdt_region; #include #endif /* FIT */ -#ifdef CONFIG_OF_BOARD_SETUP -# define IMAGE_OF_BOARD_SETUP 1 -#else -# define IMAGE_OF_BOARD_SETUP 0 -#endif - #ifdef CONFIG_OF_SYSTEM_SETUP # define IMAGE_OF_SYSTEM_SETUP 1 #else -- 2.33.0.685.g46640cef36-goog