diff options
| author | Tom Rini <[email protected]> | 2024-11-03 17:23:29 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-11-03 21:27:13 -0600 |
| commit | bf066dc3ebfe79ed24f889a41abe43d48d26c454 (patch) | |
| tree | 7a967c47cb8d2bc242b241f35d3dcdaee257a883 /test/boot | |
| parent | 93cfcb026a124b133e85a025c51fcc6c85bc385e (diff) | |
| parent | dc24948a457e2f5cb7c518a9458be851b8b7e9ea (diff) | |
Merge tag 'dm-pull-2nov24' of https://source.denx.de/u-boot/custodians/u-boot-dm
CI: https://source.denx.de/u-boot/custodians/u-boot-dm/-/pipelines/23152
CI: https://dev.azure.com/simon0972/u-boot/_build/results?buildId=71&view=results
- alist enhancements and fixes
- minor test and sandbox fixes
- some more x86/coreboot patches
Diffstat (limited to 'test/boot')
| -rw-r--r-- | test/boot/bootflow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c index 0d4e966892e..2f859c40adb 100644 --- a/test/boot/bootflow.c +++ b/test/boot/bootflow.c @@ -370,7 +370,7 @@ static int bootflow_iter(struct unit_test_state *uts) return 0; } -BOOTSTD_TEST(bootflow_iter, UTF_DM | UTF_SCAN_FDT); +BOOTSTD_TEST(bootflow_iter, UTF_DM | UTF_SCAN_FDT | UTF_CONSOLE); #if defined(CONFIG_SANDBOX) && defined(CONFIG_BOOTMETH_GLOBAL) /* Check using the system bootdev */ @@ -542,7 +542,7 @@ static int prep_mmc_bootdev(struct unit_test_state *uts, const char *mmc_dev, /* Enable the script bootmeth too */ ut_assertok(uclass_first_device_err(UCLASS_BOOTSTD, &bootstd)); ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_2script), - "bootmeth_script", 0, ofnode_null(), &dev)); + "script", 0, ofnode_null(), &dev)); /* Enable the cros bootmeth if needed */ if (IS_ENABLED(CONFIG_BOOTMETH_CROS) && bind_cros_android) { |