projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'mmc-2020-6-24' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
[oweals/u-boot.git]
/
cmd
/
jffs2.c
diff --git
a/cmd/jffs2.c
b/cmd/jffs2.c
index 13c533cf12992bc2532f90b668806a614ed19e7d..9540988e33e5f06ca242b2f51bf9d572e160a921 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,8
+72,12
@@
*/
#include <common.h>
#include <command.h>
*/
#include <common.h>
#include <command.h>
+#include <env.h>
+#include <flash.h>
+#include <image.h>
#include <malloc.h>
#include <jffs2/jffs2.h>
#include <malloc.h>
#include <jffs2/jffs2.h>
+#include <linux/bug.h>
#include <linux/list.h>
#include <linux/ctype.h>
#include <cramfs/cramfs_fs.h>
#include <linux/list.h>
#include <linux/ctype.h>
#include <cramfs/cramfs_fs.h>
@@
-470,13
+473,14
@@
static struct part_info* jffs2_part_info(struct mtd_device *dev, unsigned int pa
* @param argv arguments list
* @return 0 on success, 1 otherwise
*/
* @param argv arguments list
* @return 0 on success, 1 otherwise
*/
-int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_jffs2_fsload(struct cmd_tbl *cmdtp, int flag, int argc,
+ char *const argv[])
{
char *fsname;
char *filename;
int size;
struct part_info *part;
{
char *fsname;
char *filename;
int size;
struct part_info *part;
- ulong offset = load_addr;
+ ulong offset =
image_
load_addr;
/* pre-set Boot file name */
filename = env_get("bootfile");
/* pre-set Boot file name */
filename = env_get("bootfile");
@@
-488,7
+492,7
@@
int do_jffs2_fsload(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
if (argc == 3) {
offset = simple_strtoul(argv[1], NULL, 16);
}
if (argc == 3) {
offset = simple_strtoul(argv[1], NULL, 16);
- load_addr = offset;
+
image_
load_addr = offset;
filename = argv[2];
}
filename = argv[2];
}
@@
-532,7
+536,7
@@
int do_jffs2_fsload(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_jffs2_ls(
cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
+int do_jffs2_ls(
struct cmd_tbl *cmdtp, int flag, int argc, char *
const argv[])
{
char *filename = "/";
int ret;
{
char *filename = "/";
int ret;
@@
-570,7
+574,8
@@
int do_jffs2_ls(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_jffs2_fsinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_jffs2_fsinfo(struct cmd_tbl *cmdtp, int flag, int argc,
+ char *const argv[])
{
struct part_info *part;
char *fsname;
{
struct part_info *part;
char *fsname;