diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-30 09:57:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-30 09:57:52 -0500 |
| commit | 4d6647ab17ab9d33c60f7a9f07576c5fbdf6336f (patch) | |
| tree | e3bde11276fcf8ce1c02d797a71fa23d974c66f3 /arch/arm/imx-common | |
| parent | 6b29a395b62965eef6b5065d3a526a8588a92038 (diff) | |
| parent | 4db4d42ee290a8cad00b358b2e7ef6a00483893b (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common')
| -rw-r--r-- | arch/arm/imx-common/spl.c | 6 | ||||
| -rw-r--r-- | arch/arm/imx-common/video.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index bdcda7de93..325ba26340 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -14,6 +14,9 @@ #include <spl.h> #if defined(CONFIG_MX6) +#define MX6_MMC_PORT_MASK GENMASK(12, 11) +#define MX6_MMC_PORT_2 BIT(11) + /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */ u32 spl_boot_device(void) { @@ -55,10 +58,11 @@ u32 spl_boot_device(void) /* SD/eSD: 8.5.3, Table 8-15 */ case 0x4: case 0x5: - return BOOT_DEVICE_MMC1; /* MMC/eMMC: 8.5.3 */ case 0x6: case 0x7: + if ((reg & MX6_MMC_PORT_MASK) == MX6_MMC_PORT_2) + return BOOT_DEVICE_MMC2; return BOOT_DEVICE_MMC1; /* NAND Flash: 8.5.2 */ case 0x8 ... 0xf: diff --git a/arch/arm/imx-common/video.c b/arch/arm/imx-common/video.c index fdc987f469..549bf9d957 100644 --- a/arch/arm/imx-common/video.c +++ b/arch/arm/imx-common/video.c @@ -34,7 +34,7 @@ int board_video_skip(void) } if (i < display_count) { - ret = ipuv3_fb_init(&displays[i].mode, 0, + ret = ipuv3_fb_init(&displays[i].mode, displays[i].di ? 1 : 0, displays[i].pixfmt); if (!ret) { if (displays[i].enable) |