Merge tag 'v2023.10-rc4' into next

[J-u-boot.git] / test / boot / bootflow.c

diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index ae34370981cb31b7dc00a78725ef17ed87d1e5e6..f5b2059140acae8f5a9d463ebf99b9c3462e3106 100644 (file)
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -28,7 +28,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 extern U_BOOT_DRIVER(bootmeth_cros);
-extern U_BOOT_DRIVER(bootmeth_script);
+extern U_BOOT_DRIVER(bootmeth_2script);
 
 static int inject_response(struct unit_test_state *uts)
 {
@@ -532,7 +532,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_script),
+       ut_assertok(device_bind(bootstd, DM_DRIVER_REF(bootmeth_2script),
                                "bootmeth_script", 0, ofnode_null(), &dev));
 
        /* Enable the cros bootmeth if needed */
@@ -983,9 +983,10 @@ static int bootflow_cros(struct unit_test_state *uts)
        ut_assert_nextlinen("Seq");
        ut_assert_nextlinen("---");
        ut_assert_nextlinen("  0  extlinux");
-       ut_assert_nextlinen("  1  cros         ready   mmc          2  mmc5.bootdev.whole       ");
+       ut_assert_nextlinen("  1  cros         ready   mmc          2  mmc5.bootdev.part_2       ");
+       ut_assert_nextlinen("  2  cros         ready   mmc          4  mmc5.bootdev.part_4       ");
        ut_assert_nextlinen("---");
-       ut_assert_skip_to_line("(2 bootflows, 2 valid)");
+       ut_assert_skip_to_line("(3 bootflows, 3 valid)");
 
        ut_assert_console_end();