summaryrefslogtreecommitdiff
path: root/include/configs
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2018-06-01 00:22:46 -0700
committerYe Li <ye.li@nxp.com>2020-05-05 10:04:45 -0700
commit5becf2c64b445dced60137a9b8a4edc6c99e1738 (patch)
tree46f524363425c257e9c536179523862ba6d318e9 /include/configs
parent528d50cf58f48c411565781fb74a747063f0b4b7 (diff)
MLK-18476-2 mx6qdl_arm2: Add MX6Q and DL ARM2 support
Porting the iMX6Q DDR3/LPDDR2 ARM2, iMX6DL DDR3/LPDDR2 ARM2 and iMX6Q POP LPDDR2 ARM2 board codes from v2019.04. Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 8ce8ab2f9b875fe43489d7624a296f036e43e585) (cherry picked from commit 34d29f3cdbf5e9f30ff9593295af4c85d3833ee3) (cherry picked from commit 6f8ff60c04d8c5ab1e017db45ef6909f2d31447f)
Diffstat (limited to 'include/configs')
-rw-r--r--include/configs/mx6qarm2.h20
1 files changed, 16 insertions, 4 deletions
diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 7e6917b967..22c7ffbc48 100644
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -10,6 +10,8 @@
#include "mx6_common.h"
+#define CONFIG_IMX_THERMAL
+
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
@@ -25,19 +27,23 @@
#define CONFIG_FEC_XCV_TYPE RGMII
#define CONFIG_FEC_MXC_PHYADDR 0
+#define CONFIG_PHYLIB
+#define CONFIG_PHY_ATHEROS
+
#define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
"console=ttymxc3\0" \
- "fdt_file=imx6q-arm2.dtb\0" \
+ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr=0x18000000\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
- "mmcdev=1\0" \
+ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=1\0" \
- "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+ "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
+ "mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadbootscript=" \
@@ -106,6 +112,10 @@
#define CONFIG_SYS_MEMTEST_END 0x10010000
/* Physical Memory Map */
+#if defined(CONFIG_MX6DQ_POP_LPDDR2)
+#define PHYS_SDRAM_0 MMDC0_ARB_BASE_ADDR
+#define PHYS_SDRAM_1 MMDC1_ARB_BASE_ADDR
+#endif
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
@@ -118,7 +128,9 @@
(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
/* Environment organization */
-#define CONFIG_SYS_MMC_ENV_DEV 1
+#define CONFIG_SYS_MMC_ENV_DEV 3
+#define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */
+#define CONFIG_MMCROOT "/dev/mmcblk3p2" /* SDHC4 */
/* USB Configs */
#ifdef CONFIG_CMD_USB