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>

diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index bce0a3f65cbeba8e32383a368947bddcf122cd0c..acbd2bf2cef99a547c76c25cc4e62334409fda2c 100644 (file)
--- 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

diff --git a/drivers/i2c/i2c-emul-uclass.c b/drivers/i2c/i2c-emul-uclass.c
index 1107cf309fcea14755986610fd40e1f07db7058d..d421ddfcbe2946dde139793a221f5b322d9b4253 100644 (file)
--- a/drivers/i2c/i2c-emul-uclass.c
+++ b/drivers/i2c/i2c-emul-uclass.c
@@ -46,7 +46,7 @@ int i2c_emul_find(struct udevice *dev, struct udevice **emulp)
        struct udevice *emul;
        int ret;
 
-       if (!CONFIG_IS_ENABLED(OF_PLATDATA)) {
+       if (CONFIG_IS_ENABLED(OF_REAL)) {
                ret = uclass_find_device_by_phandle(UCLASS_I2C_EMUL, dev,
                                                    "sandbox,emul", &emul);
        } else {

diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c
index f4003811ee750a8bbd620bf0f67a71cdba1d3457..f6ac3d228526a6cd59994e26f47deabb3a51cead 100644 (file)
--- a/drivers/serial/sandbox.c
+++ b/drivers/serial/sandbox.c
@@ -280,7 +280,7 @@ U_BOOT_DRIVER(sandbox_serial) = {
        .flags = DM_FLAG_PRE_RELOC,
 };
 
-#if CONFIG_IS_ENABLED(OF_REAL)
+#if CONFIG_IS_ENABLED(OF_REAL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 static const struct sandbox_serial_plat platdata_non_fdt = {
        .colour = -1,
 };

diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c
index 3750c60b9b99492ffbaa0f66c97826154fc210de..f485a135299370bf7e504fd3b657c9749373a73f 100644 (file)
--- a/drivers/sysreset/sysreset_sandbox.c
+++ b/drivers/sysreset/sysreset_sandbox.c
@@ -132,7 +132,7 @@ U_BOOT_DRIVER(warm_sysreset_sandbox) = {
        .ops            = &sandbox_warm_sysreset_ops,
 };
 
-#if CONFIG_IS_ENABLED(OF_REAL)
+#if CONFIG_IS_ENABLED(OF_REAL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
 /* This is here in case we don't have a device tree */
 U_BOOT_DRVINFO(sysreset_sandbox_non_fdt) = {
        .name = "sysreset_sandbox",

diff --git a/dts/Kconfig b/dts/Kconfig
index 9152f5885e9a71bc1224786ac65375cbd79a7c29..00c0aeff893b7a58a716e099892e9d370b41f4ad 100644 (file)
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -410,12 +410,14 @@ config SPL_OF_PLATDATA
          declarations for each node. See of-plat.txt for more information.
 
 config SPL_OF_REAL
-       bool
+       bool "Support a real devicetree in SPL" if SANDBOX
+       depends on SPL_OF_CONTROL
+       select SPL_OF_LIBFDT
        help
          Indicates that a real devicetree is available which can be accessed
          at runtime. This means that dev_read_...() functions can be used to
-         read data from the devicetree for each device. This is true if
-         SPL_OF_CONTROL is enabled and not SPL_OF_PLATDATA
+         read data from the devicetree for each device. You do not need to
+         enable this option if you have enabled SPL_OF_PLATDATA.
 
 if SPL_OF_PLATDATA
 

diff --git a/test/test-main.c b/test/test-main.c
index edb20bc4b9cc19fe1985655f5845460fb75a9292..b7015d9f38ddf6c308b6c6355c4ac02e0266c1fe 100644 (file)
--- a/test/test-main.c
+++ b/test/test-main.c
@@ -303,7 +303,7 @@ static int test_pre_run(struct unit_test_state *uts, struct unit_test *test)
        if (test->flags & UT_TESTF_PROBE_TEST)
                ut_assertok(do_autoprobe(uts));
 
-       if (!CONFIG_IS_ENABLED(OF_PLATDATA) &&
+       if (CONFIG_IS_ENABLED(OF_REAL) &&
            (test->flags & UT_TESTF_SCAN_FDT)) {
                /*
                 * only set this if we know the ethernet uclass will be created