summaryrefslogtreecommitdiff
path: root/include/configs/mx6sx_17x17_arm2.h
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2017-03-13 15:32:28 +0800
committerYe Li <ye.li@nxp.com>2017-04-05 14:06:42 +0800
commit7b973f17b704568586614dc3503be4f6c2315eaa (patch)
tree7a4f31280f14d0429dcd51ac89830d83bf485190 /include/configs/mx6sx_17x17_arm2.h
parent9496b976d6fff85fadcc918f30339c887130fdb8 (diff)
downloadu-boot-imx-7b973f17b704568586614dc3503be4f6c2315eaa.zip
u-boot-imx-7b973f17b704568586614dc3503be4f6c2315eaa.tar.gz
u-boot-imx-7b973f17b704568586614dc3503be4f6c2315eaa.tar.bz2
MLK-14391-3 mx6sxarm2: Convert to enable OF_CONTROL and DM drivers
Update mx6sx 14x14/17x17/19x19 lpddr2/ddr3 arm2 board codes and build configurations to enable OF_CONTROL and DM drivers. 1. Update GPIO codes for adding gpio request 2. Enable USB DM driver 3. Update PMIC code for using DM PMIC 4. Add spinor/qspi/nand/eimnor boot support. 5. Add defconfig for using plugin. 6. Enable Ethernet DM driver 7. Update for using QSPI DM driver Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include/configs/mx6sx_17x17_arm2.h')
-rw-r--r--include/configs/mx6sx_17x17_arm2.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/include/configs/mx6sx_17x17_arm2.h b/include/configs/mx6sx_17x17_arm2.h
index e99b5df..f2a9b27 100644
--- a/include/configs/mx6sx_17x17_arm2.h
+++ b/include/configs/mx6sx_17x17_arm2.h
@@ -11,13 +11,7 @@
#include "mx6sx_arm2.h"
-#ifdef CONFIG_TARGET_MX6SX_14X14_ARM2
-#define CONFIG_DEFAULT_FDT_FILE "imx6sx-14x14-arm2.dtb"
-#else
-#define CONFIG_DEFAULT_FDT_FILE "imx6sx-17x17-arm2.dtb"
-#endif
-
-#ifdef CONFIG_SYS_USE_SPINOR /* Pin conflict between SPI-NOR and SD2 */
+#ifdef CONFIG_MXC_SPI /* Pin conflict between SPI-NOR and SD2 */
#define CONFIG_SYS_FSL_USDHC_NUM 2
#define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC3 */
#define CONFIG_SYS_MMC_ENV_PART 0 /* user area */
@@ -29,7 +23,7 @@
#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USDHC3 */
#endif
-#ifdef CONFIG_SYS_USE_EIMNOR
+#ifdef CONFIG_MXC_SPI
#undef CONFIG_SYS_FLASH_SECT_SIZE
#undef CONFIG_SYS_MAX_FLASH_SECT
#define CONFIG_SYS_FLASH_SECT_SIZE (256 * 1024)