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 remote-tracking branch 'u-boot/master' into u-boot-arm-merged
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx53loco.h
diff --git
a/include/configs/mx53loco.h
b/include/configs/mx53loco.h
index
0658dd3
..
ef8dc0d
100644
(file)
--- a/
include/configs/mx53loco.h
+++ b/
include/configs/mx53loco.h
@@
-89,10
+89,10
@@
#define CONFIG_SYS_I2C_SPEED 100000
/* PMIC Controller */
#define CONFIG_SYS_I2C_SPEED 100000
/* PMIC Controller */
-#define CONFIG_P
MIC
-#define CONFIG_P
MIC
_I2C
-#define CONFIG_DIALOG_P
MIC
-#define CONFIG_P
MIC
_FSL
+#define CONFIG_P
OWER
+#define CONFIG_P
OWER
_I2C
+#define CONFIG_DIALOG_P
OWER
+#define CONFIG_P
OWER
_FSL
#define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR 0x48
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x8
#define CONFIG_SYS_DIALOG_PMIC_I2C_ADDR 0x48
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x8
@@
-103,10
+103,11
@@
/* Command definition */
#include <config_cmd_default.h>
/* Command definition */
#include <config_cmd_default.h>
+#define CONFIG_CMD_BOOTZ
#undef CONFIG_CMD_IMLS
#undef CONFIG_CMD_IMLS
-#define CONFIG_BOOTDELAY
3
+#define CONFIG_BOOTDELAY
1
#define CONFIG_ETHPRIME "FEC0"
#define CONFIG_ETHPRIME "FEC0"
@@
-139,7
+140,7
@@
"dhcp ${uimage}; bootm\0" \
#define CONFIG_BOOTCOMMAND \
"dhcp ${uimage}; bootm\0" \
#define CONFIG_BOOTCOMMAND \
- "
if mmc rescan ${mmcdev}
; then " \
+ "
mmc dev ${mmcdev}; if mmc rescan
; then " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \