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 881F8C433F5 for ; Tue, 5 Oct 2021 18:57:57 +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 90AD56124D for ; Tue, 5 Oct 2021 18:57:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 90AD56124D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 CC4FB81197; Tue, 5 Oct 2021 20:57:53 +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="GKPZ/jse"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 674D982BC7; Tue, 5 Oct 2021 20:57: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 C4B0C807CD for ; Tue, 5 Oct 2021 20:57:48 +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 h9-20020a9d2f09000000b005453f95356cso79199otb.11 for ; Tue, 05 Oct 2021 11:57:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=v98UsqET7/S6o4YT2YVUBYFunI7aXabieDOvqOlQFTI=; b=GKPZ/jseerDMOXGCVfrFDMmPiD0NAQu1l6+INmWXt/zn0TPPrCEFibzP6XFb2hXxEZ AOD/tqHhTO/G0Vmw5jujBhG0j981LV6IpOV05DlZ1jxMuMcBXptZMqvgoxcKFmsEVRtf Ct2hubWrda/49yj5PMDSJ4/+jOIJj073rVWE/uWGU2moqP0Ht4OjS63OnnO39P1vcZiL lL9x2371WiBZ4XaWS3ePBLBgdtAqXV0Op0xUX0IIxnHLnDbO4TGpCB0FS4Tv1MTl5zt1 J+yFVLhKhpbri+U6TWengT2szhFosn9krMKGXwRLYwfgNxs5aVjG6mNZa44qGQvtm0uu mjoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=v98UsqET7/S6o4YT2YVUBYFunI7aXabieDOvqOlQFTI=; b=M9A6WXTcglEovc8ZIzBcXqRZQE12iKuqWxBqIEiWv3pkKLT4pFS13xAJH2SwuoYxQd 0F2d1NJRv13pzxaHgcycSuJj2EMnk6RtUmEG0/X4zOrIozJEkvqRBsyQjTTFoPFZjb+x U+0KItInozz9YXBZYZ9HR8ts14Hk5IY8NF7xz1X82PVT34WatSVIyUF2taw4d70hqf4G Rfx3ml6SIO0GALo5VlAqxWacUuCuC7YXyJsRIgAS/qTte/8QkUWSWXJ1mi/uN7nwuGEV VozEGOsFjQlyLAR11D1YoIYxJlOByQa8+0n0Dy7v5621GqeWVDsQP94WkolDLoC69CQn Rx6Q== X-Gm-Message-State: AOAM530U4K4vNRFM4FaW7bb93/Gko6TX0u8vHU+0aYr/M4kfKm+wVCxG Lbe4ffn3uPMBfvuYzhDltiw= X-Google-Smtp-Source: ABdhPJxKDpAe7j+WY1kpz8c15UMK5ODwHOu63ykns9vVgCZGbxkqqmD9z2lI8yL/acWJjRpPIDWCDg== X-Received: by 2002:a05:6830:1da6:: with SMTP id z6mr16164946oti.234.1633460267572; Tue, 05 Oct 2021 11:57:47 -0700 (PDT) Received: from nuclearis3.gtech (c-98-195-139-126.hsd1.tx.comcast.net. [98.195.139.126]) by smtp.gmail.com with ESMTPSA id f61sm3680752otf.73.2021.10.05.11.57.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Oct 2021 11:57:47 -0700 (PDT) Subject: Re: [PATCH v5 13/29] image: Drop IMAGE_OF_BOARD_SETUP To: Simon Glass , U-Boot Mailing List Cc: Andre Przywara , Rasmus Villemoes , Robert Marko , Masahiro Yamada , Tom Rini , Joe Hershberger , Marek Vasut References: <20210926014342.127913-1-sjg@chromium.org> <20210926014342.127913-7-sjg@chromium.org> From: "Alex G." Message-ID: Date: Tue, 5 Oct 2021 13:57:45 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210926014342.127913-7-sjg@chromium.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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 On 9/25/21 8:43 PM, Simon Glass wrote: > 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 > --- > > (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 >