diff options
| author | Simon Glass <sjg@chromium.org> | 2018-11-16 04:44:02 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-26 16:25:35 +0300 |
| commit | 6d07d63d2f07497ba9846a5bcd3e5b9c417db931 (patch) | |
| tree | 38dda620a9e73646a51cb5fae066cf3d096d70fa | |
| parent | 1ca910be5df2e2ba80f7ac496570a88e34593cf8 (diff) | |
| download | u-boot-6d07d63d2f07497ba9846a5bcd3e5b9c417db931.tar.xz | |
sandbox: Drop the deprecated 'sb' command
The old 'sb' command was deprecated in 2015 and replaced with 'host'.
Remove the remaining users and the command, so that the name is available
for other purposes.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | cmd/host.c | 5 | ||||
| -rw-r--r-- | doc/README.trace | 2 | ||||
| -rw-r--r-- | test/dm/sf.c | 2 | ||||
| -rwxr-xr-x | test/py/tests/test_fit.py | 12 | ||||
| -rw-r--r-- | test/py/tests/test_vboot.py | 2 |
5 files changed, 9 insertions, 14 deletions
diff --git a/cmd/host.c b/cmd/host.c index 645dba4de8..f7d3eae5b1 100644 --- a/cmd/host.c +++ b/cmd/host.c @@ -168,11 +168,6 @@ static int do_host(cmd_tbl_t *cmdtp, int flag, int argc, } U_BOOT_CMD( - sb, 8, 1, do_host, - "Deprecated: use 'host' command instead.", "" -); - -U_BOOT_CMD( host, 8, 1, do_host, "Miscellaneous host commands", "load hostfs - <addr> <filename> [<bytes> <offset>] - " diff --git a/doc/README.trace b/doc/README.trace index 74ba26a5a4..2e7ca3319a 100644 --- a/doc/README.trace +++ b/doc/README.trace @@ -88,7 +88,7 @@ stdin=serial stdout=serial Environment size: 117/8188 bytes -=>sb save host 0 trace 0 ${profoffset} +=>host save host 0 trace 0 ${profoffset} 11405888 bytes written in 10 ms (1.1 GiB/s) =>reset diff --git a/test/dm/sf.c b/test/dm/sf.c index 35dce4e4c9..3788d59052 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -79,7 +79,7 @@ static int dm_test_spi_flash_func(struct unit_test_state *uts) * benefit is worth the extra complexity. */ ut_asserteq(0, run_command_list( - "sb save hostfs - 0 spi.bin 200000;" + "host save hostfs - 0 spi.bin 200000;" "sf probe;" "sf test 0 10000", -1, 0)); /* diff --git a/test/py/tests/test_fit.py b/test/py/tests/test_fit.py index 34696e9767..49d6fea571 100755 --- a/test/py/tests/test_fit.py +++ b/test/py/tests/test_fit.py @@ -99,15 +99,15 @@ base_fdt = ''' # then run the 'bootm' command, then save out memory from the places where # we expect 'bootm' to write things. Then quit. base_script = ''' -sb load hostfs 0 %(fit_addr)x %(fit)s +host 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_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 -sb save hostfs 0 %(loadables1_addr)x %(loadables1_out)s %(loadables1_size)x -sb save hostfs 0 %(loadables2_addr)x %(loadables2_out)s %(loadables2_size)x +host save hostfs 0 %(kernel_addr)x %(kernel_out)s %(kernel_size)x +host save hostfs 0 %(fdt_addr)x %(fdt_out)s %(fdt_size)x +host save hostfs 0 %(ramdisk_addr)x %(ramdisk_out)s %(ramdisk_size)x +host save hostfs 0 %(loadables1_addr)x %(loadables1_out)s %(loadables1_size)x +host save hostfs 0 %(loadables2_addr)x %(loadables2_out)s %(loadables2_size)x ''' @pytest.mark.boardspec('sandbox') diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py index e9cbd57fba..92144d4c1e 100644 --- a/test/py/tests/test_vboot.py +++ b/test/py/tests/test_vboot.py @@ -74,7 +74,7 @@ def test_vboot(u_boot_console): cons.restart_uboot() with cons.log.section('Verified boot %s %s' % (sha_algo, test_type)): output = cons.run_command_list( - ['sb load hostfs - 100 %stest.fit' % tmpdir, + ['host load hostfs - 100 %stest.fit' % tmpdir, 'fdt addr 100', 'bootm 100']) assert(expect_string in ''.join(output)) |