Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-04-04 14:56:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fdt: Make OF_BOARD a bool option

Browse source 
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.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-12-16 20:59:21 -07:00 • committed by Tom Rini
parent 975e0e04bb
commit 836eac7c6f
4 changed files with 10 additions and 5 deletions

1
configs/qemu-ppce500_defconfig
View file

@ -56,4 +56,5 @@ CONFIG_VIRTIO_PCI=y
CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_NET=y
CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_BLK=y
CONFIG_ADDR_MAP=y CONFIG_ADDR_MAP=y
# CONFIG_BINMAN_FDT is not set
CONFIG_PANIC_HANG=y CONFIG_PANIC_HANG=y

2
configs/qemu-riscv32_spl_defconfig
View file

@ -6,6 +6,7 @@ CONFIG_DEFAULT_DEVICE_TREE="qemu-virt32"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_TARGET_QEMU_VIRT=y CONFIG_TARGET_QEMU_VIRT=y
CONFIG_RISCV_SMODE=y CONFIG_RISCV_SMODE=y
# CONFIG_OF_BOARD_FIXUP is not set
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
CONFIG_SYS_LOAD_ADDR=0x80200000 CONFIG_SYS_LOAD_ADDR=0x80200000
CONFIG_FIT=y CONFIG_FIT=y
@ -18,3 +19,4 @@ CONFIG_OF_BOARD=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y CONFIG_DM_MTD=y
CONFIG_SYSRESET_SBI=y CONFIG_SYSRESET_SBI=y
# CONFIG_BINMAN_FDT is not set

1
configs/qemu-riscv64_spl_defconfig
View file

@ -19,3 +19,4 @@ CONFIG_OF_BOARD=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y CONFIG_DM_MTD=y
CONFIG_SYSRESET_SBI=y CONFIG_SYSRESET_SBI=y
# CONFIG_BINMAN_FDT is not set

11
dts/Kconfig
View file

@ -97,11 +97,9 @@ config OF_LIVE
choice choice
prompt "Provider of DTB for DT control" prompt "Provider of DTB for DT control"
depends on OF_CONTROL depends on OF_CONTROL
default OF_BOARD if SANDBOX
config OF_SEPARATE config OF_SEPARATE
bool "Separate DTB for DT control" bool "Separate DTB for DT control"
depends on !SANDBOX
help help
If this option is enabled, the device tree will be built and 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. placed as a separate u-boot.dtb file alongside the U-Boot image.
@ -114,14 +112,17 @@ config OF_EMBED
and development only and is not recommended for production devices. and development only and is not recommended for production devices.
Boards in the mainline U-Boot tree should not use it. Boards in the mainline U-Boot tree should not use it.
endchoice
config OF_BOARD config OF_BOARD
bool "Provided by the board (e.g a previous loader) at runtime" bool "Provided by the board (e.g a previous loader) at runtime"
default y if SANDBOX
help help
If this option is enabled, the device tree will be provided by If this option is enabled, the device tree will be provided by
the board at runtime if the board supports it, instead of being the board at runtime if the board supports it. The device tree bundled
bundled with the image. with the image (if any) will be overridden / ignored.
endchoice A device tree file must be provided in the tree.
config DEFAULT_DEVICE_TREE config DEFAULT_DEVICE_TREE
string "Default Device Tree for DT control" string "Default Device Tree for DT control"