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 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
include
/
configs
/
ZUMA.h
diff --git
a/include/configs/ZUMA.h
b/include/configs/ZUMA.h
index
08c4ced
..
b73aaa8
100644
(file)
--- a/
include/configs/ZUMA.h
+++ b/
include/configs/ZUMA.h
@@
-130,7
+130,7
@@
*
*/
/* No command line, one static partition, whole device */
*
*/
/* No command line, one static partition, whole device */
-#undef CONFIG_
JFFS2_CMDLINE
+#undef CONFIG_
CMD_MTDPARTS
#define CONFIG_JFFS2_DEV "nor0"
#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF
#define CONFIG_JFFS2_PART_OFFSET 0x00000000
#define CONFIG_JFFS2_DEV "nor0"
#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF
#define CONFIG_JFFS2_PART_OFFSET 0x00000000
@@
-138,7
+138,7
@@
/* mtdparts command line support */
/* Note: fake mtd_id used, no linux mtd map file */
/*
/* mtdparts command line support */
/* Note: fake mtd_id used, no linux mtd map file */
/*
-#define CONFIG_
JFFS2_CMDLINE
+#define CONFIG_
CMD_MTDPARTS
#define MTDIDS_DEFAULT "nor1=zuma-1,nor2=zuma-2"
#define MTDPARTS_DEFAULT "mtdparts=zuma-1:-(jffs2),zuma-2:-(user)"
*/
#define MTDIDS_DEFAULT "nor1=zuma-1,nor2=zuma-2"
#define MTDPARTS_DEFAULT "mtdparts=zuma-1:-(jffs2),zuma-2:-(user)"
*/