]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge tag 'dm-pull-6feb20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
authorTom Rini <trini@konsulko.com>
Tue, 11 Feb 2020 15:58:41 +0000 (10:58 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 11 Feb 2020 15:58:41 +0000 (10:58 -0500)
sandbox conversion to SDL2
TPM TEE driver
Various minor sandbox video enhancements
New driver model core utility functions

19 files changed:
1  2 
.gitlab-ci.yml
arch/sandbox/dts/test.dts
arch/sandbox/include/asm/test.h
arch/x86/cpu/apollolake/fsp_s.c
arch/x86/cpu/intel_common/itss.c
board/ge/common/vpd_reader.c
cmd/gpio.c
drivers/core/syscon-uclass.c
drivers/core/uclass.c
drivers/ddr/altera/sdram_gen5.c
drivers/i2c/tegra_i2c.c
drivers/net/mtk_eth.c
drivers/pinctrl/intel/pinctrl.c
drivers/reset/reset-socfpga.c
drivers/tpm/Kconfig
drivers/tpm/Makefile
drivers/video/mxsfb.c
fs/fat/fat_write.c
test/dm/test-fdt.c

diff --cc .gitlab-ci.yml
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc cmd/gpio.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 4c866b37c501eb5b75b70b40d9bd0b88bb1f6b67,b1be3feac8684a2b1385c2ec3462e4d515a442de..8f075b9f45fbe467daf5634638224ae6c15b8e47
@@@ -10,6 -10,6 +10,7 @@@ obj-$(CONFIG_TPM_TIS_SANDBOX) += tpm_ti
  obj-$(CONFIG_TPM_ST33ZP24_I2C) += tpm_tis_st33zp24_i2c.o
  obj-$(CONFIG_TPM_ST33ZP24_SPI) += tpm_tis_st33zp24_spi.o
  
 +obj-$(CONFIG_TPM2_CR50_I2C) += cr50_i2c.o
  obj-$(CONFIG_TPM2_TIS_SANDBOX) += tpm2_tis_sandbox.o
  obj-$(CONFIG_TPM2_TIS_SPI) += tpm2_tis_spi.o
+ obj-$(CONFIG_TPM2_FTPM_TEE) += tpm2_ftpm_tee.o
Simple merge
Simple merge
index 698ca0e7cf86cf47fcb474dcaa61daab5696bd6b,f54db759b65c74872bc417b5b43bde9d0724fe9f..75ae08081cdc997355c522bdf55d4396d0d97c45
@@@ -893,24 -873,41 +894,62 @@@ static int dm_test_read_int(struct unit
        return 0;
  }
  DM_TEST(dm_test_read_int, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
 +
 +/* Test iteration through devices by drvdata */
 +static int dm_test_uclass_drvdata(struct unit_test_state *uts)
 +{
 +      struct udevice *dev;
 +
 +      ut_assertok(uclass_first_device_drvdata(UCLASS_TEST_FDT,
 +                                              DM_TEST_TYPE_FIRST, &dev));
 +      ut_asserteq_str("a-test", dev->name);
 +
 +      ut_assertok(uclass_first_device_drvdata(UCLASS_TEST_FDT,
 +                                              DM_TEST_TYPE_SECOND, &dev));
 +      ut_asserteq_str("d-test", dev->name);
 +
 +      ut_asserteq(-ENODEV, uclass_first_device_drvdata(UCLASS_TEST_FDT,
 +                                                       DM_TEST_TYPE_COUNT,
 +                                                       &dev));
 +
 +      return 0;
 +}
 +DM_TEST(dm_test_uclass_drvdata, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+ /* Test device_first_child_ofdata_err(), etc. */
+ static int dm_test_child_ofdata(struct unit_test_state *uts)
+ {
+       struct udevice *bus, *dev;
+       int count;
+       ut_assertok(uclass_first_device_err(UCLASS_TEST_BUS, &bus));
+       count = 0;
+       device_foreach_child_ofdata_to_platdata(dev, bus) {
+               ut_assert(dev->flags & DM_FLAG_PLATDATA_VALID);
+               ut_assert(!(dev->flags & DM_FLAG_ACTIVATED));
+               count++;
+       }
+       ut_asserteq(3, count);
+       return 0;
+ }
+ DM_TEST(dm_test_child_ofdata, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);
+ /* Test device_first_child_err(), etc. */
+ static int dm_test_first_child_probe(struct unit_test_state *uts)
+ {
+       struct udevice *bus, *dev;
+       int count;
+       ut_assertok(uclass_first_device_err(UCLASS_TEST_BUS, &bus));
+       count = 0;
+       device_foreach_child_probe(dev, bus) {
+               ut_assert(dev->flags & DM_FLAG_PLATDATA_VALID);
+               ut_assert(dev->flags & DM_FLAG_ACTIVATED);
+               count++;
+       }
+       ut_asserteq(3, count);
+       return 0;
+ }
+ DM_TEST(dm_test_first_child_probe, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT);