Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 22:14:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "sandbox: Disable I2C emulators in SPL"

Browse source 
With recent changes this can be supported again. Add it back.

This reverts commit d85f2c4f29.

Signed-off-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-03-15 17:25:31 +13:00
parent 728d04cc72
commit 3a825d3fa7
4 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/sandbox/dts/sandbox.dtsi
View file

@ -264,14 +264,10 @@
stringarray = "pre-proper"; stringarray = "pre-proper";
}; };
test-bus { spl-test7 {
compatible = "simple-bus";
u-boot,dm-spl; u-boot,dm-spl;
spl-test7 { compatible = "sandbox,spl-test";
u-boot,dm-spl; stringarray = "spl";
compatible = "sandbox,spl-test";
stringarray = "spl";
};
}; };
square { square {

1
configs/sandbox_spl_defconfig
View file

@ -103,6 +103,7 @@ CONFIG_SYSCON=y
CONFIG_SPL_SYSCON=y CONFIG_SPL_SYSCON=y
CONFIG_DEVRES=y CONFIG_DEVRES=y
CONFIG_DEBUG_DEVRES=y CONFIG_DEBUG_DEVRES=y
# CONFIG_SPL_SIMPLE_BUS is not set
CONFIG_ADC=y CONFIG_ADC=y
CONFIG_ADC_SANDBOX=y CONFIG_ADC_SANDBOX=y
CONFIG_AXI=y CONFIG_AXI=y

2
drivers/i2c/Makefile
View file

@ -39,9 +39,7 @@ obj-$(CONFIG_SYS_I2C_RCAR_I2C) += rcar_i2c.o
obj-$(CONFIG_SYS_I2C_RCAR_IIC) += rcar_iic.o obj-$(CONFIG_SYS_I2C_RCAR_IIC) += rcar_iic.o
obj-$(CONFIG_SYS_I2C_ROCKCHIP) += rk_i2c.o obj-$(CONFIG_SYS_I2C_ROCKCHIP) += rk_i2c.o
obj-$(CONFIG_SYS_I2C_S3C24X0) += s3c24x0_i2c.o exynos_hs_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 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_SH) += sh_i2c.o
obj-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o obj-$(CONFIG_SYS_I2C_SOFT) += soft_i2c.o
obj-$(CONFIG_SYS_I2C_STM32F7) += stm32f7_i2c.o obj-$(CONFIG_SYS_I2C_STM32F7) += stm32f7_i2c.o

8
test/dm/of_platdata.c
View file

@ -207,11 +207,11 @@ DM_TEST(dm_test_of_plat_phandle, UT_TESTF_SCAN_PDATA);
/* Test that device parents are correctly set up */ /* Test that device parents are correctly set up */
static int dm_test_of_plat_parent(struct unit_test_state *uts) static int dm_test_of_plat_parent(struct unit_test_state *uts)
{ {
struct udevice *dev, *bus; struct udevice *rtc, *i2c;
ut_assertok(uclass_first_device_err(UCLASS_SIMPLE_BUS, &bus)); ut_assertok(uclass_first_device_err(UCLASS_RTC, &rtc));
ut_assertok(device_first_child_err(bus, &dev)); ut_assertok(uclass_first_device_err(UCLASS_I2C, &i2c));
ut_asserteq_ptr(bus, dev_get_parent(dev)); ut_asserteq_ptr(i2c, dev_get_parent(rtc));
return 0; return 0;
} }