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>

diff --git a/cmd/host.c b/cmd/host.c
index 645dba4de831f2733a64c88d04ddc890436074b0..f7d3eae5b1ad1313f0ee8032fe69ac2df556be65 100644 (file)
--- a/cmd/host.c
+++ b/cmd/host.c
@@ -167,11 +167,6 @@ static int do_host(cmd_tbl_t *cmdtp, int flag, int argc,
                return CMD_RET_USAGE;
 }
 
-U_BOOT_CMD(
-       sb,     8,      1,      do_host,
-       "Deprecated: use 'host' command instead.", ""
-);
-
 U_BOOT_CMD(
        host, 8, 1, do_host,
        "Miscellaneous host commands",

diff --git a/doc/README.trace b/doc/README.trace
index 74ba26a5a48707be1ab5484c38e7663096dd355d..2e7ca3319a9601b82839f12c9188836f6031d6f8 100644 (file)
--- 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 35dce4e4c989cad2785387e4977b728ec879cecc..3788d59052e448e878a734d2ba886fc97232e6d0 100644 (file)
--- 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 34696e976796baf22269e66cbac55833b422212b..49d6fea57163fd65d09e1c7a7a6f798c08dc28b6 100755 (executable)
--- 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 e9cbd57fbab7c1ac3fa943328a566ef45080f059..92144d4c1e36f8e10e3f70d4e9b29af5c046d872 100644 (file)
--- 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))