[PATCH 15/16] fdt: Make OF_BOARD a bool option

[Heinrich Schuchardt]

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 <sjg at chromium.org>
> ---
> 
>   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"
>