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 717E0C433F5 for ; Wed, 13 Oct 2021 04:22:48 +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 BB6C060F11 for ; Wed, 13 Oct 2021 04:22:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org BB6C060F11 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=canonical.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 1A36B83383; Wed, 13 Oct 2021 06:22:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.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=canonical.com header.i=@canonical.com header.b="t2dRXNIO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C9C6F833E4; Wed, 13 Oct 2021 06:22:44 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E27C83347 for ; Wed, 13 Oct 2021 06:22:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=heinrich.schuchardt@canonical.com Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 232A03FFE3 for ; Wed, 13 Oct 2021 04:22:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1634098961; bh=Oy2mH9hWYe+C0kjBPPscsdbKAnGXdrN40AfVbKVSa+w=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=t2dRXNIOareUfCXU/SD+tjNpy3ZB7R/o4VS3odp3S739BGCpmdjS8vCJZYVocucGe SQXmQP0EMvHLG8Wz2hquBocgVuQDPB7/LRfT3Lv0b8AdbT+mLs4eY1kme+hrE0KzjE wTpb0BwVQ+ael3hXcRxA7ie8mJ8C24dIUhOWgNu+EKV29+46EdB1xdqIaf2hThphN2 M7/A3/NjkjBIZ54YulcGBAU67YW38dULV3Khgx06UVyyhLA0rAE2dOyGvjFOATvsYc wznMpV+5Hg8DxCysseKYMBh4AHzRLwrVIoCSO/RvOya9XDj4XCU29vp1kcJF8ccM0x lecH5Zl8WlMpA== Received: by mail-wr1-f69.google.com with SMTP id h11-20020adfa4cb000000b00160c791a550so927207wrb.6 for ; Tue, 12 Oct 2021 21:22:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=Oy2mH9hWYe+C0kjBPPscsdbKAnGXdrN40AfVbKVSa+w=; b=aPj+HFfEfLfL+GqheiCoZ38yq2sDDB+pR06LSLx1KD8l5Tg/WQxoGbMaTZtAaWi0ng /EaplctYjy87GMKiWTbzNTOWt+oRIcvmy3bGH6ZR5h0OoNImxzuQ0kl0MPJo5E0ikARR Cs3cASQgVDow3UhgAzhDvh+Q05JX26aBKhOhRXtD22nrnSwXtsmkGXQS1RN0P/JNWtfm 9iKCyQ5OBJscHV2yrDqr1O3klmiuKg2bEVq7xNXpJlqvXRdfko48Or0cfAzUy7gE+L2P 6QuTw+Ky9+SRNq/4S9p8KhLocrGeAs+K2ueq5G8SPWygrKmvIK9vuGfDGsfLLbhmpUFj 9Dkg== X-Gm-Message-State: AOAM530jCdKnlgyM0wlf62spwkSy091TMvoQmCpyeOMcv8RhwIOTBZk0 vcEtvWPN5q7sNfSDe+dO+ssxPukKvyDZrbKH4TJeJOfHtMfJuCO06TiEyShLZ94xk32RzLf7QS0 LxtUTLfypmQiOoQ8vN+S1GpLcArc+YV4= X-Received: by 2002:adf:bbc8:: with SMTP id z8mr38023611wrg.281.1634098960748; Tue, 12 Oct 2021 21:22:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5/9MeGOmWYlGrcmFdixCpQDHrd//IcZ8yJz78P03aDnpEW4gYcsbkFb5tGfihHj74+7pNog== X-Received: by 2002:adf:bbc8:: with SMTP id z8mr38023595wrg.281.1634098960571; Tue, 12 Oct 2021 21:22:40 -0700 (PDT) Received: from [192.168.123.35] (ip-88-152-144-157.hsi03.unitymediagroup.de. [88.152.144.157]) by smtp.gmail.com with ESMTPSA id 73sm4300649wmb.40.2021.10.12.21.22.39 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 12 Oct 2021 21:22:40 -0700 (PDT) Message-ID: <2427adbf-bd8d-98de-bd41-b1ffa946a922@canonical.com> Date: Wed, 13 Oct 2021 06:22:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.2 Subject: Re: [PATCH 15/16] fdt: Make OF_BOARD a bool option Content-Language: en-US To: Simon Glass Cc: Tom Rini , Ilias Apalodimas , Bin Meng , Jerry Van Baren , Leo Yu-Chi Liang , Priyanka Jain , Rick Chen , Sean Anderson , Vladimir Oltean , U-Boot Mailing List References: <20211013010120.96851-1-sjg@chromium.org> <20211013010120.96851-16-sjg@chromium.org> From: Heinrich Schuchardt In-Reply-To: <20211013010120.96851-16-sjg@chromium.org> Content-Type: text/plain; charset=UTF-8; format=flowed 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 10/13/21 03:01, Simon Glass wrote: > This should not be a separate option from OF_SEPARATE. It is a run-time > option to override the devicetree, even if present. > > Move the option out of the choice. > > Disable BINMAN_FDT for a few boards which don't actually use it. You only sent patch 6/16 and 15/16 to me. No clue why. Please, send complete patch sets instead of selected patches which cannot be reviewed without the context. Best regards Heinrich > > Signed-off-by: Simon Glass > --- > > configs/qemu-ppce500_defconfig | 1 + > configs/qemu-riscv32_spl_defconfig | 2 ++ > configs/qemu-riscv64_spl_defconfig | 1 + > dts/Kconfig | 9 +++++---- > 4 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig > index 5bf3e8de37a..66411f73a11 100644 > --- a/configs/qemu-ppce500_defconfig > +++ b/configs/qemu-ppce500_defconfig > @@ -54,4 +54,5 @@ CONFIG_VIRTIO_PCI=y > CONFIG_VIRTIO_NET=y > CONFIG_VIRTIO_BLK=y > CONFIG_ADDR_MAP=y > +# CONFIG_BINMAN_FDT is not set > CONFIG_PANIC_HANG=y > diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig > index 3909c9a15ad..4621afb1a87 100644 > --- a/configs/qemu-riscv32_spl_defconfig > +++ b/configs/qemu-riscv32_spl_defconfig > @@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="qemu-virt32" > CONFIG_SPL=y > CONFIG_TARGET_QEMU_VIRT=y > CONFIG_RISCV_SMODE=y > +# CONFIG_OF_BOARD_FIXUP is not set > CONFIG_DISTRO_DEFAULTS=y > CONFIG_SYS_LOAD_ADDR=0x80200000 > CONFIG_FIT=y > @@ -18,3 +19,4 @@ CONFIG_OF_BOARD=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_DM_MTD=y > CONFIG_SYSRESET_SBI=y > +# CONFIG_BINMAN_FDT is not set > diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig > index 34d88da41b0..6f8ff91df9e 100644 > --- a/configs/qemu-riscv64_spl_defconfig > +++ b/configs/qemu-riscv64_spl_defconfig > @@ -19,3 +19,4 @@ CONFIG_OF_BOARD=y > CONFIG_SYS_RELOC_GD_ENV_ADDR=y > CONFIG_DM_MTD=y > CONFIG_SYSRESET_SBI=y > +# CONFIG_BINMAN_FDT is not set > diff --git a/dts/Kconfig b/dts/Kconfig > index 313b9e5d70b..6be5710df7d 100644 > --- a/dts/Kconfig > +++ b/dts/Kconfig > @@ -104,7 +104,6 @@ choice > > config OF_SEPARATE > bool "Separate DTB for DT control" > - depends on !SANDBOX > help > If this option is enabled, the device tree will be built and > placed as a separate u-boot.dtb file alongside the U-Boot image. > @@ -117,14 +116,16 @@ config OF_EMBED > and development only and is not recommended for production devices. > Boards in the mainline U-Boot tree should not use it. > > +endchoice > + > config OF_BOARD > bool "Provided by the board (e.g a previous loader) at runtime" > help > If this option is enabled, the device tree will be provided by > - the board at runtime if the board supports it, instead of being > - bundled with the image. > + the board at runtime if the board supports it. The device tree bundled > + with the image (if any) will be overridden / ignored. > > -endchoice > + A device tree file must be provided in the tree. > > config DEFAULT_DEVICE_TREE > string "Default Device Tree for DT control" >