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>
This commit is contained in:
Simon Glass 2018-11-15 18:44:02 -07:00 committed by Tom Rini
parent 1ca910be5d
commit 6d07d63d2f
5 changed files with 9 additions and 14 deletions

View file

@ -167,11 +167,6 @@ static int do_host(cmd_tbl_t *cmdtp, int flag, int argc,
return CMD_RET_USAGE; return CMD_RET_USAGE;
} }
U_BOOT_CMD(
sb, 8, 1, do_host,
"Deprecated: use 'host' command instead.", ""
);
U_BOOT_CMD( U_BOOT_CMD(
host, 8, 1, do_host, host, 8, 1, do_host,
"Miscellaneous host commands", "Miscellaneous host commands",

View file

@ -88,7 +88,7 @@ stdin=serial
stdout=serial stdout=serial
Environment size: 117/8188 bytes 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) 11405888 bytes written in 10 ms (1.1 GiB/s)
=>reset =>reset

View file

@ -79,7 +79,7 @@ static int dm_test_spi_flash_func(struct unit_test_state *uts)
* benefit is worth the extra complexity. * benefit is worth the extra complexity.
*/ */
ut_asserteq(0, run_command_list( ut_asserteq(0, run_command_list(
"sb save hostfs - 0 spi.bin 200000;" "host save hostfs - 0 spi.bin 200000;"
"sf probe;" "sf probe;"
"sf test 0 10000", -1, 0)); "sf test 0 10000", -1, 0));
/* /*

View file

@ -99,15 +99,15 @@ base_fdt = '''
# then run the 'bootm' command, then save out memory from the places where # then run the 'bootm' command, then save out memory from the places where
# we expect 'bootm' to write things. Then quit. # we expect 'bootm' to write things. Then quit.
base_script = ''' 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 fdt addr %(fit_addr)x
bootm start %(fit_addr)x bootm start %(fit_addr)x
bootm loados bootm loados
sb save hostfs 0 %(kernel_addr)x %(kernel_out)s %(kernel_size)x host 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 host 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 host 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 host 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 %(loadables2_addr)x %(loadables2_out)s %(loadables2_size)x
''' '''
@pytest.mark.boardspec('sandbox') @pytest.mark.boardspec('sandbox')

View file

@ -74,7 +74,7 @@ def test_vboot(u_boot_console):
cons.restart_uboot() cons.restart_uboot()
with cons.log.section('Verified boot %s %s' % (sha_algo, test_type)): with cons.log.section('Verified boot %s %s' % (sha_algo, test_type)):
output = cons.run_command_list( output = cons.run_command_list(
['sb load hostfs - 100 %stest.fit' % tmpdir, ['host load hostfs - 100 %stest.fit' % tmpdir,
'fdt addr 100', 'fdt addr 100',
'bootm 100']) 'bootm 100'])
assert(expect_string in ''.join(output)) assert(expect_string in ''.join(output))