mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-23 16:11:54 +00:00
3f83c87ee5
Commit 045fa1e "fs: add filesystem switch libary, implement ls and
fsload commands" unified the implementation of fatload and ext*load
with the new command fsload. However, this altered the interpretation
of command-line numbers from always being base-16, to requiring a "0x"
prefix for base-16 numbers. Enhance do_fsload() to allow commands to
specify which base to use.
Use base 0, thus requiring a "0x" prefix for the new fsload command.
This feels much cleaner than assuming base 16.
Use base 16 for the pre-existing fatload and ext*load to prevent a
change in behaviour.
Use base 16 exclusively for the loadaddr environment variable, since
that variable is interpreted in multiple places, so we don't want the
behaviour to change.
Update command help text to make it clear where numbers are assumed to
be hex, and where an explicit "0x" prefix is required.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
53 lines
1.9 KiB
C
53 lines
1.9 KiB
C
/*
|
|
* Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
|
|
*
|
|
* Inspired by cmd_ext_common.c, cmd_fat.c.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <command.h>
|
|
#include <fs.h>
|
|
|
|
int do_fsload_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
return do_fsload(cmdtp, flag, argc, argv, FS_TYPE_ANY, 0);
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
fsload, 7, 0, do_fsload_wrapper,
|
|
"load binary file from a filesystem",
|
|
"<interface> [<dev[:part]> [<addr> [<filename> [bytes [pos]]]]]\n"
|
|
" - Load binary file 'filename' from partition 'part' on device\n"
|
|
" type 'interface' instance 'dev' to address 'addr' in memory.\n"
|
|
" 'bytes' gives the size to load in bytes.\n"
|
|
" If 'bytes' is 0 or omitted, the file is read until the end.\n"
|
|
" 'pos' gives the file byte position to start reading from.\n"
|
|
" If 'pos' is 0 or omitted, the file is read from the start.\n"
|
|
" All numeric parameters are assumed to be decimal,\n"
|
|
" unless specified otherwise using a leading \"0x\"."
|
|
);
|
|
|
|
int do_ls_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|
{
|
|
return do_ls(cmdtp, flag, argc, argv, FS_TYPE_ANY);
|
|
}
|
|
|
|
U_BOOT_CMD(
|
|
ls, 4, 1, do_ls_wrapper,
|
|
"list files in a directory (default /)",
|
|
"<interface> [<dev[:part]> [directory]]\n"
|
|
" - List files in directory 'directory' of partition 'part' on\n"
|
|
" device type 'interface' instance 'dev'."
|
|
);
|