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 branch 'next' of git://git.denx.de/u-boot-avr32
[platform/kernel/u-boot.git]
/
common
/
cmd_jffs2.c
diff --git
a/common/cmd_jffs2.c
b/common/cmd_jffs2.c
index
b4698be
..
c031d80
100644
(file)
--- a/
common/cmd_jffs2.c
+++ b/
common/cmd_jffs2.c
@@
-96,12
+96,12
@@
#include <cramfs/cramfs_fs.h>
#if defined(CONFIG_CMD_NAND)
#include <cramfs/cramfs_fs.h>
#if defined(CONFIG_CMD_NAND)
-#ifdef C
F
G_NAND_LEGACY
+#ifdef C
ONFI
G_NAND_LEGACY
#include <linux/mtd/nand_legacy.h>
#include <linux/mtd/nand_legacy.h>
-#else /* !C
F
G_NAND_LEGACY */
+#else /* !C
ONFI
G_NAND_LEGACY */
#include <linux/mtd/nand.h>
#include <nand.h>
#include <linux/mtd/nand.h>
#include <nand.h>
-#endif /* !C
F
G_NAND_LEGACY */
+#endif /* !C
ONFI
G_NAND_LEGACY */
#endif
/* enable/disable debugging messages */
#define DEBUG_JFFS
#endif
/* enable/disable debugging messages */
#define DEBUG_JFFS
@@
-476,7
+476,7
@@
static int part_del(struct mtd_device *dev, struct part_info *part)
}
}
}
}
-#ifdef C
F
G_NAND_LEGACY
+#ifdef C
ONFI
G_NAND_LEGACY
jffs2_free_cache(part);
#endif
list_del(&part->link);
jffs2_free_cache(part);
#endif
list_del(&part->link);
@@
-505,7
+505,7
@@
static void part_delall(struct list_head *head)
list_for_each_safe(entry, n, head) {
part_tmp = list_entry(entry, struct part_info, link);
list_for_each_safe(entry, n, head) {
part_tmp = list_entry(entry, struct part_info, link);
-#ifdef C
F
G_NAND_LEGACY
+#ifdef C
ONFI
G_NAND_LEGACY
jffs2_free_cache(part_tmp);
#endif
list_del(entry);
jffs2_free_cache(part_tmp);
#endif
list_del(entry);
@@
-741,7
+741,7
@@
static int device_validate(u8 type, u8 num, u32 *size)
} else if (type == MTD_DEV_TYPE_NAND) {
#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
if (num < CFG_MAX_NAND_DEVICE) {
} else if (type == MTD_DEV_TYPE_NAND) {
#if defined(CONFIG_JFFS2_NAND) && defined(CONFIG_CMD_NAND)
if (num < CFG_MAX_NAND_DEVICE) {
-#ifndef C
F
G_NAND_LEGACY
+#ifndef C
ONFI
G_NAND_LEGACY
*size = nand_info[num].size;
#else
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
*size = nand_info[num].size;
#else
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];