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/master
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx1fs2.h
diff --git
a/include/configs/mx1fs2.h
b/include/configs/mx1fs2.h
index
431e669
..
90a8d84
100644
(file)
--- a/
include/configs/mx1fs2.h
+++ b/
include/configs/mx1fs2.h
@@
-51,12
+51,12
@@
#define CONFIG_CMD_JFFS2
#define CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_LOADS
#undef CONFIG_CMD_CONSOLE
#undef CONFIG_CMD_CONSOLE
-#undef CONFIG_CMD_AUTOSCRIPT
+#undef CONFIG_CMD_DHCP
+#undef CONFIG_CMD_LOADS
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_PING
#undef CONFIG_CMD_NET
#undef CONFIG_CMD_PING
-#undef CONFIG_CMD_
DHCP
+#undef CONFIG_CMD_
SOURCE
/*
/*
@@
-183,6
+183,8
@@
/* mtdparts command line support */
/* Note: fake mtd_id used, no linux mtd map file */
#define CONFIG_CMD_MTDPARTS
/* mtdparts command line support */
/* Note: fake mtd_id used, no linux mtd map file */
#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
#define MTDIDS_DEFAULT "nor0=mx1fs2-0"
#ifdef BUS32BIT_VERSION
#define MTDIDS_DEFAULT "nor0=mx1fs2-0"
#ifdef BUS32BIT_VERSION