projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'efi-2021-10-rc4-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
[platform/kernel/u-boot.git]
/
cmd
/
cramfs.c
diff --git
a/cmd/cramfs.c
b/cmd/cramfs.c
index
598028c
..
44c0818
100644
(file)
--- a/
cmd/cramfs.c
+++ b/
cmd/cramfs.c
@@
-12,6
+12,8
@@
*/
#include <common.h>
#include <command.h>
*/
#include <common.h>
#include <command.h>
+#include <env.h>
+#include <image.h>
#include <malloc.h>
#include <mapmem.h>
#include <linux/list.h>
#include <malloc.h>
#include <mapmem.h>
#include <linux/list.h>
@@
-92,11
+94,12
@@
extern int cramfs_info (struct part_info *info);
* @param argv arguments list
* @return 0 on success, 1 otherwise
*/
* @param argv arguments list
* @return 0 on success, 1 otherwise
*/
-int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_cramfs_load(struct cmd_tbl *cmdtp, int flag, int argc,
+ char *const argv[])
{
char *filename;
int size;
{
char *filename;
int size;
- ulong offset = load_addr;
+ ulong offset =
image_
load_addr;
char *offset_virt;
struct part_info part;
char *offset_virt;
struct part_info part;
@@
-104,7
+107,7
@@
int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
struct mtdids id;
ulong addr;
struct mtdids id;
ulong addr;
- addr =
simple_strtoul(env_get("cramfsaddr"), NULL, 16
);
+ addr =
hextoul(env_get("cramfsaddr"), NULL
);
/* hack! */
/* cramfs_* only supports NOR flash chips */
/* hack! */
/* cramfs_* only supports NOR flash chips */
@@
-126,7
+129,7
@@
int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
if (argc == 3) {
offset = simple_strtoul(argv[1], NULL, 0);
}
if (argc == 3) {
offset = simple_strtoul(argv[1], NULL, 0);
- load_addr = offset;
+
image_
load_addr = offset;
filename = argv[2];
}
filename = argv[2];
}
@@
-160,7
+163,7
@@
int do_cramfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
* @param argv arguments list
* @return 0 on success, 1 otherwise
*/
* @param argv arguments list
* @return 0 on success, 1 otherwise
*/
-int do_cramfs_ls(
cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
+int do_cramfs_ls(
struct cmd_tbl *cmdtp, int flag, int argc, char *
const argv[])
{
char *filename = "/";
int ret;
{
char *filename = "/";
int ret;
@@
-169,7
+172,7
@@
int do_cramfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
struct mtdids id;
ulong addr;
struct mtdids id;
ulong addr;
- addr =
simple_strtoul(env_get("cramfsaddr"), NULL, 16
);
+ addr =
hextoul(env_get("cramfsaddr"), NULL
);
/* hack! */
/* cramfs_* only supports NOR flash chips */
/* hack! */
/* cramfs_* only supports NOR flash chips */