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-spi
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx51_efikamx.h
diff --git
a/include/configs/mx51_efikamx.h
b/include/configs/mx51_efikamx.h
index
439b5f3
..
a74a0a7
100644
(file)
--- a/
include/configs/mx51_efikamx.h
+++ b/
include/configs/mx51_efikamx.h
@@
-37,8
+37,6
@@
#include <asm/arch/imx-regs.h>
#include <asm/arch/imx-regs.h>
-#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
@@
-129,9
+127,9
@@
#endif
/* SPI PMIC */
#endif
/* SPI PMIC */
-#define CONFIG_P
MIC
-#define CONFIG_P
MIC
_SPI
-#define CONFIG_P
MIC
_FSL
+#define CONFIG_P
OWER
+#define CONFIG_P
OWER
_SPI
+#define CONFIG_P
OWER
_FSL
#define CONFIG_FSL_PMIC_BUS 0
#define CONFIG_FSL_PMIC_CS (0 | 120 << 8)
#define CONFIG_FSL_PMIC_CLK 25000000
#define CONFIG_FSL_PMIC_BUS 0
#define CONFIG_FSL_PMIC_CS (0 | 120 << 8)
#define CONFIG_FSL_PMIC_CLK 25000000
@@
-263,5
+261,6
@@
#define CONFIG_SYS_DDR_CLKSEL 0
#define CONFIG_SYS_CLKTL_CBCDR 0x59E35145
#define CONFIG_SYS_DDR_CLKSEL 0
#define CONFIG_SYS_CLKTL_CBCDR 0x59E35145
+#define CONFIG_SYS_MAIN_PWR_ON
#endif
#endif