Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"

[u-boot.git] / test / dm / host.c

diff --git a/test/dm/host.c b/test/dm/host.c
index 85f21f9839e2afe540e010d7bde5d9a9063157ae..e514f8409cf6e42f6e287c8d307c2104971c53fe 100644 (file)
--- a/test/dm/host.c
+++ b/test/dm/host.c
@@ -4,7 +4,6 @@
  * Written by Simon Glass <[email protected]>
  */
 
  * Written by Simon Glass <[email protected]>
  */
 

-#include <common.h>

 #include <blk.h>
 #include <dm.h>
 #include <fs.h>
 #include <blk.h>
 #include <dm.h>
 #include <fs.h>


@@ -31,7 +30,7 @@ static int dm_test_host(struct unit_test_state *uts)
        ut_asserteq(-ENODEV, uclass_first_device_err(UCLASS_PARTITION, &part));
 
        mem_start = ut_check_delta(0);
        ut_asserteq(-ENODEV, uclass_first_device_err(UCLASS_PARTITION, &part));
 
        mem_start = ut_check_delta(0);

-       ut_assertok(host_create_device(label, true, &dev));
+       ut_assertok(host_create_device(label, true, DEFAULT_BLKSZ, &dev));

 
        /* Check that the plat data has been allocated */
        plat = dev_get_plat(dev);
 
        /* Check that the plat data has been allocated */
        plat = dev_get_plat(dev);


@@ -83,7 +82,7 @@ static int dm_test_host_dup(struct unit_test_state *uts)
        char fname[256];
 
        ut_asserteq(0, uclass_id_count(UCLASS_HOST));
        char fname[256];
 
        ut_asserteq(0, uclass_id_count(UCLASS_HOST));

-       ut_assertok(host_create_device(label, true, &dev));
+       ut_assertok(host_create_device(label, true, DEFAULT_BLKSZ, &dev));

 
        /* Attach a file created in test_ut_dm_init */
        ut_assertok(os_persistent_file(fname, sizeof(fname), "2MB.ext2.img"));
 
        /* Attach a file created in test_ut_dm_init */
        ut_assertok(os_persistent_file(fname, sizeof(fname), "2MB.ext2.img"));


@@ -93,7 +92,7 @@ static int dm_test_host_dup(struct unit_test_state *uts)
        ut_asserteq(1, uclass_id_count(UCLASS_HOST));
 
        /* Create another device with the same label (should remove old one) */
        ut_asserteq(1, uclass_id_count(UCLASS_HOST));
 
        /* Create another device with the same label (should remove old one) */

-       ut_assertok(host_create_device(label, true, &dev));
+       ut_assertok(host_create_device(label, true, DEFAULT_BLKSZ, &dev));

 
        /* Attach a different file created in test_ut_dm_init */
        ut_assertok(os_persistent_file(fname, sizeof(fname), "1MB.fat32.img"));
 
        /* Attach a different file created in test_ut_dm_init */
        ut_assertok(os_persistent_file(fname, sizeof(fname), "1MB.fat32.img"));


@@ -120,7 +119,7 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
 
        /* first check 'host info' with binding */
        ut_assertok(run_command("host info", 0));
 
        /* first check 'host info' with binding */
        ut_assertok(run_command("host info", 0));

-       ut_assert_nextline("dev       blocks label           path");
+       ut_assert_nextline("dev       blocks  blksz label           path");

        ut_assert_console_end();
 
        ut_assertok(os_persistent_file(fname, sizeof(fname), "2MB.ext2.img"));
        ut_assert_console_end();
 
        ut_assertok(os_persistent_file(fname, sizeof(fname), "2MB.ext2.img"));


@@ -133,8 +132,8 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
        ut_asserteq(true, desc->removable);
 
        ut_assertok(run_command("host info", 0));
        ut_asserteq(true, desc->removable);
 
        ut_assertok(run_command("host info", 0));

-       ut_assert_nextline("dev       blocks label           path");
-       ut_assert_nextlinen("  0         4096 test2");
+       ut_assert_nextline("dev       blocks  blksz label           path");
+       ut_assert_nextlinen("  0         4096    512 test2");

        ut_assert_console_end();
 
        ut_assertok(os_persistent_file(fname, sizeof(fname), "1MB.fat32.img"));
        ut_assert_console_end();
 
        ut_assertok(os_persistent_file(fname, sizeof(fname), "1MB.fat32.img"));


@@ -147,9 +146,9 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
        ut_asserteq(false, desc->removable);
 
        ut_assertok(run_command("host info", 0));
        ut_asserteq(false, desc->removable);
 
        ut_assertok(run_command("host info", 0));

-       ut_assert_nextline("dev       blocks label           path");
-       ut_assert_nextlinen("  0         4096 test2");
-       ut_assert_nextlinen("  1         2048 fat");
+       ut_assert_nextline("dev       blocks  blksz label           path");
+       ut_assert_nextlinen("  0         4096    512 test2");
+       ut_assert_nextlinen("  1         2048    512 fat");

        ut_assert_console_end();
 
        ut_asserteq(1, run_command("host info test", 0));
        ut_assert_console_end();
 
        ut_asserteq(1, run_command("host info test", 0));


@@ -157,8 +156,8 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
        ut_assert_console_end();
 
        ut_assertok(run_command("host info fat", 0));
        ut_assert_console_end();
 
        ut_assertok(run_command("host info fat", 0));

-       ut_assert_nextline("dev       blocks label           path");
-       ut_assert_nextlinen("  1         2048 fat");
+       ut_assert_nextline("dev       blocks  blksz label           path");
+       ut_assert_nextlinen("  1         2048    512 fat");

        ut_assert_console_end();
 
        /* check 'host dev' */
        ut_assert_console_end();
 
        /* check 'host dev' */


@@ -194,8 +193,8 @@ static int dm_test_cmd_host(struct unit_test_state *uts)
        ut_assert_console_end();
 
        ut_assertok(run_command("host info", 0));
        ut_assert_console_end();
 
        ut_assertok(run_command("host info", 0));

-       ut_assert_nextline("dev       blocks label           path");
-       ut_assert_nextlinen("  1         2048 fat");
+       ut_assert_nextline("dev       blocks  blksz label           path");
+       ut_assert_nextlinen("  1         2048    512 fat");

        ut_assert_console_end();
 
        return 0;
        ut_assert_console_end();
 
        return 0;