mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-30 00:21:06 +00:00
b770e88a6c
As documented, almost all U-Boot commands expect numbers to be entered in hexadecimal input format. (Exception: for historical reasons, the "sleep" command takes its argument in decimal input format.) This rule was broken for the "load" command; for details please see especially commits045fa1e"fs: add filesystem switch libary, implement ls and fsload commands" and3f83c87"fs: fix number base behaviour change in fatload/ext*load". In the result, the load command would always require an explicit "0x" prefix for regular (i. e. base 16 formatted) input. Change this to use the standard notation of base 16 input format. While strictly speaking this is a change of the user interface, we hope that it will not cause trouble. Stephen Warren comments (see [1]): I suppose you can change the behaviour if you want; anyone writing "0x..." for their values presumably won't be affected, and if people really do assume all values in U-Boot are in hex, presumably nobody currently relies upon using non-prefixed values with the generic load command, since it doesn't work like that right now. [1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/171172 Acked-by: Tom Rini <trini@ti.com> Acked-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Wolfgang Denk <wd@denx.de>
125 lines
3 KiB
C
125 lines
3 KiB
C
/*
|
|
* (C) Copyright 2011 - 2012 Samsung Electronics
|
|
* EXT4 filesystem implementation in Uboot by
|
|
* Uma Shankar <uma.shankar@samsung.com>
|
|
* Manjunatha C Achar <a.manjunatha@samsung.com>
|
|
*
|
|
* Ext4fs support
|
|
* made from existing cmd_ext2.c file of Uboot
|
|
*
|
|
* (C) Copyright 2004
|
|
* esd gmbh <www.esd-electronics.com>
|
|
* Reinhard Arlt <reinhard.arlt@esd-electronics.com>
|
|
*
|
|
* made from cmd_reiserfs by
|
|
*
|
|
* (C) Copyright 2003 - 2004
|
|
* Sysgo Real-Time Solutions, AG <www.elinos.com>
|
|
* Pavel Bartusek <pba@sysgo.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
/*
|
|
* Changelog:
|
|
* 0.1 - Newly created file for ext4fs support. Taken from cmd_ext2.c
|
|
* file in uboot. Added ext4fs ls load and write support.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <part.h>
|
|
#include <config.h>
|
|
#include <command.h>
|
|
#include <image.h>
|
|
#include <linux/ctype.h>
|
|
#include <asm/byteorder.h>
|
|
#include <ext4fs.h>
|
|
#include <linux/stat.h>
|
|
#include <malloc.h>
|
|
#include <fs.h>
|
|
|
|
#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
|
|
#include <usb.h>
|
|
#endif
|
|
|
|
int do_ext4_load(cmd_tbl_t *cmdtp, int flag, int argc,
|
|
char *const argv[])
|
|
{
|
|
return do_load(cmdtp, flag, argc, argv, FS_TYPE_EXT);
|
|
}
|
|
|
|
int do_ext4_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
|
|
{
|
|
return do_ls(cmdtp, flag, argc, argv, FS_TYPE_EXT);
|
|
}
|
|
|
|
#if defined(CONFIG_CMD_EXT4_WRITE)
|
|
int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc,
|
|
char *const argv[])
|
|
{
|
|
const char *filename = "/";
|
|
int dev, part;
|
|
unsigned long ram_address;
|
|
unsigned long file_size;
|
|
disk_partition_t info;
|
|
block_dev_desc_t *dev_desc;
|
|
|
|
if (argc < 6)
|
|
return cmd_usage(cmdtp);
|
|
|
|
part = get_device_and_partition(argv[1], argv[2], &dev_desc, &info, 1);
|
|
if (part < 0)
|
|
return 1;
|
|
|
|
dev = dev_desc->dev;
|
|
|
|
/* get the filename */
|
|
filename = argv[4];
|
|
|
|
/* get the address in hexadecimal format (string to int) */
|
|
ram_address = simple_strtoul(argv[3], NULL, 16);
|
|
|
|
/* get the filesize in base 10 format */
|
|
file_size = simple_strtoul(argv[5], NULL, 10);
|
|
|
|
/* set the device as block device */
|
|
ext4fs_set_blk_dev(dev_desc, &info);
|
|
|
|
/* mount the filesystem */
|
|
if (!ext4fs_mount(info.size)) {
|
|
printf("Bad ext4 partition %s %d:%d\n", argv[1], dev, part);
|
|
goto fail;
|
|
}
|
|
|
|
/* start write */
|
|
if (ext4fs_write(filename, (unsigned char *)ram_address, file_size)) {
|
|
printf("** Error ext4fs_write() **\n");
|
|
goto fail;
|
|
}
|
|
ext4fs_close();
|
|
|
|
return 0;
|
|
|
|
fail:
|
|
ext4fs_close();
|
|
|
|
return 1;
|
|
}
|
|
|
|
U_BOOT_CMD(ext4write, 6, 1, do_ext4_write,
|
|
"create a file in the root directory",
|
|
"<interface> <dev[:part]> <addr> <absolute filename path> [sizebytes]\n"
|
|
" - create a file in / directory");
|
|
|
|
#endif
|
|
|
|
U_BOOT_CMD(ext4ls, 4, 1, do_ext4_ls,
|
|
"list files in a directory (default /)",
|
|
"<interface> <dev[:part]> [directory]\n"
|
|
" - list files from 'dev' on 'interface' in a 'directory'");
|
|
|
|
U_BOOT_CMD(ext4load, 6, 0, do_ext4_load,
|
|
"load binary file from a Ext4 filesystem",
|
|
"<interface> <dev[:part]> [addr] [filename] [bytes]\n"
|
|
" - load binary file 'filename' from 'dev' on 'interface'\n"
|
|
" to address 'addr' from ext4 filesystem");
|