projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I2C: mxc_i2c: make I2C1 and I2C2 optional
[oweals/u-boot.git]
/
include
/
configs
/
m53evk.h
diff --git
a/include/configs/m53evk.h
b/include/configs/m53evk.h
index ad9c39c16cabbfb508a2a7ded6c3c91f4dc2a0c4..8853d8fcc06ec293893ed27225d938023c2686e6 100644
(file)
--- a/
include/configs/m53evk.h
+++ b/
include/configs/m53evk.h
@@
-26,7
+26,6
@@
/*
* U-Boot Commands
*/
/*
* U-Boot Commands
*/
-#include <config_cmd_default.h>
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DOS_PARTITION
#define CONFIG_FAT_WRITE
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DOS_PARTITION
#define CONFIG_FAT_WRITE
@@
-38,19
+37,17
@@
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT
#define CONFIG_CMD_EXT4
#define CONFIG_CMD_EXT4_WRITE
#define CONFIG_CMD_FAT
+#define CONFIG_CMD_FS_GENERIC
#define CONFIG_CMD_GREPENV
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NAND
#define CONFIG_CMD_GREPENV
#define CONFIG_CMD_I2C
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_NET
#define CONFIG_CMD_PING
#define CONFIG_CMD_SATA
#define CONFIG_CMD_PING
#define CONFIG_CMD_SATA
-#define CONFIG_CMD_SETEXPR
#define CONFIG_CMD_USB
#define CONFIG_VIDEO
#define CONFIG_CMD_USB
#define CONFIG_VIDEO
-#define CONFIG_REGEX /* Enable regular expression support */
/*
* Memory configurations
/*
* Memory configurations
@@
-175,6
+172,9
@@
#ifdef CONFIG_CMD_I2C
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MXC
#ifdef CONFIG_CMD_I2C
#define CONFIG_SYS_I2C
#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
+#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
+#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
#define CONFIG_SYS_RTC_BUS_NUM 1 /* I2C2 */
#endif
#define CONFIG_SYS_RTC_BUS_NUM 1 /* I2C2 */
#endif
@@
-305,7
+305,7
@@
"addargs=run addcons addmtd addmisc\0" \
"mmcload=" \
"mmc rescan ; " \
"addargs=run addcons addmtd addmisc\0" \
"mmcload=" \
"mmc rescan ; " \
- "
ext4load mmc 0:1 ${kernel_addr_r} ${bootfile}\0"
\
+ "
load mmc 0:1 ${kernel_addr_r} ${bootfile}\0"
\
"ubiload=" \
"ubi part UBI ; ubifsmount ubi0:rootfs ; " \
"ubifsload ${kernel_addr_r} /boot/${bootfile}\0" \
"ubiload=" \
"ubi part UBI ; ubifsmount ubi0:rootfs ; " \
"ubifsload ${kernel_addr_r} /boot/${bootfile}\0" \
@@
-349,10
+349,10
@@
"try_bootscript=" \
"mmc rescan;" \
"if test -e mmc 0:1 ${bootscript} ; then " \
"try_bootscript=" \
"mmc rescan;" \
"if test -e mmc 0:1 ${bootscript} ; then " \
- "if
ext4load mmc 0:1 ${kernel_addr_r} ${bootscript};"
\
- "then
;"
\
- "
\techo Running bootscript...;
" \
- "
\tsource ${kernel_addr_r};
" \
+ "if
load mmc 0:1 ${kernel_addr_r} ${bootscript};"
\
+ "then
; "
\
+ "
echo Running bootscript... ;
" \
+ "
source ${kernel_addr_r} ;
" \
"fi ; " \
"fi\0"
"fi ; " \
"fi\0"