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 ../next
[platform/kernel/u-boot.git]
/
include
/
configs
/
at91sam9261ek.h
diff --git
a/include/configs/at91sam9261ek.h
b/include/configs/at91sam9261ek.h
index
3d108ab
..
fbf7389
100644
(file)
--- a/
include/configs/at91sam9261ek.h
+++ b/
include/configs/at91sam9261ek.h
@@
-133,7
+133,6
@@
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC15
#define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PC14
#define CONFIG_SYS_NAND_READY_PIN AT91_PIN_PC15
-#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
#endif
/* NOR flash - no real flash on this board */
#endif
/* NOR flash - no real flash on this board */
@@
-181,7
+180,7
@@
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
- "mtdparts=at
91_nand:-(root) "
\
+ "mtdparts=at
mel_nand:-(root) "
\
"rw rootfstype=jffs2"
#elif CONFIG_SYS_USE_DATAFLASH_CS3
"rw rootfstype=jffs2"
#elif CONFIG_SYS_USE_DATAFLASH_CS3
@@
-195,7
+194,7
@@
#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock0 " \
- "mtdparts=at
91_nand:-(root) "
\
+ "mtdparts=at
mel_nand:-(root) "
\
"rw rootfstype=jffs2"
#else /* CONFIG_SYS_USE_NANDFLASH */
"rw rootfstype=jffs2"
#else /* CONFIG_SYS_USE_NANDFLASH */
@@
-208,7
+207,7
@@
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0xA0000 0x200000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
"root=/dev/mtdblock5 " \
- "mtdparts=at
91_nand:128k(bootstrap)ro,"
\
+ "mtdparts=at
mel_nand:128k(bootstrap)ro,"
\
"256k(uboot)ro,128k(env1)ro," \
"128k(env2)ro,2M(linux),-(root) " \
"rw rootfstype=jffs2"
"256k(uboot)ro,128k(env1)ro," \
"128k(env2)ro,2M(linux),-(root) " \
"rw rootfstype=jffs2"