test: dm: core: Add a test case for driver marked with DM_FLAG_PRE_RELOC flag

Now that we fixed the pre-relocation driver binding for driver marked
with DM_FLAG_PRE_RELOC flag, add a test case to cover that scenario.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Bin Meng 2018-10-10 22:07:01 -07:00 committed by Simon Glass
parent 8e39afcd94
commit 2786cd740e
3 changed files with 31 additions and 4 deletions

View File

@ -186,6 +186,10 @@
compatible = "denx,u-boot-fdt-test";
};
h-test {
compatible = "denx,u-boot-fdt-test1";
};
clocks {
clk_fixed: clk-fixed {
compatible = "fixed-clock";

View File

@ -107,7 +107,7 @@ UCLASS_DRIVER(testbus) = {
/* Test that we can probe for children */
static int dm_test_bus_children(struct unit_test_state *uts)
{
int num_devices = 7;
int num_devices = 8;
struct udevice *bus;
struct uclass *uc;

View File

@ -84,6 +84,25 @@ U_BOOT_DRIVER(testfdt_drv) = {
.platdata_auto_alloc_size = sizeof(struct dm_test_pdata),
};
static const struct udevice_id testfdt1_ids[] = {
{
.compatible = "denx,u-boot-fdt-test1",
.data = DM_TEST_TYPE_FIRST },
{ }
};
U_BOOT_DRIVER(testfdt1_drv) = {
.name = "testfdt1_drv",
.of_match = testfdt1_ids,
.id = UCLASS_TEST_FDT,
.ofdata_to_platdata = testfdt_ofdata_to_platdata,
.probe = testfdt_drv_probe,
.ops = &test_ops,
.priv_auto_alloc_size = sizeof(struct dm_test_priv),
.platdata_auto_alloc_size = sizeof(struct dm_test_pdata),
.flags = DM_FLAG_PRE_RELOC,
};
/* From here is the testfdt uclass code */
int testfdt_ping(struct udevice *dev, int pingval, int *pingret)
{
@ -168,7 +187,7 @@ int dm_check_devices(struct unit_test_state *uts, int num_devices)
/* Test that FDT-based binding works correctly */
static int dm_test_fdt(struct unit_test_state *uts)
{
const int num_devices = 7;
const int num_devices = 8;
struct udevice *dev;
struct uclass *uc;
int ret;
@ -208,8 +227,12 @@ static int dm_test_fdt_pre_reloc(struct unit_test_state *uts)
ret = uclass_get(UCLASS_TEST_FDT, &uc);
ut_assert(!ret);
/* These is only one pre-reloc device */
ut_asserteq(1, list_count_items(&uc->dev_head));
/*
* These are 2 pre-reloc devices:
* one with "u-boot,dm-pre-reloc" property (a-test node), and the other
* one whose driver marked with DM_FLAG_PRE_RELOC flag (h-test node).
*/
ut_asserteq(2, list_count_items(&uc->dev_head));
return 0;
}