sandbox: Disable I2C emulators in SPL

These cannot work with of-platdata since they currently need the
devicetree at runtime. Disable the emulators and the sandbox I2C driver
that needs them. We can enable these later, if needed for testing.

Switch the of_plat_parent test over to use a simple bus instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index d842f02..dc933f3 100644 (file)
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -260,10 +260,14 @@
                stringarray = "pre-proper";
        };
 
-       spl-test7 {
+       test-bus {
+               compatible = "simple-bus";
                u-boot,dm-spl;
-               compatible = "sandbox,spl-test";
-               stringarray = "spl";
+               spl-test7 {
+                       u-boot,dm-spl;
+                       compatible = "sandbox,spl-test";
+                       stringarray = "spl";
+               };
        };
 
        square {

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index d193b18..61dae34 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -101,7 +101,6 @@ CONFIG_SYSCON=y
 CONFIG_SPL_SYSCON=y
 CONFIG_DEVRES=y
 CONFIG_DEBUG_DEVRES=y
-# CONFIG_SPL_SIMPLE_BUS is not set
 CONFIG_ADC=y
 CONFIG_ADC_SANDBOX=y
 CONFIG_AXI=y

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index 1aac5c4..29aab0f 100644 (file)
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -39,7 +39,9 @@ obj-$(CONFIG_SYS_I2C_RCAR_I2C) += rcar_i2c.o
 obj-$(CONFIG_SYS_I2C_RCAR_IIC) += rcar_iic.o
 obj-$(CONFIG_SYS_I2C_ROCKCHIP) += rk_i2c.o
 obj-$(CONFIG_SYS_I2C_S3C24X0) += s3c24x0_i2c.o exynos_hs_i2c.o
+ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_SYS_I2C_SANDBOX) += sandbox_i2c.o i2c-emul-uclass.o
+endif
 obj-$(CONFIG_SYS_I2C_SH) += sh_i2c.o
 obj-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
 obj-$(CONFIG_SYS_I2C_STM32F7) += stm32f7_i2c.o

diff --git a/test/dm/of_platdata.c b/test/dm/of_platdata.c
index cfc43a5..26c5092 100644 (file)
--- a/test/dm/of_platdata.c
+++ b/test/dm/of_platdata.c
@@ -210,11 +210,11 @@ DM_TEST(dm_test_of_plat_phandle, UT_TESTF_SCAN_PDATA);
 /* Test that device parents are correctly set up */
 static int dm_test_of_plat_parent(struct unit_test_state *uts)
 {
-       struct udevice *rtc, *i2c;
+       struct udevice *dev, *bus;
 
-       ut_assertok(uclass_first_device_err(UCLASS_RTC, &rtc));
-       ut_assertok(uclass_first_device_err(UCLASS_I2C, &i2c));
-       ut_asserteq_ptr(i2c, dev_get_parent(rtc));
+       ut_assertok(uclass_first_device_err(UCLASS_SIMPLE_BUS, &bus));
+       ut_assertok(device_first_child_err(bus, &dev));
+       ut_asserteq_ptr(bus, dev_get_parent(dev));
 
        return 0;
 }