sandbox: Correct ordering of 'sb save' commands

Prior to commit d455d87 there was an inconsistency between the position of
the 'address' parameter in 'sb load' and 'sb save'. This was corrected but
it broke some tests. Fix the tests and also the help for 'sb save'.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/cmd_sandbox.c b/common/cmd_sandbox.c
index 3d9fce7e554883f8dbb6b886d17420704f2f8a03..428696982e33640a44b3b4af04e2fdca6981eec5 100644 (file)
--- a/common/cmd_sandbox.c
+++ b/common/cmd_sandbox.c
@@ -117,7 +117,7 @@ U_BOOT_CMD(
        "load hostfs - <addr> <filename> [<bytes> <offset>]  - "
                "load a file from host\n"
        "sb ls hostfs - <filename>                    - list files on host\n"
-       "sb save hostfs - <filename> <addr> <bytes> [<offset>] - "
+       "sb save hostfs - <addr> <filename> <bytes> [<offset>] - "
                "save a file to host\n"
        "sb bind <dev> [<filename>] - bind \"host\" device to file\n"
        "sb info [<dev>]            - show device binding & info\n"

diff --git a/test/dm/sf.c b/test/dm/sf.c
index 57dd1345c437b96bd4f9e469f8cd7f17c04638ff..08098a18b80980cd6e844c79e1320dddaa8bb8ce 100644 (file)
--- a/test/dm/sf.c
+++ b/test/dm/sf.c
@@ -29,7 +29,7 @@ static int dm_test_spi_flash(struct dm_test_state *dms)
         * benefit is worth the extra complexity.
         */
        ut_asserteq(0, run_command_list(
-               "sb save hostfs - spi.bin 0 200000;"
+               "sb save hostfs - 0 spi.bin 200000;"
                "sf probe;"
                "sf test 0 10000", -1,  0));
        /*

diff --git a/test/image/test-fit.py b/test/image/test-fit.py
index b065fcb130c627fa5412be1608c0cdff86323cc4..0eb424d8753eaffda57cd1a1800f2795991fa517 100755 (executable)
--- a/test/image/test-fit.py
+++ b/test/image/test-fit.py
@@ -97,9 +97,9 @@ sb load hostfs 0 %(fit_addr)x %(fit)s
 fdt addr %(fit_addr)x
 bootm start %(fit_addr)x
 bootm loados
-sb save hostfs 0 %(kernel_out)s %(kernel_addr)x %(kernel_size)x
-sb save hostfs 0 %(fdt_out)s %(fdt_addr)x %(fdt_size)x
-sb save hostfs 0 %(ramdisk_out)s %(ramdisk_addr)x %(ramdisk_size)x
+sb save hostfs 0 %(kernel_addr)x %(kernel_out)s %(kernel_size)x
+sb save hostfs 0 %(fdt_addr)x %(fdt_out)s %(fdt_size)x
+sb save hostfs 0 %(ramdisk_addr)x %(ramdisk_out)s %(ramdisk_size)x
 reset
 '''