~funderscore blog cgit wiki get in touch
aboutsummaryrefslogtreecommitdiff
path: root/test/boot
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-08-29 10:06:08 -0400
committerTom Rini <trini@konsulko.com>2023-08-29 10:06:08 -0400
commit0fe0395922d859730eb7ddfcff6ed8d3ac4b2937 (patch)
tree0249ca6a72069c709655a636fff70a931e5aa355 /test/boot
parent6a1d3f64c201ed3f6df819cfcf08154b6ec1c02e (diff)
parentc91feda87ce33c81acc51cc4bf69d613c4fe89de (diff)
downloadu-boot-kii-pro-master.tar.gz
Merge branch '2023-08-28-assorted-important-fixes'HEADmaster
- A few platform-specific config/dts updates to fix issues, drop a temporary change in binman, update the MAINTAINERS file to remove Wolfgang Denk, fix a typo, fix a corner case with bootstd, update Azure to not timeout so easily, and fix a case where we would omit some files in SPL.
Diffstat (limited to 'test/boot')
-rw-r--r--test/boot/bootflow.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index 8a4e090e9b..1c91a942e9 100644
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -27,7 +27,7 @@
DECLARE_GLOBAL_DATA_PTR;
-extern U_BOOT_DRIVER(bootmeth_script);
+extern U_BOOT_DRIVER(bootmeth_2script);
static int inject_response(struct unit_test_state *uts)
{
@@ -525,7 +525,7 @@ static int prep_mmc4_bootdev(struct unit_test_state *uts)
/* Enable the script bootmeth too */
ut_assertok(uclass_first_device_err(UCLASS_BOOTSTD, &bootstd));
- ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_script),
+ ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_2script),
"bootmeth_script", 0, ofnode_null(), &dev));
/* Change the order to include mmc4 */