diff options
| author | Peng Fan <peng.fan@nxp.com> | 2016-02-24 19:58:49 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:40 +0800 |
| commit | c5d9b7e09119bdabf3defc53a45a7945d0f42f5b (patch) | |
| tree | 60e71628eaa1c1bb553e00857c2bac52d55885e5 /include | |
| parent | 4f2569a18084b2fc58a0fe11fec3535a9156323f (diff) | |
| download | u-boot-imx-c5d9b7e09119bdabf3defc53a45a7945d0f42f5b.zip u-boot-imx-c5d9b7e09119bdabf3defc53a45a7945d0f42f5b.tar.gz u-boot-imx-c5d9b7e09119bdabf3defc53a45a7945d0f42f5b.tar.bz2 | |
MLK-12436-12: mx6slevk: update board code
Add elan code, to handle epdc which has i2c devices.
In imx_v2015.04, the two pathces are for elan.
b6ba68516b681a38025252bd0ef6a6ed3e8adfa0
MLK-10215 Add elan init in i.MX6SL-EVK board
0c600f6a67f00fe0c674c08c355bea3789109679
MLK-10885 imx: mx6slevk ignore elan init when no epdc on board
Signed-off-by: Peng Fan <peng.fan@nxp.com>
(cherry picked from commit cb249aa1d57788c52145d28f2e2c68cb320d8ae3)
Signed-off-by: Ye Li <ye.li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6slevk.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index d9ae9a4..2a7102d 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -25,6 +25,9 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR +#define CONFIG_SYS_FSL_USDHC_NUM 3 +#define CONFIG_SYS_MMC_ENV_DEV 1 /* SDHC2*/ +#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ /* I2C Configs */ #define CONFIG_SYS_I2C @@ -44,6 +47,7 @@ #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR #define CONFIG_FEC_XCV_TYPE RMII +#define CONFIG_ETHPRIME "FEC" #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_PHYLIB @@ -73,9 +77,9 @@ "fdt_addr=0x83000000\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" \ @@ -159,6 +163,9 @@ /* Environment organization */ #define CONFIG_ENV_SIZE SZ_8K +#define CONFIG_SYS_MMC_ENV_DEV 1 /* USDHC2 */ +#define CONFIG_SYS_MMC_ENV_PART 0 /* user partition */ +#define CONFIG_MMCROOT "/dev/mmcblk1p2" /* USDHC2 */ #if defined CONFIG_SYS_BOOT_SPINOR #define CONFIG_ENV_IS_IN_SPI_FLASH @@ -173,6 +180,10 @@ #define CONFIG_ENV_IS_IN_MMC #endif +#ifndef CONFIG_SYS_DCACHE_OFF +#define CONFIG_CMD_CACHE +#endif + #ifdef CONFIG_CMD_SF #define CONFIG_MXC_SPI #define CONFIG_SF_DEFAULT_BUS 0 |