Skip to contentSkip to conversation

ARM: imx6: DHCOM i.MX6 PDK: fix board_boot_modes emmc entry

PATCH New Claudius Heine 2 participants 6 messages Oct 29, 2019 – Nov 4, 2019 Arm i.MX and Layerscape

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 ARM: imx6: DHCOM i.MX6 PDK: fix board_boot_modes emmc entry

The board_boot_modes contained the wrong values for the emmc entry.

The eMMC here is connected over a 8-bit bus.

This change allows to use the 'bmode emmc' command to boot from emmc.

---
 board/dhelectronics/dh_imx6/dh_imx6.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/dhelectronics/dh_imx6/dh_imx6.c +1 -1
index 2d0f78da11..8dc4b80872 100644
@@ -197,7 +197,7 @@ static const struct boot_mode board_boot_modes[] = {
 	{"sd2",	 MAKE_CFGVAL(0x40, 0x28, 0x00, 0x00)},
 	{"sd3",	 MAKE_CFGVAL(0x40, 0x30, 0x00, 0x00)},
 	/* 8 bit bus width */
-	{"emmc", MAKE_CFGVAL(0x40, 0x38, 0x00, 0x00)},
+	{"emmc", MAKE_CFGVAL(0x60, 0x58, 0x00, 0x00)},
 	{NULL,	 0},
 };
 #endif
Signature · 1 line
2.21.0
#1 lore raw

PATCH v2 2/3 ARM: imx6: DHCOM i.MX6 PDK: spl: Add eMMC initialization to SPL code

In order for 'bmode emmc' to work, the eMMC needs to be initialized in the SPL. This change initializes the eMMC as BOOT_DEVICE_MMC1 (index=0).

---
 board/dhelectronics/dh_imx6/dh_imx6_spl.c | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)
board/dhelectronics/dh_imx6/dh_imx6_spl.c +26 -0
index 1b7acc8df7..f2c3ac3e28 100644
@@ -476,6 +476,32 @@ static void setup_iomux_uart(void)
 	SETUP_IOMUX_PADS(uart1_pads);
 }
 
+#ifdef CONFIG_FSL_USDHC
+struct fsl_esdhc_cfg usdhc_cfg[1] = {
+	{USDHC4_BASE_ADDR},
+};
+
+int board_mmc_get_env_dev(int devno)
+{
+	return devno - 1;
+}
+
+int board_mmc_getcd(struct mmc *mmc)
+{
+	return 1; /* eMMC/uSDHC4 is always present */
+}
+
+int board_mmc_init(bd_t *bis)
+{
+	SETUP_IOMUX_PADS(usdhc4_pads);
+	usdhc_cfg[0].esdhc_base = USDHC4_BASE_ADDR;
+	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK);
+	usdhc_cfg[0].max_bus_width = 8;
+
+	return fsl_esdhc_initialize(bis, &usdhc_cfg[0]);
+}
+#endif
+
 /* USB */
 static iomux_v3_cfg_t const usb_pads[] = {
 	IOMUX_PADS(PAD_GPIO_1__USB_OTG_ID	| MUX_PAD_CTRL(NO_PAD_CTRL)),
Signature · 1 line
2.21.0
#2 lore raw

PATCH v2 2/3 ARM: imx6: DHCOM i.MX6 PDK: spl: Add eMMC initialization to SPL code

Quoted 3 lines

In order for 'bmode emmc' to work, the eMMC needs to be initialized in the SPL. This change initializes the eMMC as BOOT_DEVICE_MMC1 (index=0).

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#3 lore raw

PATCH v2 3/3 ARM: imx6: DHCOM i.MX6 PDK: defconfig: Enable MMC support of SPL

In reply to Claudius Heine
---
 configs/dh_imx6_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/dh_imx6_defconfig +1 -0
index f459af07f8..43f7cd47ee 100644
@@ -6,6 +6,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_MX6_DDRCAL=y
 CONFIG_TARGET_DHCOMIMX6=y
+CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_SPL=y
Signature · 1 line
2.21.0
#4 lore raw

PATCH v2 3/3 ARM: imx6: DHCOM i.MX6 PDK: defconfig: Enable MMC support of SPL

Quoted 1 line

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================
#5 lore raw

PATCH v2 1/3 ARM: imx6: DHCOM i.MX6 PDK: fix board_boot_modes emmc entry

In reply to Claudius Heine
Quoted 4 lines

The board_boot_modes contained the wrong values for the emmc entry. The eMMC here is connected over a 8-bit bus.
This change allows to use the 'bmode emmc' command to boot from emmc.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================