summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-12-02 13:17:31 -0700
committerTom Rini <trini@ti.com>2015-01-14 11:35:43 -0500
commitb5493d17bdc62b0a0608d539bd2756eb7ed1cc9c (patch)
treec5472871655f1cb3c52aa78e74d9bb3b98dca954
parent40e5975f9ad7a545b85d2430d6517d8d3d18e87d (diff)
downloadu-boot-b5493d17bdc62b0a0608d539bd2756eb7ed1cc9c.tar.gz
u-boot-b5493d17bdc62b0a0608d539bd2756eb7ed1cc9c.tar.xz
u-boot-b5493d17bdc62b0a0608d539bd2756eb7ed1cc9c.zip
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>
-rw-r--r--common/cmd_sandbox.c2
-rw-r--r--test/dm/sf.c2
-rwxr-xr-xtest/image/test-fit.py6
3 files changed, 5 insertions, 5 deletions
diff --git a/common/cmd_sandbox.c b/common/cmd_sandbox.c
index 3d9fce7e55..428696982e 100644
--- 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 57dd1345c4..08098a18b8 100644
--- 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 b065fcb130..0eb424d875 100755
--- 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
'''