From patchwork Tue Oct 29 12:17:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 1186081 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 472Vx91BH9z9sPc for ; Tue, 29 Oct 2019 23:18:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id ADFABC21DA6; Tue, 29 Oct 2019 12:18:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3A831C21C27; Tue, 29 Oct 2019 12:18:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2526AC21C27; Tue, 29 Oct 2019 12:18:28 +0000 (UTC) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by lists.denx.de (Postfix) with ESMTPS id 12C79C21BE5 for ; Tue, 29 Oct 2019 12:18:27 +0000 (UTC) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 472Vwy6BcJz1qql5 for ; Tue, 29 Oct 2019 13:18:26 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 472Vwy65Y8z1qqkM for ; Tue, 29 Oct 2019 13:18:26 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id AT7vThEcsDX8 for ; Tue, 29 Oct 2019 13:18:26 +0100 (CET) X-Auth-Info: cPQ1ymemV0Y2jBs2mKh3BgJV4Ju4O8DaS+N+3cUsh+Q= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Tue, 29 Oct 2019 13:18:26 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id 9B6E8180754; Tue, 29 Oct 2019 13:18:22 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 569) id 835631A009F; Tue, 29 Oct 2019 13:18:22 +0100 (CET) From: Claudius Heine To: Date: Tue, 29 Oct 2019 13:17:55 +0100 Message-Id: <20191029121759.3582464-1-ch@denx.de> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Cc: open list , Andreas Geisreiter , Ludwig Zenz Subject: [U-Boot] [PATCH v2 1/3] ARM: imx6: DHCOM i.MX6 PDK: fix board_boot_modes emmc entry X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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. Signed-off-by: Claudius Heine --- board/dhelectronics/dh_imx6/dh_imx6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/dhelectronics/dh_imx6/dh_imx6.c b/board/dhelectronics/dh_imx6/dh_imx6.c index 2d0f78da11..8dc4b80872 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6.c +++ b/board/dhelectronics/dh_imx6/dh_imx6.c @@ -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 From patchwork Tue Oct 29 12:17:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 1186083 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 472Vxk169Rz9sPc for ; Tue, 29 Oct 2019 23:19:06 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B3C49C21DA1; Tue, 29 Oct 2019 12:18:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4BE00C21DAF; Tue, 29 Oct 2019 12:18:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 85310C21DAF; Tue, 29 Oct 2019 12:18:38 +0000 (UTC) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by lists.denx.de (Postfix) with ESMTPS id 0AED2C21C27 for ; Tue, 29 Oct 2019 12:18:36 +0000 (UTC) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 472Vx76FQrz1rHDH for ; Tue, 29 Oct 2019 13:18:35 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 472Vx768hpz1qqkM for ; Tue, 29 Oct 2019 13:18:35 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id gluxzobf0k5f for ; Tue, 29 Oct 2019 13:18:35 +0100 (CET) X-Auth-Info: fvYOOXa659UBqb2j3GMjObPFIgVHoeEli45dR9fJQPw= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Tue, 29 Oct 2019 13:18:35 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id 00078184EC5; Tue, 29 Oct 2019 13:18:24 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 569) id F18FF1A009F; Tue, 29 Oct 2019 13:18:24 +0100 (CET) From: Claudius Heine To: Date: Tue, 29 Oct 2019 13:17:56 +0100 Message-Id: <20191029121759.3582464-2-ch@denx.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191029121759.3582464-1-ch@denx.de> References: <20191029121759.3582464-1-ch@denx.de> MIME-Version: 1.0 Cc: open list , Andreas Geisreiter , Ludwig Zenz Subject: [U-Boot] [PATCH v2 2/3] ARM: imx6: DHCOM i.MX6 PDK: spl: Add eMMC initialization to SPL code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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). Signed-off-by: Claudius Heine --- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/board/dhelectronics/dh_imx6/dh_imx6_spl.c b/board/dhelectronics/dh_imx6/dh_imx6_spl.c index 1b7acc8df7..f2c3ac3e28 100644 --- a/board/dhelectronics/dh_imx6/dh_imx6_spl.c +++ b/board/dhelectronics/dh_imx6/dh_imx6_spl.c @@ -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)), From patchwork Tue Oct 29 12:17:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudius Heine X-Patchwork-Id: 1186084 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 472Vxp0ySfz9sPT for ; Tue, 29 Oct 2019 23:19:10 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D08EAC21D72; Tue, 29 Oct 2019 12:18:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A903EC21D9A; Tue, 29 Oct 2019 12:18:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B8B7AC21D83; Tue, 29 Oct 2019 12:18:45 +0000 (UTC) Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by lists.denx.de (Postfix) with ESMTPS id 8863EC21E0F for ; Tue, 29 Oct 2019 12:18:45 +0000 (UTC) Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 472VxK2pLnz1rHF6 for ; Tue, 29 Oct 2019 13:18:45 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 472VxK2jCcz1qqkM for ; Tue, 29 Oct 2019 13:18:45 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id lYD9mc6_vTMU for ; Tue, 29 Oct 2019 13:18:43 +0100 (CET) X-Auth-Info: EgkZ4RmiKTjm6UCQwWPgghzM6IUf4DFUMPtiw5gOA+g= Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA for ; Tue, 29 Oct 2019 13:18:43 +0100 (CET) Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTP id 0251618095E; Tue, 29 Oct 2019 13:18:26 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 569) id F402C1A009F; Tue, 29 Oct 2019 13:18:25 +0100 (CET) From: Claudius Heine To: Date: Tue, 29 Oct 2019 13:17:57 +0100 Message-Id: <20191029121759.3582464-3-ch@denx.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191029121759.3582464-1-ch@denx.de> References: <20191029121759.3582464-1-ch@denx.de> MIME-Version: 1.0 Cc: open list , Andreas Geisreiter , Ludwig Zenz Subject: [U-Boot] [PATCH v2 3/3] ARM: imx6: DHCOM i.MX6 PDK: defconfig: Enable MMC support of SPL X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Claudius Heine --- configs/dh_imx6_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index f459af07f8..43f7cd47ee 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -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