]> git.ipfire.org Git - thirdparty/u-boot.git/commit
spl: Allow enabling SPL_OF_REAL and SPL_OF_PLATDATA at the same time
authorSean Anderson <seanga2@gmail.com>
Sat, 14 Oct 2023 20:47:46 +0000 (16:47 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 18 Oct 2023 00:50:52 +0000 (20:50 -0400)
commiteaf738559cf2fd9cf206fd77fe28d3695c698261
tree06248076a8d658a45234c20c1a273f372be47a0e
parent12b3339070bcab746355647a6aae7498f28c4add
spl: Allow enabling SPL_OF_REAL and SPL_OF_PLATDATA at the same time

Sandbox unit tests in U-Boot proper load a test device tree to have some
devices to work with. In order to do the same in SPL, we must enable
SPL_OF_REAL. However, we already have SPL_OF_PLATDATA enabled. When
generating platdata from a devicetree, it is expected that we will not need
devicetree access functions (even though SPL_OF_CONTROL is enabled). This
expectation does not hold for sandbox, so allow user control of
SPL_OF_REAL.

There are several places in the tree where conditions involving OF_PLATDATA
or OF_REAL no longer function correctly when both of these options can be
selected at the same time. Adjust these conditions accordingly.

Signed-off-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
drivers/core/Makefile
drivers/i2c/i2c-emul-uclass.c
drivers/serial/sandbox.c
drivers/sysreset/sysreset_sandbox.c
dts/Kconfig
test/test-main.c