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 git://git.denx.de/u-boot-video
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx53evk.h
diff --git
a/include/configs/mx53evk.h
b/include/configs/mx53evk.h
index
b46855f
..
1916b85
100644
(file)
--- a/
include/configs/mx53evk.h
+++ b/
include/configs/mx53evk.h
@@
-24,8
+24,6
@@
#define CONFIG_MX53
#define CONFIG_MX53
-#define CONFIG_SYS_MX5_HCLK 24000000
-#define CONFIG_SYS_MX5_CLK32 32768
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
@@
-57,9
+55,9
@@
#define CONFIG_SYS_I2C_SPEED 100000
/* PMIC Configs */
#define CONFIG_SYS_I2C_SPEED 100000
/* PMIC Configs */
-#define CONFIG_P
MIC
-#define CONFIG_P
MIC
_I2C
-#define CONFIG_P
MIC
_FSL
+#define CONFIG_P
OWER
+#define CONFIG_P
OWER
_I2C
+#define CONFIG_P
OWER
_FSL
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 8
#define CONFIG_RTC_MC13XXX
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 8
#define CONFIG_RTC_MC13XXX
@@
-75,7
+73,6
@@
#define CONFIG_DOS_PARTITION
/* Eth Configs */
#define CONFIG_DOS_PARTITION
/* Eth Configs */
-#define CONFIG_HAS_ETH1
#define CONFIG_MII
#define CONFIG_FEC_MXC
#define CONFIG_MII
#define CONFIG_FEC_MXC
@@
-134,7
+131,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 " \