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-arm
[platform/kernel/u-boot.git]
/
include
/
configs
/
mx53evk.h
diff --git
a/include/configs/mx53evk.h
b/include/configs/mx53evk.h
index
5749a08
..
4703248
100644
(file)
--- a/
include/configs/mx53evk.h
+++ b/
include/configs/mx53evk.h
@@
-29,7
+29,7
@@
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
-#define CONFIG_
L2_OFF
+#define CONFIG_
MACH_TYPE MACH_TYPE_MX53_EVK
#include <asm/arch/imx-regs.h>
#include <asm/arch/imx-regs.h>
@@
-44,7
+44,7
@@
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
#define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
#define CONFIG_BOARD_EARLY_INIT_F
-#define BOARD_LATE_INIT
+#define
CONFIG_
BOARD_LATE_INIT
#define CONFIG_MXC_GPIO
#define CONFIG_MXC_UART
#define CONFIG_MXC_GPIO
#define CONFIG_MXC_UART
@@
-59,8
+59,9
@@
#define CONFIG_SYS_I2C_SLAVE 0xfe
/* PMIC Configs */
#define CONFIG_SYS_I2C_SLAVE 0xfe
/* PMIC Configs */
-#define CONFIG_FSL_PMIC
-#define CONFIG_FSL_PMIC_I2C
+#define CONFIG_PMIC
+#define CONFIG_PMIC_I2C
+#define CONFIG_PMIC_FSL
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 8
/* MMC Configs */
#define CONFIG_SYS_FSL_PMIC_I2C_ADDR 8
/* MMC Configs */
@@
-76,7
+77,6
@@
/* Eth Configs */
#define CONFIG_HAS_ETH1
/* Eth Configs */
#define CONFIG_HAS_ETH1
-#define CONFIG_NET_MULTI
#define CONFIG_MII
#define CONFIG_DISCOVER_PHY
#define CONFIG_MII
#define CONFIG_DISCOVER_PHY
@@
-192,7
+192,4
@@
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_ENV_IS_IN_MMC
#define CONFIG_SYS_MMC_ENV_DEV 0
-#define CONFIG_OF_LIBFDT
-#define CONFIG_SYS_BOOTMAPSZ 0x800000
-
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */