diff options
author | Sean Anderson <seanga2@gmail.com> | 2023-10-14 16:47:46 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-10-17 20:50:52 -0400 |
commit | eaf738559cf2fd9cf206fd77fe28d3695c698261 (patch) | |
tree | 06248076a8d658a45234c20c1a273f372be47a0e /drivers/core | |
parent | 12b3339070bcab746355647a6aae7498f28c4add (diff) | |
download | u-boot-eaf738559cf2fd9cf206fd77fe28d3695c698261.tar.gz u-boot-eaf738559cf2fd9cf206fd77fe28d3695c698261.tar.bz2 u-boot-eaf738559cf2fd9cf206fd77fe28d3695c698261.zip |
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>
Diffstat (limited to 'drivers/core')
-rw-r--r-- | drivers/core/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/core/Makefile b/drivers/core/Makefile index bce0a3f65c..acbd2bf2ce 100644 --- a/drivers/core/Makefile +++ b/drivers/core/Makefile @@ -15,6 +15,7 @@ obj-$(CONFIG_$(SPL_)OF_LIVE) += of_access.o of_addr.o ifndef CONFIG_DM_DEV_READ_INLINE obj-$(CONFIG_OF_CONTROL) += read.o endif +obj-$(CONFIG_$(SPL_)OF_PLATDATA) += read.o obj-$(CONFIG_OF_CONTROL) += of_extra.o ofnode.o read_extra.o ccflags-$(CONFIG_DM_DEBUG) += -DDEBUG |