projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: spi: Return 0 if driver does not implement ops->cs_info
[oweals/u-boot.git]
/
cmd
/
jffs2.c
diff --git
a/cmd/jffs2.c
b/cmd/jffs2.c
index dc94705ccd73ee87b9ee140905957aef99445a47..b47cd3d98930a4a80ee4fbdc55d4afaad036c795 100644
(file)
--- a/
cmd/jffs2.c
+++ b/
cmd/jffs2.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2002
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@
-17,8
+18,6
@@
*
* $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
* Copyright 2002 SYSGO Real-Time Solutions GmbH
*
* $Id: cmdlinepart.c,v 1.17 2004/11/26 11:18:47 lavinen Exp $
* Copyright 2002 SYSGO Real-Time Solutions GmbH
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
/*
*/
/*
@@
-73,6
+72,7
@@
*/
#include <common.h>
#include <command.h>
*/
#include <common.h>
#include <command.h>
+#include <env.h>
#include <malloc.h>
#include <jffs2/jffs2.h>
#include <linux/list.h>
#include <malloc.h>
#include <jffs2/jffs2.h>
#include <linux/list.h>
@@
-80,7
+80,7
@@
#include <cramfs/cramfs_fs.h>
#if defined(CONFIG_CMD_NAND)
#include <cramfs/cramfs_fs.h>
#if defined(CONFIG_CMD_NAND)
-#include <linux/mtd/nand.h>
+#include <linux/mtd/
raw
nand.h>
#include <nand.h>
#endif
#include <nand.h>
#endif
@@
-479,9
+479,9
@@
int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
ulong offset = load_addr;
/* pre-set Boot file name */
ulong offset = load_addr;
/* pre-set Boot file name */
- if ((filename = getenv("bootfile")) == NULL) {
+ filename = env_get("bootfile");
+ if (!filename)
filename = "uImage";
filename = "uImage";
- }
if (argc == 2) {
filename = argv[1];
if (argc == 2) {
filename = argv[1];
@@
-512,7
+512,7
@@
int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
if (size > 0) {
printf("### %s load complete: %d bytes loaded to 0x%lx\n",
fsname, size, offset);
if (size > 0) {
printf("### %s load complete: %d bytes loaded to 0x%lx\n",
fsname, size, offset);
-
setenv
_hex("filesize", size);
+
env_set
_hex("filesize", size);
} else {
printf("### %s LOAD ERROR<%x> for %s!\n", fsname, size, filename);
}
} else {
printf("### %s LOAD ERROR<%x> for %s!\n", fsname, size, filename);
}