From patchwork Mon Nov 20 18:32:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839665 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="axTFDbFe"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygcnq2HF0z9s7c for ; Tue, 21 Nov 2017 05:34:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 64073C220D1; Mon, 20 Nov 2017 18:32:53 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 5B3ECC220FD; Mon, 20 Nov 2017 18:32:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 945C6C220B4; Mon, 20 Nov 2017 18:32:35 +0000 (UTC) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by lists.denx.de (Postfix) with ESMTPS id 57876C22007 for ; Mon, 20 Nov 2017 18:32:31 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id s11so8038059pgc.5 for ; Mon, 20 Nov 2017 10:32:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CgtfPoaJ7Es1rn93pQtOvh2sA9oFbsuO5r3NrBhcEEE=; b=axTFDbFeKOzF9LrDzqIi2yBzOd+8aUABc0NNC0PC4gCT939/YdmR4bh9wOhDLVh2ic oUlz6C7RTk7i4TVNAZ8a/ZmtsvewIeMciiSlXCIacdx4ZxeJPRd7ivdA0vhnDV7TPNzS LTmdz/PCBpdzPM1lldKmFdw/EJezLsN4oQwqWYMNmEyQNycxJ6Jd9n9IaiCrw9QAM0Jg 6Yh7wLY8Az22YMdWVNG2bp50SaQDU6yPhzTFS3DojPOiHVG5Z/pPSsiDEBB4tdzQBMrE dRtl9VdZ1nakUk8UA5H/krFyhzvE/cImQ3aBQCbRKPSbubHy5sM5DShypylMdzm62I8P 9yGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=CgtfPoaJ7Es1rn93pQtOvh2sA9oFbsuO5r3NrBhcEEE=; b=bAXfC0QB18E3z4iRWECVqWkqyIBAFV48tTS/TNW67Yl3PN0x+gkcgx87F8f73Va4Pt YtkT5YrcHmkPOBiAcLgmu2HZvobCoqQY70uVTunZdI1+qFrnF8/EEPnPx8QvyZ6X9faN IstTdrDgnNJFpXBpigfVa2c6iHauVMIYpQnIuCKJOzJxviL8LpCQw7D31U6Ey2SBAPc+ nzlEfF5nHGccVuYLtQvktE4vDKp+GG1enBiU7KHPfP1Wa6F82ZQjhMwwuey+trRCi2yo w3IsJd6ULwlPNRWOJ68WaXro/NzoBTctTTrlmqwlkLAJeoR017QF4J8kqiNdX2UMavHU 2hIA== X-Gm-Message-State: AJaThX799nwLS3FmXOhkByzLy8aFwvy7h9Qm8iOO8Pl9O7CdnwdgrcwN m8JnJlIpPJUWqSeOSN508FI= X-Google-Smtp-Source: AGs4zMb2eNJpvVhWWNSm8/TNhzXtd+VBClghOZyuhV6X/ZHSyDo8uEmdKRhxp8EpaoH+wgARQBdZ2A== X-Received: by 10.159.255.70 with SMTP id u6mr14540255pls.351.1511202749806; Mon, 20 Nov 2017 10:32:29 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:28 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:10 +0530 Message-Id: <1511202738-17448-2-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 1/9] i.MX6: engicam: Move set_fdt_file to common 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" setenv_fdt_file to common code and set dtb based on CONFIG_DEFAULT_DEVICE_TREE and cpu_type. Signed-off-by: Jagan Teki --- board/engicam/common/board.c | 24 ++++++++++++++++++++++++ board/engicam/common/board.h | 1 - board/engicam/geam6ul/geam6ul.c | 6 ------ board/engicam/icorem6/icorem6.c | 8 -------- board/engicam/icorem6_rqs/icorem6_rqs.c | 8 -------- board/engicam/isiotmx6ul/isiotmx6ul.c | 11 ----------- 6 files changed, 24 insertions(+), 34 deletions(-) diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index c7ec55f..f86fb2b 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -32,6 +32,30 @@ static void mmc_late_init(void) } #endif +static void setenv_fdt_file(void) +{ + const char *cmp_dtb = CONFIG_DEFAULT_DEVICE_TREE; + + if (!strcmp(cmp_dtb, "imx6q-icore")) { + if (is_mx6dq()) + env_set("fdt_file", "imx6q-icore.dtb"); + else if(is_mx6dl() || is_mx6solo()) + env_set("fdt_file", "imx6dl-icore.dtb"); + } else if (!strcmp(cmp_dtb, "imx6q-icore-rqs")) { + if (is_mx6dq()) + env_set("fdt_file", "imx6q-icore-rqs.dtb"); + else if(is_mx6dl() || is_mx6solo()) + env_set("fdt_file", "imx6dl-icore-rqs.dtb"); + } else if (!strcmp(cmp_dtb, "imx6ul-geam-kit")) + env_set("fdt_file", "imx6ul-geam-kit.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-mmc")) + env_set("fdt_file", "imx6ul-isiot-mmc.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-emmc")) + env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); + else if (!strcmp(cmp_dtb, "imx6ul-isiot-nand")) + env_set("fdt_file", "imx6ul-isiot-nand.dtb"); +} + int board_late_init(void) { switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >> diff --git a/board/engicam/common/board.h b/board/engicam/common/board.h index f364a23..c720b0b 100644 --- a/board/engicam/common/board.h +++ b/board/engicam/common/board.h @@ -6,7 +6,6 @@ #ifndef _BOARD_H_ #define _BOARD_H_ -void setenv_fdt_file(void); void setup_gpmi_nand(void); void setup_display(void); #endif /* _BOARD_H_ */ diff --git a/board/engicam/geam6ul/geam6ul.c b/board/engicam/geam6ul/geam6ul.c index ffd383a..15bd8b2 100644 --- a/board/engicam/geam6ul/geam6ul.c +++ b/board/engicam/geam6ul/geam6ul.c @@ -90,12 +90,6 @@ void setup_gpmi_nand(void) } #endif /* CONFIG_NAND_MXS */ -void setenv_fdt_file(void) -{ - if (is_mx6ul()) - env_set("fdt_file", "imx6ul-geam-kit.dtb"); -} - #ifdef CONFIG_SPL_BUILD /* MMC board initialization is needed till adding DM support in SPL */ #if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index 3d4f713..59c085b 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -192,14 +192,6 @@ void setup_display(void) } #endif /* CONFIG_VIDEO_IPUV3 */ -void setenv_fdt_file(void) -{ - if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore.dtb"); - else if(is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore.dtb"); -} - #ifdef CONFIG_SPL_BUILD /* MMC board initialization is needed till adding DM support in SPL */ #if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index 0114889..8afc9be 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -31,14 +31,6 @@ int board_mmc_get_env_dev(int devno) } #endif -void setenv_fdt_file(void) -{ - if (is_mx6dq()) - env_set("fdt_file", "imx6q-icore-rqs.dtb"); - else if(is_mx6dl() || is_mx6solo()) - env_set("fdt_file", "imx6dl-icore-rqs.dtb"); -} - #ifdef CONFIG_SPL_BUILD #include diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c b/board/engicam/isiotmx6ul/isiotmx6ul.c index fbf1724..9afa8e4 100644 --- a/board/engicam/isiotmx6ul/isiotmx6ul.c +++ b/board/engicam/isiotmx6ul/isiotmx6ul.c @@ -98,17 +98,6 @@ int board_mmc_get_env_dev(int devno) } #endif -void setenv_fdt_file(void) -{ - if (is_mx6ul()) { -#ifdef CONFIG_ENV_IS_IN_MMC - env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); -#else - env_set("fdt_file", "imx6ul-isiot-nand.dtb"); -#endif - } -} - #ifdef CONFIG_SPL_BUILD #include From patchwork Mon Nov 20 18:32:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839678 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NZ+eXWrx"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygctX1gjhz9rxj for ; Tue, 21 Nov 2017 05:38:44 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B2FF1C22063; Mon, 20 Nov 2017 18:34:28 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 A3CCFC220FE; Mon, 20 Nov 2017 18:33:14 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DF586C220F2; Mon, 20 Nov 2017 18:32:39 +0000 (UTC) Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by lists.denx.de (Postfix) with ESMTPS id 1DBEFC22014 for ; Mon, 20 Nov 2017 18:32:35 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id q4so7865533pfg.13 for ; Mon, 20 Nov 2017 10:32:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U9ELYSiTHGUihHALDYEGD5AoFUJxHScnW60wAR3YIac=; b=NZ+eXWrx1ojtUWqhgAQJtDV6vBzVscNYwJRab1NmFPI2Ltw7HWu8+jzDofPbVqW/IN J8LQ91yRMOTBl8JSgAoiKrZCQDH5qqy+wu1jNeSCvb5aW2XnZbujFmXeGA6JcE5NvBcT 5RtfSudlhZo8aSLujvSgjNu+wEbZ4+qCL58qix3w9DzgvBW+QdH0VJ2HSarEF3AzaPob 4PwOtwIeyiy2nr1089+UP76CGvmvIdXMRvBYTM4KcwjkrylpPuEZpIp+TyRREXWqfM0c qruTVBSlMCcHznxHRSUipG8hJSbP1jjAmviJbkdPEuiGDchJyZcAWFYW2F/Q7A5og2s5 gfzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U9ELYSiTHGUihHALDYEGD5AoFUJxHScnW60wAR3YIac=; b=FAKzY/wep80StXEgOVt2uqd/oa31bn5OC+cCPZDcIZvdh5qvhQzM46INjPnRuvSSZz aRYhn4ElvNwsWv8DMlwR0nWm3o+RuExD6sNxss8PGln+qJkmbM99CeaC+5rAm1S8YqUP IDzG7jDq961eIialSBdUd4T/LaI6YP+x8bt9lKNtsqJjeBm3uVlI2b1IoAPF5oJPpHcn SUqwEuAO9PYNB4pZ2yifU9nnICkXEKKZxAwMsuLRJcmuBhez6nkTsF1gloZ4vNEPirZG yRGZs1/EqFeioyxaPuDHFX0AjksRvcamMiv71oQyVpGy6r/NWUPF1hCXS9k9q1B3H4XJ wrUQ== X-Gm-Message-State: AJaThX7u/n1aU+Kd8GO29WimY5C1Id8mASEN94so8IWAOhoVje8vqUJQ JXTenb3SbUefvLOc5iGVYlE= X-Google-Smtp-Source: AGs4zMaQod82eoOJ/zzCnr65gT/XDTZ6pZYiq7WW78YeeK87PMwspUigKJRzPLFDjuNhgL/6gsSm7Q== X-Received: by 10.159.218.72 with SMTP id x8mr14978185plv.257.1511202753634; Mon, 20 Nov 2017 10:32:33 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:32 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:11 +0530 Message-Id: <1511202738-17448-3-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 2/9] i.MX6Q: icorem6: Move spl load fit to common/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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move spl load fit code into common/spl Signed-off-by: Jagan Teki --- board/engicam/common/spl.c | 16 ++++++++++++++++ board/engicam/icorem6/icorem6.c | 12 ------------ board/engicam/icorem6_rqs/icorem6_rqs.c | 12 ------------ 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index 8711418..f8ae3ac 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -39,6 +39,22 @@ static iomux_v3_cfg_t const uart_pads[] = { #endif }; +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + if (is_mx6dq() && !strcmp(name, "imx6q-icore")) + return 0; + else if (is_mx6dq() && !strcmp(name, "imx6q-icore-rqs")) + return 0; + else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore")) + return 0; + else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore-rqs")) + return 0; + else + return -1; +} +#endif + #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index 59c085b..e173124 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -264,16 +264,4 @@ int board_mmc_init(bd_t *bis) return 0; } #endif - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ - if (is_mx6dq() && !strcmp(name, "imx6q-icore")) - return 0; - else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore")) - return 0; - else - return -1; -} -#endif #endif /* CONFIG_SPL_BUILD */ diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index 8afc9be..84ab936 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -147,16 +147,4 @@ void board_boot_order(u32 *spl_boot_list) } #endif #endif - -#ifdef CONFIG_SPL_LOAD_FIT -int board_fit_config_name_match(const char *name) -{ - if (is_mx6dq() && !strcmp(name, "imx6q-icore-rqs")) - return 0; - else if ((is_mx6dl() || is_mx6solo()) && !strcmp(name, "imx6dl-icore-rqs")) - return 0; - else - return -1; -} -#endif #endif /* CONFIG_SPL_BUILD */ From patchwork Mon Nov 20 18:32:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839676 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="duNtsYAZ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygcsx6lQtz9rxj for ; Tue, 21 Nov 2017 05:38:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A6968C220B4; Mon, 20 Nov 2017 18:34:02 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 82516C220F8; Mon, 20 Nov 2017 18:33:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D675AC220D5; Mon, 20 Nov 2017 18:32:43 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id 1FE56C21F57 for ; Mon, 20 Nov 2017 18:32:39 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id j16so8028241pgn.9 for ; Mon, 20 Nov 2017 10:32:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tKc0cQHGAz3OUm1PppV8ZbE/jGoUAf5aATBhh8gUdRA=; b=duNtsYAZvHCRlcuz5h28+YPkGNC7c/os5mwW7lR8ovOTQYXkyfdEwXwYYfHEZE0OaJ AcH+g9dK1aQDfyd0FbjNFAPgbLW/cqMM1xYfKdteGVLx18TD2OaLgoo6Bs4sTzGG963r ek+M4hL27PQ6aHYTQTQI9oaH6GWg8KSKj30jOBaZMAacCOLC4+ab5iqhKfPR26lwLQgt OcUNbr6pfphHbyWUYaoK+T9bkxDLwLY8bNWQNKIwWtKTdwx7Yo1EDlSYgWgj+lRb6JzJ rBZWG6cATBV6HpK+jiPL34tD8gBEHFBrPVHEPq68I8ftNoeqMbNT5MT3GEu0wAX1YH/p GZhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tKc0cQHGAz3OUm1PppV8ZbE/jGoUAf5aATBhh8gUdRA=; b=kCzqhfYqoyrfkyyZ1Rev2ODE8jqWpev+WzIMp8oC3kR7BOaqSvRxo+DCVU55KXfVNH tbdiGn6263tLuq6G2WUhQG/Fx9PPUDA+HrffCr+IeFJZ9LIrCx04mv0d1Xg0areQaDeP 9AOkox/7A6TvI4PTp5zsjICvY+I0C9iYvStkpkn+7kWxinalOrZcl/OkA6bCz/LutRAn YoVkRoM5cjpzxM8eJfHxanqq+LPIbG51McrdsyBAFnNy0qoepbREFfZOMJpRUUFnijOq GwlNroD16Dd7WRY8Gni0i7tgBkV6xDfA9R+PBovdkq2O9u3oTDVXqF4wGvsCbsOqYUZ9 MXGg== X-Gm-Message-State: AJaThX6FDg2FduhON5Kf/ls9zV4nCYyWM81uYryx7HHhaHRsNKdGPegV wr0DOQIZJAn+9A8Vn1M4EkJof+W/ X-Google-Smtp-Source: AGs4zMaYDLVq0WWA0nMiA5+UFa0s7BoxAp+ijiQhmlWr/B1pKYGmMnj3OePY56RzMbSuW8Ru1vlxUw== X-Received: by 10.84.131.40 with SMTP id 37mr14830722pld.302.1511202757605; Mon, 20 Nov 2017 10:32:37 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:36 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:12 +0530 Message-Id: <1511202738-17448-4-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 3/9] i.MX6Q: icore: Add SPL_OF_CONTROL support 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add OF_CONTROL support for SPL code. Signed-off-by: Jagan Teki --- arch/arm/dts/imx6qdl-icore-rqs.dtsi | 2 + arch/arm/dts/imx6qdl-icore.dtsi | 2 + arch/arm/dts/imx6qdl.dtsi | 5 ++ arch/arm/mach-imx/mx6/Kconfig | 8 +++ board/engicam/icorem6/icorem6.c | 75 ----------------------- board/engicam/icorem6_rqs/icorem6_rqs.c | 102 -------------------------------- configs/imx6qdl_icore_mmc_defconfig | 1 + configs/imx6qdl_icore_rqs_defconfig | 1 + include/configs/imx6-engicam.h | 22 +++---- 9 files changed, 31 insertions(+), 187 deletions(-) diff --git a/arch/arm/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/dts/imx6qdl-icore-rqs.dtsi index 8b9d5b4..65cbf5a 100644 --- a/arch/arm/dts/imx6qdl-icore-rqs.dtsi +++ b/arch/arm/dts/imx6qdl-icore-rqs.dtsi @@ -100,6 +100,7 @@ }; &usdhc3 { + u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; @@ -165,6 +166,7 @@ }; pinctrl_usdhc3: usdhc3grp { + u-boot,dm-spl; fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17070 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10070 diff --git a/arch/arm/dts/imx6qdl-icore.dtsi b/arch/arm/dts/imx6qdl-icore.dtsi index a485c3e..06d9bc3 100644 --- a/arch/arm/dts/imx6qdl-icore.dtsi +++ b/arch/arm/dts/imx6qdl-icore.dtsi @@ -118,6 +118,7 @@ }; &usdhc1 { + u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; @@ -208,6 +209,7 @@ }; pinctrl_usdhc1: usdhc1grp { + u-boot,dm-spl; fsl,pins = < MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17070 MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10070 diff --git a/arch/arm/dts/imx6qdl.dtsi b/arch/arm/dts/imx6qdl.dtsi index b13b0b2..e04b570 100644 --- a/arch/arm/dts/imx6qdl.dtsi +++ b/arch/arm/dts/imx6qdl.dtsi @@ -77,6 +77,7 @@ compatible = "simple-bus"; interrupt-parent = <&gpc>; ranges; + u-boot,dm-spl; dma_apbh: dma-apbh@00110000 { compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh"; @@ -225,6 +226,7 @@ #size-cells = <1>; reg = <0x02000000 0x100000>; ranges; + u-boot,dm-spl; spba-bus@02000000 { compatible = "fsl,spba-bus", "simple-bus"; @@ -516,6 +518,7 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; + u-boot,dm-spl; }; gpio2: gpio@020a0000 { @@ -805,6 +808,7 @@ iomuxc: iomuxc@020e0000 { compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc"; reg = <0x020e0000 0x4000>; + u-boot,dm-spl; }; ldb: ldb@020e0008 { @@ -889,6 +893,7 @@ #size-cells = <1>; reg = <0x02100000 0x100000>; ranges; + u-boot,dm-spl; crypto: caam@2100000 { compatible = "fsl,sec-v4.0"; diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index fd73c67..b9aec2f 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -213,6 +213,10 @@ config TARGET_MX6Q_ICORE select DM_THERMAL select SUPPORT_SPL select SPL_LOAD_FIT + select SPL_DM if SPL + select SPL_OF_CONTROL if SPL + select SPL_SEPARATE_BSS if SPL + select SPL_PINCTRL if SPL config TARGET_MX6Q_ICORE_RQS bool "Support Engicam i.Core RQS" @@ -228,6 +232,10 @@ config TARGET_MX6Q_ICORE_RQS select DM_THERMAL select SUPPORT_SPL select SPL_LOAD_FIT + select SPL_DM if SPL + select SPL_OF_CONTROL if SPL + select SPL_SEPARATE_BSS if SPL + select SPL_PINCTRL if SPL config TARGET_MX6SABREAUTO bool "mx6sabreauto" diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/icorem6/icorem6.c index e173124..a967ccd 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/icorem6/icorem6.c @@ -7,7 +7,6 @@ */ #include -#include #include #include @@ -191,77 +190,3 @@ void setup_display(void) writel(reg, &iomux->gpr[3]); } #endif /* CONFIG_VIDEO_IPUV3 */ - -#ifdef CONFIG_SPL_BUILD -/* MMC board initialization is needed till adding DM support in SPL */ -#if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) -#include -#include - -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -static iomux_v3_cfg_t const usdhc1_pads[] = { - IOMUX_PADS(PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_CMD__SD1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DAT0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DAT1__SD1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DAT2__SD1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DAT3__SD1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_GPIO_1__GPIO1_IO01 | MUX_PAD_CTRL(NO_PAD_CTRL)),/* CD */ -}; - -#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 1) - -struct fsl_esdhc_cfg usdhc_cfg[1] = { - {USDHC1_BASE_ADDR, 0, 4}, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; - - switch (cfg->esdhc_base) { - case USDHC1_BASE_ADDR: - ret = !gpio_get_value(USDHC1_CD_GPIO); - break; - } - - return ret; -} - -int board_mmc_init(bd_t *bis) -{ - int i, ret; - - /* - * According to the board_mmc_init() the following map is done: - * (U-boot device node) (Physical Port) - * mmc0 USDHC1 - */ - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { - switch (i) { - case 0: - SETUP_IOMUX_PADS(usdhc1_pads); - gpio_direction_input(USDHC1_CD_GPIO); - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); - break; - default: - printf("Warning - USDHC%d controller not supporting\n", - i + 1); - return 0; - } - - ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); - if (ret) { - printf("Warning: failed to initialize mmc dev %d\n", i); - return ret; - } - } - - return 0; -} -#endif -#endif /* CONFIG_SPL_BUILD */ diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index 84ab936..cd73dfa 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -6,21 +6,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#include -#include - -#include -#include -#include - -#include -#include -#include -#include #include -#include - -#include "../common/board.h" DECLARE_GLOBAL_DATA_PTR; @@ -34,93 +20,6 @@ int board_mmc_get_env_dev(int devno) #ifdef CONFIG_SPL_BUILD #include -/* MMC board initialization is needed till adding DM support in SPL */ -#if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) -#include -#include - -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_HIGH | \ - PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -static iomux_v3_cfg_t const usdhc3_pads[] = { - IOMUX_PADS(PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), -}; - -static iomux_v3_cfg_t const usdhc4_pads[] = { - IOMUX_PADS(PAD_SD4_CLK__SD4_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_CMD__SD4_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_DAT0__SD4_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_DAT1__SD4_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_DAT2__SD4_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_DAT3__SD4_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_DAT4__SD4_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_DAT5__SD4_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_DAT6__SD4_DATA6 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD4_DAT7__SD4_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), -}; - -struct fsl_esdhc_cfg usdhc_cfg[2] = { - {USDHC3_BASE_ADDR, 1, 4}, - {USDHC4_BASE_ADDR, 1, 8}, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; - - switch (cfg->esdhc_base) { - case USDHC3_BASE_ADDR: - case USDHC4_BASE_ADDR: - ret = 1; - break; - } - - return ret; -} - -int board_mmc_init(bd_t *bis) -{ - int i, ret; - - /* - * According to the board_mmc_init() the following map is done: - * (U-boot device node) (Physical Port) - * mmc0 USDHC3 - * mmc1 USDHC4 - */ - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { - switch (i) { - case 0: - SETUP_IOMUX_PADS(usdhc3_pads); - usdhc_cfg[i].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); - break; - case 1: - SETUP_IOMUX_PADS(usdhc4_pads); - usdhc_cfg[i].sdhc_clk = mxc_get_clock(MXC_ESDHC4_CLK); - break; - default: - printf("Warning - USDHC%d controller not supporting\n", - i + 1); - return 0; - } - - ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); - if (ret) { - printf("Warning: failed to initialize mmc dev %d\n", i); - return ret; - } - } - - return 0; -} - #ifdef CONFIG_ENV_IS_IN_MMC void board_boot_order(u32 *spl_boot_list) { @@ -146,5 +45,4 @@ void board_boot_order(u32 *spl_boot_list) spl_boot_list[0] = boot_dev; } #endif -#endif #endif /* CONFIG_SPL_BUILD */ diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 6e93c49..31cf1e6 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -48,3 +48,4 @@ CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_VIDEO=y CONFIG_VIDEO_IPUV3=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index fbe9651..1e57deb 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -40,3 +40,4 @@ CONFIG_FEC_MXC=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index 86c1d38..b88afd7 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -216,16 +216,18 @@ # include "imx6_spl.h" # ifdef CONFIG_SPL_BUILD -# if defined(CONFIG_TARGET_MX6Q_ICORE_RQS) || defined(CONFIG_TARGET_MX6UL_ISIOT) -# define CONFIG_SYS_FSL_USDHC_NUM 2 -# else -# define CONFIG_SYS_FSL_USDHC_NUM 1 -# endif - -# define CONFIG_SYS_FSL_ESDHC_ADDR 0 -# undef CONFIG_DM_GPIO -# undef CONFIG_DM_MMC -# endif +# if defined(CONFIG_IMX6UL) +# if defined(CONFIG_TARGET_MX6UL_ISIOT) +# define CONFIG_SYS_FSL_USDHC_NUM 2 +# else +# define CONFIG_SYS_FSL_USDHC_NUM 1 +# endif + +# define CONFIG_SYS_FSL_ESDHC_ADDR 0 +# undef CONFIG_DM_GPIO +# undef CONFIG_DM_MMC +# endif /* CONFIG_IMX6UL */ +# endif /* CONFIG_SPL_BUILD */ #endif #endif /* __IMX6_ENGICAM_CONFIG_H */ From patchwork Mon Nov 20 18:32:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839672 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jdNcDLfA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygcs11c2Gz9s72 for ; Tue, 21 Nov 2017 05:37:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CA003C220C1; Mon, 20 Nov 2017 18:33:43 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 4ED98C220DC; Mon, 20 Nov 2017 18:33:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 80EEFC21F0F; Mon, 20 Nov 2017 18:32:46 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id CD0DFC220DA for ; Mon, 20 Nov 2017 18:32:42 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id q4so7865798pfg.13 for ; Mon, 20 Nov 2017 10:32:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rR5xt5Ef2YaSe3Db9oY4pdHO8G6+0dRzENQL0v61yFU=; b=jdNcDLfA69nAMhkn7/8SHm/plq6R0hmqCIvD0NcqMgG19KxovNpmrZ7X7rsg0K5q3z 4IKLMFXpY8oa7pygtj6qcxiZft9sJqjZtKa3ZuMhAc6gqTmLHfFD1a382lgqmqVlpIbR c5qFh1M0XG7MHFR9cwhPMjOLm5eg7YlB6pBQ2C8l45t6gF+BwZB866NbIcv+rUbNFvQX Ysxvp9iQweZ8l+MABxF6fbG2PgWY9e3c7oWRMsaHcpzmIUKdJEukwqH6Y2tQ2sx8Tx1z w+43d4JBaqwS1ipRXZf5vjtprNtc9G3LcynTdnHeXdyOQYvS5pkPTgBpO5NexIXGmdha EI2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rR5xt5Ef2YaSe3Db9oY4pdHO8G6+0dRzENQL0v61yFU=; b=G4wlWKbVLAX3BZY5bkACfQFw3PvgdjfMWd7JnOokZflF8mOrwgHP5/QR/GcspsEH7C ZSw9mX+ujmwXB/vQCEocB1o9smkhRqZk6p8xKcTVoNHHSfA8hTn3rKp/m5GF/2UnxKGb BJR860j68Y2CG9eOXKdctpb3z2mhy8r/vwBMuPikEjcadHuXTfpbL3Cn0NRtTeYbKr8y 19o9iW2kI+0CIAY7SUC6BVmFGTQ84e+kWcPXFTclynNZMc4RqvUtQcooo7duh40Z8rBG tq6DWYSygDsnCUH/9SSYD9R/oiZKuJlHgMpV4KT5s/OdZQAX3sCrEbeQBJUAh1oRWVmT 06AA== X-Gm-Message-State: AJaThX7FqdF1w7iIrGmt+kxPuqNSBH+2IWUDs1p8+z5ZFoQDRGy7yj7X znqpwOdxKqgoSU36cmlfPt4= X-Google-Smtp-Source: AGs4zMYFKsz4C94JHXofl7WYE2gqW8YGDROEGPdjJJ9EUl3cY/quABPsCPRX/7443NkqxgcUfL2SEA== X-Received: by 10.84.248.68 with SMTP id e4mr14673278pln.0.1511202761402; Mon, 20 Nov 2017 10:32:41 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:40 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:13 +0530 Message-Id: <1511202738-17448-5-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 4/9] pinctrl: imx6ul: Fix pinctrl data overlapped with DT area 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" before relocation pinctrl data BSS is overlapping DT area, when .data is using uninitialized global variable, imx6_pinctrl_soc_info. So assign them flags ZERO_OFFSET_VALID to prevent BSS overlap Suggested-by: Lokesh Vutla Reported-by: Jagan Teki Signed-off-by: Jagan Teki --- drivers/pinctrl/nxp/pinctrl-imx6.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/nxp/pinctrl-imx6.c b/drivers/pinctrl/nxp/pinctrl-imx6.c index 0f767d9..cac577b 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx6.c +++ b/drivers/pinctrl/nxp/pinctrl-imx6.c @@ -13,6 +13,11 @@ static struct imx_pinctrl_soc_info imx6_pinctrl_soc_info; +/* FIXME Before reloaction, BSS is overlapped with DT area */ +static struct imx_pinctrl_soc_info imx6ul_pinctrl_soc_info = { + .flags = ZERO_OFFSET_VALID, +}; + static struct imx_pinctrl_soc_info imx6_snvs_pinctrl_soc_info = { .flags = ZERO_OFFSET_VALID, }; @@ -32,7 +37,7 @@ static const struct udevice_id imx6_pinctrl_match[] = { { .compatible = "fsl,imx6sll-iomuxc-snvs", .data = (ulong)&imx6_snvs_pinctrl_soc_info }, { .compatible = "fsl,imx6sll-iomuxc", .data = (ulong)&imx6_pinctrl_soc_info }, { .compatible = "fsl,imx6sx-iomuxc", .data = (ulong)&imx6_pinctrl_soc_info }, - { .compatible = "fsl,imx6ul-iomuxc", .data = (ulong)&imx6_pinctrl_soc_info }, + { .compatible = "fsl,imx6ul-iomuxc", .data = (ulong)&imx6ul_pinctrl_soc_info }, { .compatible = "fsl,imx6ull-iomuxc-snvs", .data = (ulong)&imx6_snvs_pinctrl_soc_info }, { /* sentinel */ } }; From patchwork Mon Nov 20 18:32:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839664 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O8pQ7dVc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygcnW5tv0z9t3t for ; Tue, 21 Nov 2017 05:34:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 22E85C22063; Mon, 20 Nov 2017 18:33:13 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 99C21C220DF; Mon, 20 Nov 2017 18:32:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7A860C22014; Mon, 20 Nov 2017 18:32:48 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id 0DE32C22077 for ; Mon, 20 Nov 2017 18:32:47 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id a84so7898191pfl.0 for ; Mon, 20 Nov 2017 10:32:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bhfqWhTPCQu9hkkhXTNGpvglCp0bxznwFYVtGuXymOk=; b=O8pQ7dVcV1wCrShj8MLrsJ/yn1UGLgwmregTpjAgSbs5md+lCvAWzez6m9gpEX5XIP FD0yS1aFsshU2ADAFrqvvzeHD7z7VkI8PlyTiwNfj5X9x5nBkE5a6rq83qmOU+7G+Msm IC4E1pkW54b8lm3z3+tbrMWurhQPMi1GqiwQSmR45eHLX/Z5YxvHH3A5WR6W2FOUEnoD pDbx7RkBnN0e+bCAB3kmYKKe3brCQvpa/qo8VVoPnWv5X0joGpgDIsDhbFhrFFazU4Q9 16GDIf3JNOCfe/IqO8m7YBFo0bPfHx8ZI8rypbJS9lYH+KxB1gM9lHo5OtGEGOYuwqwD KdKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bhfqWhTPCQu9hkkhXTNGpvglCp0bxznwFYVtGuXymOk=; b=LM/7cCzEKpt9d6F7UshEeT6ij4Ye2z/J2+oRBIK7kW7IU4XhMv2fug2W28qNZq2cot b6mMOB5Xc2QVXVLbOygvpg7o3KciGDOU2Ort94iZlcwrxlcC1iTvSLcbTNjk4pFc3T52 T7qrHH9hlV46zNKWC9s+sIqI260mCXfMuUFCdI5fDUYEgwKwaN0qgx44Y037P0tSbFPl QURvhUMnQeTBVzUzcX+hfXSxso35zOO94+9xbu5t38EPCKV6xf/RX/UVH2TcTadkk03o /wV0AsQQoGXA1eLacrhD8dfzu7y+e4t6D2jVpYbNtmXCiPhVdvItqs22WQea0/cnb/5S CQ+w== X-Gm-Message-State: AJaThX7/gXcvcsvxlW6X/Fy1bHUnC5x6kHmKN3NIpb7/MFGX/7Cyk0gG 05IsuIaO7Jx3XTygUqWYWIM= X-Google-Smtp-Source: AGs4zMaMlO7jb78F8DhI/QJY3hldC30r/F+l3M00unlvM82tQRRe1/FdBTTUh1cie8GRZJqo4aN0DA== X-Received: by 10.98.62.221 with SMTP id y90mr12207870pfj.71.1511202765438; Mon, 20 Nov 2017 10:32:45 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:44 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:14 +0530 Message-Id: <1511202738-17448-6-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 5/9] i.MX6UL: icore: Add SPL_OF_CONTROL support 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add OF_CONTROL support for SPL code. Signed-off-by: Jagan Teki --- arch/arm/dts/imx6ul-geam-kit.dts | 4 ++ arch/arm/dts/imx6ul-isiot-emmc.dts | 2 + arch/arm/dts/imx6ul-isiot.dtsi | 2 + arch/arm/dts/imx6ul.dtsi | 6 ++ arch/arm/mach-imx/mx6/Kconfig | 9 +++ board/engicam/geam6ul/geam6ul.c | 81 --------------------------- board/engicam/isiotmx6ul/isiotmx6ul.c | 101 ---------------------------------- configs/imx6ul_geam_mmc_defconfig | 1 + configs/imx6ul_isiot_emmc_defconfig | 1 + configs/imx6ul_isiot_mmc_defconfig | 1 + include/configs/imx6-engicam.h | 13 ----- 11 files changed, 26 insertions(+), 195 deletions(-) diff --git a/arch/arm/dts/imx6ul-geam-kit.dts b/arch/arm/dts/imx6ul-geam-kit.dts index 07c21cb..15e3f94 100644 --- a/arch/arm/dts/imx6ul-geam-kit.dts +++ b/arch/arm/dts/imx6ul-geam-kit.dts @@ -87,6 +87,7 @@ }; &usdhc1 { + u-boot,dm-spl; pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc1>; pinctrl-1 = <&pinctrl_usdhc1_100mhz>; @@ -134,6 +135,7 @@ }; pinctrl_usdhc1: usdhc1grp { + u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059 @@ -145,6 +147,7 @@ }; pinctrl_usdhc1_100mhz: usdhc1grp100mhz { + u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170b9 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100b9 @@ -156,6 +159,7 @@ }; pinctrl_usdhc1_200mhz: usdhc1grp200mhz { + u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170f9 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100f9 diff --git a/arch/arm/dts/imx6ul-isiot-emmc.dts b/arch/arm/dts/imx6ul-isiot-emmc.dts index 677de96..a611e3b 100644 --- a/arch/arm/dts/imx6ul-isiot-emmc.dts +++ b/arch/arm/dts/imx6ul-isiot-emmc.dts @@ -50,6 +50,7 @@ }; &usdhc2 { + u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc2>; cd-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; @@ -60,6 +61,7 @@ &iomuxc { pinctrl_usdhc2: usdhc2grp { + u-boot,dm-spl; fsl,pins = < MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17070 MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x10070 diff --git a/arch/arm/dts/imx6ul-isiot.dtsi b/arch/arm/dts/imx6ul-isiot.dtsi index 9a3c35c..5007a88 100644 --- a/arch/arm/dts/imx6ul-isiot.dtsi +++ b/arch/arm/dts/imx6ul-isiot.dtsi @@ -82,6 +82,7 @@ }; &usdhc1 { + u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>; @@ -128,6 +129,7 @@ }; pinctrl_usdhc1: usdhc1grp { + u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059 diff --git a/arch/arm/dts/imx6ul.dtsi b/arch/arm/dts/imx6ul.dtsi index def5f8c..7affab8 100644 --- a/arch/arm/dts/imx6ul.dtsi +++ b/arch/arm/dts/imx6ul.dtsi @@ -134,6 +134,7 @@ compatible = "simple-bus"; interrupt-parent = <&gpc>; ranges; + u-boot,dm-spl; pmu { compatible = "arm,cortex-a7-pmu"; @@ -185,6 +186,7 @@ #size-cells = <1>; reg = <0x02000000 0x100000>; ranges; + u-boot,dm-spl; spba-bus@02000000 { compatible = "fsl,spba-bus", "simple-bus"; @@ -415,6 +417,7 @@ #interrupt-cells = <2>; gpio-ranges = <&iomuxc 0 23 10>, <&iomuxc 10 17 6>, <&iomuxc 16 33 16>; + u-boot,dm-spl; }; gpio2: gpio@020a0000 { @@ -451,6 +454,7 @@ interrupt-controller; #interrupt-cells = <2>; gpio-ranges = <&iomuxc 0 94 17>, <&iomuxc 17 117 12>; + u-boot,dm-spl; }; gpio5: gpio@020ac000 { @@ -649,6 +653,7 @@ iomuxc: iomuxc@020e0000 { compatible = "fsl,imx6ul-iomuxc"; reg = <0x020e0000 0x4000>; + u-boot,dm-spl; }; gpr: iomuxc-gpr@020e4000 { @@ -729,6 +734,7 @@ #size-cells = <1>; reg = <0x02100000 0x100000>; ranges; + u-boot,dm-spl; usbotg1: usb@02184000 { compatible = "fsl,imx6ul-usb", "fsl,imx27-usb"; diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index b9aec2f..770a3c1 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -308,6 +308,11 @@ config TARGET_MX6UL_GEAM select DM_MMC select DM_THERMAL select SUPPORT_SPL + select SPL_DM if SPL + select SPL_OF_CONTROL if SPL + select SPL_SEPARATE_BSS if SPL + select SPL_PINCTRL if SPL + config TARGET_MX6UL_ISIOT bool "Support Engicam Is.IoT MX6UL" select BOARD_LATE_INIT @@ -320,6 +325,10 @@ config TARGET_MX6UL_ISIOT select DM_MMC select DM_THERMAL select SUPPORT_SPL + select SPL_DM if SPL + select SPL_OF_CONTROL if SPL + select SPL_SEPARATE_BSS if SPL + select SPL_PINCTRL if SPL config TARGET_MX6ULL_14X14_EVK bool "Support mx6ull_14x14_evk" diff --git a/board/engicam/geam6ul/geam6ul.c b/board/engicam/geam6ul/geam6ul.c index 15bd8b2..23e7e4b 100644 --- a/board/engicam/geam6ul/geam6ul.c +++ b/board/engicam/geam6ul/geam6ul.c @@ -7,7 +7,6 @@ */ #include -#include #include #include @@ -89,83 +88,3 @@ void setup_gpmi_nand(void) setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK); } #endif /* CONFIG_NAND_MXS */ - -#ifdef CONFIG_SPL_BUILD -/* MMC board initialization is needed till adding DM support in SPL */ -#if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) -#include -#include - -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -static iomux_v3_cfg_t const usdhc1_pads[] = { - IOMUX_PADS(PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_CMD__USDHC1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DATA0__USDHC1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DATA1__USDHC1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DATA2__USDHC1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DATA3__USDHC1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - - /* VSELECT */ - IOMUX_PADS(PAD_GPIO1_IO05__USDHC1_VSELECT | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - /* CD */ - IOMUX_PADS(PAD_UART1_RTS_B__GPIO1_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL)), - /* RST_B */ - IOMUX_PADS(PAD_GPIO1_IO09__GPIO1_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL)), -}; - -#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 1) - -struct fsl_esdhc_cfg usdhc_cfg[1] = { - {USDHC1_BASE_ADDR, 0, 4}, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; - - switch (cfg->esdhc_base) { - case USDHC1_BASE_ADDR: - ret = !gpio_get_value(USDHC1_CD_GPIO); - break; - } - - return ret; -} - -int board_mmc_init(bd_t *bis) -{ - int i, ret; - - /* - * According to the board_mmc_init() the following map is done: - * (U-boot device node) (Physical Port) - * mmc0 USDHC1 - */ - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { - switch (i) { - case 0: - SETUP_IOMUX_PADS(usdhc1_pads); - gpio_direction_input(USDHC1_CD_GPIO); - usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); - break; - default: - printf("Warning - USDHC%d controller not supporting\n", - i + 1); - return 0; - } - - ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); - if (ret) { - printf("Warning: failed to initialize mmc dev %d\n", i); - return ret; - } - } - - return 0; -} -#endif /* CONFIG_FSL_ESDHC */ -#endif /* CONFIG_SPL_BUILD */ diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c b/board/engicam/isiotmx6ul/isiotmx6ul.c index 9afa8e4..05d23c2 100644 --- a/board/engicam/isiotmx6ul/isiotmx6ul.c +++ b/board/engicam/isiotmx6ul/isiotmx6ul.c @@ -101,106 +101,6 @@ int board_mmc_get_env_dev(int devno) #ifdef CONFIG_SPL_BUILD #include -/* MMC board initialization is needed till adding DM support in SPL */ -#if defined(CONFIG_FSL_ESDHC) && !defined(CONFIG_DM_MMC) -#include -#include - -#define USDHC_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ - PAD_CTL_PUS_22K_UP | PAD_CTL_SPEED_LOW | \ - PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) - -static iomux_v3_cfg_t const usdhc1_pads[] = { - IOMUX_PADS(PAD_SD1_CLK__USDHC1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_CMD__USDHC1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DATA0__USDHC1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DATA1__USDHC1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DATA2__USDHC1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_SD1_DATA3__USDHC1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - - /* VSELECT */ - IOMUX_PADS(PAD_GPIO1_IO05__USDHC1_VSELECT | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - /* CD */ - IOMUX_PADS(PAD_UART1_RTS_B__GPIO1_IO19 | MUX_PAD_CTRL(NO_PAD_CTRL)), - /* RST_B */ - IOMUX_PADS(PAD_GPIO1_IO09__GPIO1_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL)), -}; - -static iomux_v3_cfg_t const usdhc2_pads[] = { - IOMUX_PADS(PAD_NAND_ALE__USDHC2_RESET_B | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_NAND_RE_B__USDHC2_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_NAND_WE_B__USDHC2_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_NAND_DATA00__USDHC2_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_NAND_DATA01__USDHC2_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_NAND_DATA02__USDHC2_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_NAND_DATA03__USDHC2_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_NAND_DATA04__USDHC2_DATA4 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), - IOMUX_PADS(PAD_NAND_DATA05__USDHC2_DATA5 | MUX_PAD_CTRL(USDHC_PAD_CTRL)), -}; - -#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 19) -#define USDHC2_CD_GPIO IMX_GPIO_NR(4, 5) - -struct fsl_esdhc_cfg usdhc_cfg[2] = { - {USDHC1_BASE_ADDR, 0, 4}, - {USDHC2_BASE_ADDR, 0, 8}, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; - - switch (cfg->esdhc_base) { - case USDHC1_BASE_ADDR: - ret = !gpio_get_value(USDHC1_CD_GPIO); - break; - case USDHC2_BASE_ADDR: - ret = !gpio_get_value(USDHC2_CD_GPIO); - break; - } - - return ret; -} - -int board_mmc_init(bd_t *bis) -{ - int i, ret; - - /* - * According to the board_mmc_init() the following map is done: - * (U-boot device node) (Physical Port) - * mmc0 USDHC1 - * mmc1 USDHC2 - */ - for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { - switch (i) { - case 0: - SETUP_IOMUX_PADS(usdhc1_pads); - gpio_direction_input(USDHC1_CD_GPIO); - usdhc_cfg[i].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); - break; - case 1: - SETUP_IOMUX_PADS(usdhc2_pads); - gpio_direction_input(USDHC2_CD_GPIO); - usdhc_cfg[i].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); - break; - default: - printf("Warning - USDHC%d controller not supporting\n", - i + 1); - return 0; - } - - ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); - if (ret) { - printf("Warning: failed to initialize mmc dev %d\n", i); - return ret; - } - } - - return 0; -} - #ifdef CONFIG_ENV_IS_IN_MMC void board_boot_order(u32 *spl_boot_list) { @@ -226,5 +126,4 @@ void board_boot_order(u32 *spl_boot_list) spl_boot_list[0] = boot_dev; } #endif -#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_SPL_BUILD */ diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index ce7c288..c147d4a 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -40,3 +40,4 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig index 94af53e..5f8a574 100644 --- a/configs/imx6ul_isiot_emmc_defconfig +++ b/configs/imx6ul_isiot_emmc_defconfig @@ -38,3 +38,4 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 diff --git a/configs/imx6ul_isiot_mmc_defconfig b/configs/imx6ul_isiot_mmc_defconfig index 0a990d7..367dfa1 100644 --- a/configs/imx6ul_isiot_mmc_defconfig +++ b/configs/imx6ul_isiot_mmc_defconfig @@ -40,3 +40,4 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h index b88afd7..0c45e06 100644 --- a/include/configs/imx6-engicam.h +++ b/include/configs/imx6-engicam.h @@ -215,19 +215,6 @@ # endif # include "imx6_spl.h" -# ifdef CONFIG_SPL_BUILD -# if defined(CONFIG_IMX6UL) -# if defined(CONFIG_TARGET_MX6UL_ISIOT) -# define CONFIG_SYS_FSL_USDHC_NUM 2 -# else -# define CONFIG_SYS_FSL_USDHC_NUM 1 -# endif - -# define CONFIG_SYS_FSL_ESDHC_ADDR 0 -# undef CONFIG_DM_GPIO -# undef CONFIG_DM_MMC -# endif /* CONFIG_IMX6UL */ -# endif /* CONFIG_SPL_BUILD */ #endif #endif /* __IMX6_ENGICAM_CONFIG_H */ From patchwork Mon Nov 20 18:32:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839685 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y9VzOZRS"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygcwD4c8Qz9s72 for ; Tue, 21 Nov 2017 05:40:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4769DC21EA6; Mon, 20 Nov 2017 18:35:56 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID 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 B8FE1C220FB; Mon, 20 Nov 2017 18:34:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 46E6DC21F57; Mon, 20 Nov 2017 18:32:54 +0000 (UTC) Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by lists.denx.de (Postfix) with ESMTPS id 28187C220F6 for ; Mon, 20 Nov 2017 18:32:51 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id l24so7889699pfj.6 for ; Mon, 20 Nov 2017 10:32:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NXhU8vu81JQ0mqlT6IX4qFnQQR7A8Tv37emQwWXUtD0=; b=Y9VzOZRSJYtbbPItCfQX3rYwtD/ih9aZ64R/O+utvW+q8PXVt6CPgPaWI+tw2uo5Yk sLlGM26hRJUmpUs8mB8LWF7do/OlSXkKatXgMASHYq/beJoVaaKqE5Kd428j/M/BihKY MITCt+RQGV2GHUca8q0B9UhQ2PyQJgzu09/TWCr9rYsG5XhoiR87n2PL9rf/HHN6me1B YpASDLyl2d5sognC+UFtaO5vWrS+WuPsVHb3ANWyQhDdNJGCIckqDJYevArK4azOcb0E 4Jzs+Oablp41D72Maem9Y6+IU/3FLxsxo77Vd4DESiNtVkJBaOinI7fK3fNcV5+vubGk OjNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NXhU8vu81JQ0mqlT6IX4qFnQQR7A8Tv37emQwWXUtD0=; b=KDuKVlN/apkcC7qNcd0ERgACvtvDprtRxOn9sVEr3Pa2FcEqxZ7vGA41Uy7l8YZRaN HnldTSh/CYKFbkIN+UCAmCTEPfz+3zZUjuU4ySI9BPqzMa1vk49C5xYEaTcyUt0KwGdp ZIny1Mn6FIuekQkJH8n0v1g4hDf4EFcMGQOM8OfFGbKJBQDoozyWYkfmpm1ebVgC9/J5 lbis+bLmIocXWxp+jK6WiS27mQNoLqjgL7DJy49tlb8Q8R668gYJYgnJLzPllG1ddIpx ASK0xuwAmjwLOnG2FrdW3wTJ/YM6giYnSwbUEEB169eq0q56D1fbR+WTEKGT7rln9FAl tjcw== X-Gm-Message-State: AJaThX7rompNsJwrf3+WwojF7YXAzDJ0zPQ4XAm+1w3IxXd8rx2uo5ab COvysl15+UsRc4M+fC6hN9Y= X-Google-Smtp-Source: AGs4zMaU/ev508+dUUy3uodW8RptQOHoxhijQaqCH9n55jS7alwiAq75mQOhTibI5O9O/Ys87kEcLw== X-Received: by 10.101.76.3 with SMTP id u3mr2924597pgq.136.1511202769653; Mon, 20 Nov 2017 10:32:49 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:48 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:15 +0530 Message-Id: <1511202738-17448-7-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 6/9] board: icore-rqs: Fix mmc get env device 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" As per USDHC boot eFUSE descriptions: USDHC3 => devno 2 USDHC4 => devno 3 Linux will detect mmc0, mmc1, mmc2 based on the status "okay" on usdhc so imx6qdl-icore-rqs.dtsi has enabled usdhc1, usdhc3 and usdhc4.But U-Boot can detect based on the aliases so add mmc1, mmc2 for usdhc3 and usdhc4 respectively and return the board_mmc_get_env_dev by subtracting -1 Signed-off-by: Jagan Teki --- arch/arm/dts/imx6qdl-icore-rqs.dtsi | 5 +++++ board/engicam/icorem6_rqs/icorem6_rqs.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/dts/imx6qdl-icore-rqs.dtsi index 65cbf5a..816cdce 100644 --- a/arch/arm/dts/imx6qdl-icore-rqs.dtsi +++ b/arch/arm/dts/imx6qdl-icore-rqs.dtsi @@ -43,6 +43,11 @@ #include / { + aliases { + mmc1 = &usdhc3; + mmc2 = &usdhc4; + }; + memory { reg = <0x10000000 0x80000000>; }; diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index cd73dfa..a55a754 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_ENV_IS_IN_MMC int board_mmc_get_env_dev(int devno) { - return devno; + return devno - 1; } #endif From patchwork Mon Nov 20 18:32:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839687 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Zh/3a/2v"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygcwQ68C7z9rxj for ; Tue, 21 Nov 2017 05:40:21 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CFEA8C21F0F; Mon, 20 Nov 2017 18:35:09 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 8F09FC22012; Mon, 20 Nov 2017 18:34:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DA76EC220DA; Mon, 20 Nov 2017 18:33:00 +0000 (UTC) Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by lists.denx.de (Postfix) with ESMTPS id A263CC21FF6 for ; Mon, 20 Nov 2017 18:32:55 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id k190so3372532pga.3 for ; Mon, 20 Nov 2017 10:32:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=43ZAB76egZQRGrPg3cQXCowGKwxyQsclSYOrZeskZPY=; b=Zh/3a/2vlH2UpT7z35FZbp7qTih6CUBLW2QVqNlv7URZMTCjhH9Alj99ZFnuM9bhqx Q0itmxzmSR57LXEcn0imTj+XladMt0+Em1Ki2hDXfi+j/8DRHAZadeSo3MIfwZbabiht mlanWD02t5NR3f4vCsSzSSN5K7exb1OTaldZ6vSgQArQQ9SsAcWsyUvS6akyNC2pwkTI fyB/yfmlog2K956kn3GQqklLIRP9efmpmBlQRFRkALFAz8mLbE9jDTl6Wv7PsbK/80Nm xQZkYNOqd+b946gTmTQpAx3E1bTNM4DKwqpXhRbwoTL89lhWD487sS6AMRlxtk9ZYm7R pJNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=43ZAB76egZQRGrPg3cQXCowGKwxyQsclSYOrZeskZPY=; b=TpJq+NIDwnIFkL1AH9gcsez9IEdwmGuwLFMl+FhjKUqxohmhblM7hP3uBWEoI2ZPSG ARLMg930T83Am+c59goTUZVWHYWTRCaxZyrza1rhy+eM6HdtI5fZY50dbXhDvjvaiyUn PdcqWvC5Hx8b84aHJ5oMaWIxzPaJBzYKjDm/9u31eI53D8vpwiznEsl6L6gY8C90HntV /ZEYRdMvKPisBcbzXExfqm0By1E+gl+Oc7CRUTQcPx0SPd7cyWNbuw7TvVJq2I0t+jib hbV2FljAvlUxwN4nwaiObx/6dbFN/tsbHVxkbhisZMm10PbUjFIHbrqfPEZ4dXUPZbHD 8fkQ== X-Gm-Message-State: AJaThX5Do0WcgQT0Q++D+kVh+FeXeo341Ppwvf2DqjDmnxFSB8R9aYW2 s+agKj/m3PPS0gN9dwdig7o= X-Google-Smtp-Source: AGs4zMZrxIy9qUdCXtIdcSB/K5Nye0YP0jwDE5r0lmxPpYA3G0+navWnuODVfU3YF7zY1cZrhhdMQg== X-Received: by 10.101.70.136 with SMTP id h8mr3109666pgr.325.1511202773874; Mon, 20 Nov 2017 10:32:53 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:52 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:16 +0530 Message-Id: <1511202738-17448-8-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 7/9] i.MX6: engicam: Add imx6q/imx6ul boards for existing boards 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add new board names for existing board support imx6q - icore and icore_rqs boards imx6ul - geam6ul and isiot boards Signed-off-by: Jagan Teki --- arch/arm/mach-imx/mx6/Kconfig | 50 +------- board/engicam/common/board.c | 2 +- board/engicam/common/spl.c | 26 +++++ board/engicam/geam6ul/MAINTAINERS | 8 -- board/engicam/geam6ul/README | 28 ----- board/engicam/icorem6_rqs/Kconfig | 12 -- board/engicam/icorem6_rqs/MAINTAINERS | 9 -- board/engicam/icorem6_rqs/Makefile | 6 - board/engicam/{geam6ul => imx6q}/Kconfig | 4 +- board/engicam/{icorem6 => imx6q}/MAINTAINERS | 8 +- board/engicam/{geam6ul => imx6q}/Makefile | 2 +- board/engicam/{icorem6_rqs => imx6q}/README | 9 +- board/engicam/{icorem6/icorem6.c => imx6q/imx6q.c} | 10 +- board/engicam/{icorem6 => imx6ul}/Kconfig | 4 +- board/engicam/{isiotmx6ul => imx6ul}/MAINTAINERS | 9 +- board/engicam/{icorem6 => imx6ul}/Makefile | 2 +- board/engicam/{icorem6 => imx6ul}/README | 11 +- .../engicam/{geam6ul/geam6ul.c => imx6ul/imx6ul.c} | 9 ++ board/engicam/isiotmx6ul/Kconfig | 12 -- board/engicam/isiotmx6ul/Makefile | 6 - board/engicam/isiotmx6ul/README | 28 ----- board/engicam/isiotmx6ul/isiotmx6ul.c | 129 --------------------- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 2 +- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- configs/imx6ul_isiot_emmc_defconfig | 2 +- configs/imx6ul_isiot_mmc_defconfig | 2 +- configs/imx6ul_isiot_nand_defconfig | 2 +- 30 files changed, 89 insertions(+), 311 deletions(-) delete mode 100644 board/engicam/geam6ul/MAINTAINERS delete mode 100644 board/engicam/geam6ul/README delete mode 100644 board/engicam/icorem6_rqs/Kconfig delete mode 100644 board/engicam/icorem6_rqs/MAINTAINERS delete mode 100644 board/engicam/icorem6_rqs/Makefile rename board/engicam/{geam6ul => imx6q}/Kconfig (73%) rename board/engicam/{icorem6 => imx6q}/MAINTAINERS (58%) rename board/engicam/{geam6ul => imx6q}/Makefile (80%) rename board/engicam/{icorem6_rqs => imx6q}/README (71%) rename board/engicam/{icorem6/icorem6.c => imx6q/imx6q.c} (97%) rename board/engicam/{icorem6 => imx6ul}/Kconfig (72%) rename board/engicam/{isiotmx6ul => imx6ul}/MAINTAINERS (69%) rename board/engicam/{icorem6 => imx6ul}/Makefile (80%) rename board/engicam/{icorem6 => imx6ul}/README (74%) rename board/engicam/{geam6ul/geam6ul.c => imx6ul/imx6ul.c} (95%) delete mode 100644 board/engicam/isiotmx6ul/Kconfig delete mode 100644 board/engicam/isiotmx6ul/Makefile delete mode 100644 board/engicam/isiotmx6ul/README delete mode 100644 board/engicam/isiotmx6ul/isiotmx6ul.c diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 770a3c1..04883e5 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -199,27 +199,8 @@ config TARGET_MX6LOGICPD config TARGET_MX6QARM2 bool "mx6qarm2" -config TARGET_MX6Q_ICORE - bool "Support Engicam i.Core" - select BOARD_LATE_INIT - select MX6QDL - select OF_CONTROL - select SPL_OF_LIBFDT - select DM - select DM_ETH - select DM_GPIO - select DM_I2C - select DM_MMC - select DM_THERMAL - select SUPPORT_SPL - select SPL_LOAD_FIT - select SPL_DM if SPL - select SPL_OF_CONTROL if SPL - select SPL_SEPARATE_BSS if SPL - select SPL_PINCTRL if SPL - -config TARGET_MX6Q_ICORE_RQS - bool "Support Engicam i.Core RQS" +config TARGET_MX6Q_ENGICAM + bool "Support Engicam i.Core(RQS)" select BOARD_LATE_INIT select MX6QDL select OF_CONTROL @@ -296,25 +277,8 @@ config TARGET_MX6UL_14X14_EVK select DM_THERMAL select SUPPORT_SPL -config TARGET_MX6UL_GEAM - bool "Support Engicam GEAM6UL" - select BOARD_LATE_INIT - select MX6UL - select OF_CONTROL - select DM - select DM_ETH - select DM_GPIO - select DM_I2C - select DM_MMC - select DM_THERMAL - select SUPPORT_SPL - select SPL_DM if SPL - select SPL_OF_CONTROL if SPL - select SPL_SEPARATE_BSS if SPL - select SPL_PINCTRL if SPL - -config TARGET_MX6UL_ISIOT - bool "Support Engicam Is.IoT MX6UL" +config TARGET_MX6UL_ENGICAM + bool "Support Engicam GEAM6UL/Is.IoT" select BOARD_LATE_INIT select MX6UL select OF_CONTROL @@ -463,10 +427,8 @@ source "board/congatec/cgtqmx6eval/Kconfig" source "board/dhelectronics/dh_imx6/Kconfig" source "board/el/el6x/Kconfig" source "board/embest/mx6boards/Kconfig" -source "board/engicam/geam6ul/Kconfig" -source "board/engicam/icorem6/Kconfig" -source "board/engicam/icorem6_rqs/Kconfig" -source "board/engicam/isiotmx6ul/Kconfig" +source "board/engicam/imx6q/Kconfig" +source "board/engicam/imx6ul/Kconfig" source "board/freescale/mx6qarm2/Kconfig" source "board/freescale/mx6sabreauto/Kconfig" source "board/freescale/mx6sabresd/Kconfig" diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c index f86fb2b..f633c71 100644 --- a/board/engicam/common/board.c +++ b/board/engicam/common/board.c @@ -49,7 +49,7 @@ static void setenv_fdt_file(void) } else if (!strcmp(cmp_dtb, "imx6ul-geam-kit")) env_set("fdt_file", "imx6ul-geam-kit.dtb"); else if (!strcmp(cmp_dtb, "imx6ul-isiot-mmc")) - env_set("fdt_file", "imx6ul-isiot-mmc.dtb"); + env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); else if (!strcmp(cmp_dtb, "imx6ul-isiot-emmc")) env_set("fdt_file", "imx6ul-isiot-emmc.dtb"); else if (!strcmp(cmp_dtb, "imx6ul-isiot-nand")) diff --git a/board/engicam/common/spl.c b/board/engicam/common/spl.c index f8ae3ac..6e2389d 100644 --- a/board/engicam/common/spl.c +++ b/board/engicam/common/spl.c @@ -55,6 +55,32 @@ int board_fit_config_name_match(const char *name) } #endif +#ifdef CONFIG_ENV_IS_IN_MMC +void board_boot_order(u32 *spl_boot_list) +{ + u32 bmode = imx6_src_get_boot_mode(); + u8 boot_dev = BOOT_DEVICE_MMC1; + + switch ((bmode & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { + case IMX6_BMODE_SD: + case IMX6_BMODE_ESD: + /* SD/eSD - BOOT_DEVICE_MMC1 */ + break; + case IMX6_BMODE_MMC: + case IMX6_BMODE_EMMC: + /* MMC/eMMC */ + boot_dev = BOOT_DEVICE_MMC2; + break; + default: + /* Default - BOOT_DEVICE_MMC1 */ + printf("Wrong board boot order\n"); + break; + } + + spl_boot_list[0] = boot_dev; +} +#endif + #ifdef CONFIG_SPL_OS_BOOT int spl_start_uboot(void) { diff --git a/board/engicam/geam6ul/MAINTAINERS b/board/engicam/geam6ul/MAINTAINERS deleted file mode 100644 index 2b882d2..0000000 --- a/board/engicam/geam6ul/MAINTAINERS +++ /dev/null @@ -1,8 +0,0 @@ -GEAM6UL BOARD -M: Jagan Teki -S: Maintained -F: board/engicam/geam6ul -F: include/configs/imx6-engicam.h -F: configs/imx6ul_geam_mmc_defconfig -F: configs/imx6ul_geam_nand_defconfig -F: arch/arm/dts/imx6ul-geam-kit.dts diff --git a/board/engicam/geam6ul/README b/board/engicam/geam6ul/README deleted file mode 100644 index 0df6ae4..0000000 --- a/board/engicam/geam6ul/README +++ /dev/null @@ -1,28 +0,0 @@ -How to use U-Boot on Engicam GEAM6UL Starter Kit: -------------------------------------------------- - -- Configure U-Boot for Engicam GEAM6UL: - -$ make mrproper -$ make imx6ul_geam_mmc_defconfig -$ make - -This will generate the SPL image called SPL and the u-boot-dtb.img. - -- Flash the SPL image into the micro SD card: - -sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync - -- Flash the u-boot-dtb.img image into the micro SD card: - -sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=69; sync - -- Jumper settings: - -MMC Boot: JM3 Closed - -- Connect the Serial cable between the Starter Kit and the PC for the console. -(J28 is the Linux Serial console connector) - -- Insert the micro SD card in the board, power it up and U-Boot messages should -come up. diff --git a/board/engicam/icorem6_rqs/Kconfig b/board/engicam/icorem6_rqs/Kconfig deleted file mode 100644 index 6dc3a07..0000000 --- a/board/engicam/icorem6_rqs/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_MX6Q_ICORE_RQS - -config SYS_BOARD - default "icorem6_rqs" - -config SYS_VENDOR - default "engicam" - -config SYS_CONFIG_NAME - default "imx6-engicam" - -endif diff --git a/board/engicam/icorem6_rqs/MAINTAINERS b/board/engicam/icorem6_rqs/MAINTAINERS deleted file mode 100644 index 9a74265..0000000 --- a/board/engicam/icorem6_rqs/MAINTAINERS +++ /dev/null @@ -1,9 +0,0 @@ -ICOREM6QDL_RQS BOARD -M: Jagan Teki -S: Maintained -F: board/engicam/icorem6_rqs -F: include/configs/imx6-engicam.h -F: configs/imx6qdl_icore_rqs_defconfig -F: arch/arm/dts/imx6qdl-icore-rqs.dtsi -F: arch/arm/dts/imx6q-icore-rqs.dts -F: arch/arm/dts/imx6dl-icore-rqs.dts diff --git a/board/engicam/icorem6_rqs/Makefile b/board/engicam/icorem6_rqs/Makefile deleted file mode 100644 index 2e3933c..0000000 --- a/board/engicam/icorem6_rqs/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2016 Amarula Solutions B.V. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := icorem6_rqs.o diff --git a/board/engicam/geam6ul/Kconfig b/board/engicam/imx6q/Kconfig similarity index 73% rename from board/engicam/geam6ul/Kconfig rename to board/engicam/imx6q/Kconfig index 7f4023e..48eb60c 100644 --- a/board/engicam/geam6ul/Kconfig +++ b/board/engicam/imx6q/Kconfig @@ -1,7 +1,7 @@ -if TARGET_MX6UL_GEAM +if TARGET_MX6Q_ENGICAM config SYS_BOARD - default "geam6ul" + default "imx6q" config SYS_VENDOR default "engicam" diff --git a/board/engicam/icorem6/MAINTAINERS b/board/engicam/imx6q/MAINTAINERS similarity index 58% rename from board/engicam/icorem6/MAINTAINERS rename to board/engicam/imx6q/MAINTAINERS index a348bdd..82efb46 100644 --- a/board/engicam/icorem6/MAINTAINERS +++ b/board/engicam/imx6q/MAINTAINERS @@ -1,10 +1,14 @@ -ICOREM6QDL BOARD +MX6Q_ENGICAM BOARD M: Jagan Teki S: Maintained -F: board/engicam/icorem6 +F: board/engicam/imx6q F: include/configs/imx6-engicam.h F: configs/imx6qdl_icore_mmc_defconfig F: configs/imx6qdl_icore_nand_defconfig +F: configs/imx6qdl_icore_rqs_defconfig F: arch/arm/dts/imx6qdl-icore.dtsi F: arch/arm/dts/imx6q-icore.dts F: arch/arm/dts/imx6dl-icore.dts +F: arch/arm/dts/imx6qdl-icore-rqs.dtsi +F: arch/arm/dts/imx6q-icore-rqs.dts +F: arch/arm/dts/imx6dl-icore-rqs.dts diff --git a/board/engicam/geam6ul/Makefile b/board/engicam/imx6q/Makefile similarity index 80% rename from board/engicam/geam6ul/Makefile rename to board/engicam/imx6q/Makefile index 0e367e2..ef2fb6a 100644 --- a/board/engicam/geam6ul/Makefile +++ b/board/engicam/imx6q/Makefile @@ -3,4 +3,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := geam6ul.o +obj-y := imx6q.o diff --git a/board/engicam/icorem6_rqs/README b/board/engicam/imx6q/README similarity index 71% rename from board/engicam/icorem6_rqs/README rename to board/engicam/imx6q/README index 97e978c..3f3478c 100644 --- a/board/engicam/icorem6_rqs/README +++ b/board/engicam/imx6q/README @@ -1,9 +1,12 @@ -How to use U-Boot on Engicam i.CoreM6 RQS Solo/DualLite and Quad/Dual Starter Kit: ----------------------------------------------------------------------------------- +Hsow to use U-Boot on Engicam i.CoreM6 (RQS) Solo/DualLite/Quad/Dual Starter Kit: +-------------------------------------------------------------------------------- $ make mrproper -- Configure U-Boot for Engicam i.CoreM6 RQS Quad/Dual/Solo/DualLite: +- Configure U-Boot for Engicam i.CoreM6 Quad/Duali/Solo/DualLite: +$ make imx6qdl_icore_mmc_defconfig + +- Configure U-Boot for Engicam i.CoreM6 RQS Quad/Duali/Solo/DualLite: $ make imx6qdl_icore_rqs_defconfig - Build U-Boot diff --git a/board/engicam/icorem6/icorem6.c b/board/engicam/imx6q/imx6q.c similarity index 97% rename from board/engicam/icorem6/icorem6.c rename to board/engicam/imx6q/imx6q.c index a967ccd..bb0c866 100644 --- a/board/engicam/icorem6/icorem6.c +++ b/board/engicam/imx6q/imx6q.c @@ -25,13 +25,12 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_NAND_MXS - #define GPMI_PAD_CTRL0 (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP) #define GPMI_PAD_CTRL1 (PAD_CTL_DSE_40ohm | PAD_CTL_SPEED_MED | \ PAD_CTL_SRE_FAST) #define GPMI_PAD_CTRL2 (GPMI_PAD_CTRL0 | GPMI_PAD_CTRL1) -iomux_v3_cfg_t gpmi_pads[] = { +static iomux_v3_cfg_t gpmi_pads[] = { IOMUX_PADS(PAD_NANDF_CLE__NAND_CLE | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), IOMUX_PADS(PAD_NANDF_ALE__NAND_ALE | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), IOMUX_PADS(PAD_NANDF_WP_B__NAND_WP_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), @@ -190,3 +189,10 @@ void setup_display(void) writel(reg, &iomux->gpr[3]); } #endif /* CONFIG_VIDEO_IPUV3 */ + +#ifdef CONFIG_ENV_IS_IN_MMC +int board_mmc_get_env_dev(int devno) +{ + return devno - 1; +} +#endif diff --git a/board/engicam/icorem6/Kconfig b/board/engicam/imx6ul/Kconfig similarity index 72% rename from board/engicam/icorem6/Kconfig rename to board/engicam/imx6ul/Kconfig index 4a1c9ac..e91dd15 100644 --- a/board/engicam/icorem6/Kconfig +++ b/board/engicam/imx6ul/Kconfig @@ -1,7 +1,7 @@ -if TARGET_MX6Q_ICORE +if TARGET_MX6UL_ENGICAM config SYS_BOARD - default "icorem6" + default "imx6ul" config SYS_VENDOR default "engicam" diff --git a/board/engicam/isiotmx6ul/MAINTAINERS b/board/engicam/imx6ul/MAINTAINERS similarity index 69% rename from board/engicam/isiotmx6ul/MAINTAINERS rename to board/engicam/imx6ul/MAINTAINERS index 9b66c8d..37f84f8 100644 --- a/board/engicam/isiotmx6ul/MAINTAINERS +++ b/board/engicam/imx6ul/MAINTAINERS @@ -1,11 +1,14 @@ -ISIOTMX6UL BOARD +MX6UL_ENGICAM BOARD M: Jagan Teki S: Maintained -F: board/engicam/isiotmx6ul +F: board/engicam/imx6ul F: include/configs/imx6-engicam.h -F: configs/imx6ul_isiot_mmc_defconfig +F: configs/imx6ul_geam_mmc_defconfig +F: configs/imx6ul_geam_nand_defconfig F: configs/imx6ul_isiot_emmc_defconfig +F: configs/imx6ul_isiot_mmc_defconfig F: configs/imx6ul_isiot_nand_defconfig +F: arch/arm/dts/imx6ul-geam-kit.dts F: arch/arm/dts/imx6ul-isiot.dtsi F: arch/arm/dts/imx6ul-isiot-mmc.dts F: arch/arm/dts/imx6ul-isiot-emmc.dts diff --git a/board/engicam/icorem6/Makefile b/board/engicam/imx6ul/Makefile similarity index 80% rename from board/engicam/icorem6/Makefile rename to board/engicam/imx6ul/Makefile index 9ec9ecd..c78c7e4 100644 --- a/board/engicam/icorem6/Makefile +++ b/board/engicam/imx6ul/Makefile @@ -3,4 +3,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y := icorem6.o +obj-y := imx6ul.o diff --git a/board/engicam/icorem6/README b/board/engicam/imx6ul/README similarity index 74% rename from board/engicam/icorem6/README rename to board/engicam/imx6ul/README index 3779e96..1e85f61 100644 --- a/board/engicam/icorem6/README +++ b/board/engicam/imx6ul/README @@ -1,10 +1,13 @@ -How to use U-Boot on Engicam i.CoreM6 Solo/DualLite and Quad/Dual Starter Kit: ------------------------------------------------------------------------------ +Hsow to use U-Boot on Engicam GEAM6UL and Is.IoT MX6UL Starter Kit: +------------------------------------------------------------------- $ make mrproper -- Configure U-Boot for Engicam i.CoreM6 Quad/Dual/Solo/DualLite: -$ make imx6qdl_icore_mmc_defconfig +- Configure U-Boot for Engicam GEAM6UL: +$ make imx6ul_geam_mmc_defconfig + +- Configure U-Boot for Engicam Is.IoT MX6UL: +$ make imx6ul_isiot_mmc_defconfig - Build U-Boot $ make diff --git a/board/engicam/geam6ul/geam6ul.c b/board/engicam/imx6ul/imx6ul.c similarity index 95% rename from board/engicam/geam6ul/geam6ul.c rename to board/engicam/imx6ul/imx6ul.c index 23e7e4b..a903a36 100644 --- a/board/engicam/geam6ul/geam6ul.c +++ b/board/engicam/imx6ul/imx6ul.c @@ -7,6 +7,7 @@ */ #include +#include #include #include @@ -88,3 +89,11 @@ void setup_gpmi_nand(void) setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK); } #endif /* CONFIG_NAND_MXS */ + +#ifdef CONFIG_ENV_IS_IN_MMC +int board_mmc_get_env_dev(int devno) +{ + /* dev 0 for SD/eSD, dev 1 for MMC/eMMC */ + return (devno == 0) ? 0 : 1; +} +#endif diff --git a/board/engicam/isiotmx6ul/Kconfig b/board/engicam/isiotmx6ul/Kconfig deleted file mode 100644 index 10c2c50..0000000 --- a/board/engicam/isiotmx6ul/Kconfig +++ /dev/null @@ -1,12 +0,0 @@ -if TARGET_MX6UL_ISIOT - -config SYS_BOARD - default "isiotmx6ul" - -config SYS_VENDOR - default "engicam" - -config SYS_CONFIG_NAME - default "imx6-engicam" - -endif diff --git a/board/engicam/isiotmx6ul/Makefile b/board/engicam/isiotmx6ul/Makefile deleted file mode 100644 index f4f8c78..0000000 --- a/board/engicam/isiotmx6ul/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (C) 2016 Amarula Solutions B.V. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y := isiotmx6ul.o diff --git a/board/engicam/isiotmx6ul/README b/board/engicam/isiotmx6ul/README deleted file mode 100644 index 1d177ac..0000000 --- a/board/engicam/isiotmx6ul/README +++ /dev/null @@ -1,28 +0,0 @@ -How to use U-Boot on Engicam Is.IoT MX6UL Starter Kit: ------------------------------------------------------ - -- Configure U-Boot for Engicam Is.IoT MX6UL - -$ make mrproper -$ make imx6ul_isiot_mmc_defconfig -$ make - -This will generate the SPL image called SPL and the u-boot-dtb.img. - -- Flash the SPL image into the micro SD card: - -sudo dd if=SPL of=/dev/mmcblk0 bs=1k seek=1; sync - -- Flash the u-boot-dtb.img image into the micro SD card: - -sudo dd if=u-boot-dtb.img of=/dev/mmcblk0 bs=1k seek=69; sync - -- Jumper settings: - -MMC Boot: JM3 Closed - -- Connect the Serial cable between the Starter Kit and the PC for the console. -(J28 is the Linux Serial console connector) - -- Insert the micro SD card in the board, power it up and U-Boot messages should -come up. diff --git a/board/engicam/isiotmx6ul/isiotmx6ul.c b/board/engicam/isiotmx6ul/isiotmx6ul.c deleted file mode 100644 index 05d23c2..0000000 --- a/board/engicam/isiotmx6ul/isiotmx6ul.c +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Copyright (C) 2016 Amarula Solutions B.V. - * Copyright (C) 2016 Engicam S.r.l. - * Author: Jagan Teki - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "../common/board.h" - -DECLARE_GLOBAL_DATA_PTR; - -#ifdef CONFIG_NAND_MXS - -#define GPMI_PAD_CTRL0 (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP) -#define GPMI_PAD_CTRL1 (PAD_CTL_DSE_40ohm | PAD_CTL_SPEED_MED | \ - PAD_CTL_SRE_FAST) -#define GPMI_PAD_CTRL2 (GPMI_PAD_CTRL0 | GPMI_PAD_CTRL1) - -static iomux_v3_cfg_t const nand_pads[] = { - IOMUX_PADS(PAD_NAND_DATA00__RAWNAND_DATA00 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_DATA01__RAWNAND_DATA01 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_DATA02__RAWNAND_DATA02 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_DATA03__RAWNAND_DATA03 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_DATA04__RAWNAND_DATA04 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_DATA05__RAWNAND_DATA05 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_DATA06__RAWNAND_DATA06 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_DATA07__RAWNAND_DATA07 | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_CLE__RAWNAND_CLE | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_ALE__RAWNAND_ALE | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_CE0_B__RAWNAND_CE0_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_RE_B__RAWNAND_RE_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_WE_B__RAWNAND_WE_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_WP_B__RAWNAND_WP_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), - IOMUX_PADS(PAD_NAND_READY_B__RAWNAND_READY_B | MUX_PAD_CTRL(GPMI_PAD_CTRL2)), -}; - -void setup_gpmi_nand(void) -{ - struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; - - /* config gpmi nand iomux */ - SETUP_IOMUX_PADS(nand_pads); - - clrbits_le32(&mxc_ccm->CCGR4, - MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK | - MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK | - MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK | - MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK | - MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK); - - /* - * config gpmi and bch clock to 100 MHz - * bch/gpmi select PLL2 PFD2 400M - * 100M = 400M / 4 - */ - clrbits_le32(&mxc_ccm->cscmr1, - MXC_CCM_CSCMR1_BCH_CLK_SEL | - MXC_CCM_CSCMR1_GPMI_CLK_SEL); - clrsetbits_le32(&mxc_ccm->cscdr1, - MXC_CCM_CSCDR1_BCH_PODF_MASK | - MXC_CCM_CSCDR1_GPMI_PODF_MASK, - (3 << MXC_CCM_CSCDR1_BCH_PODF_OFFSET) | - (3 << MXC_CCM_CSCDR1_GPMI_PODF_OFFSET)); - - /* enable gpmi and bch clock gating */ - setbits_le32(&mxc_ccm->CCGR4, - MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK | - MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK | - MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK | - MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK | - MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK); - - /* enable apbh clock gating */ - setbits_le32(&mxc_ccm->CCGR0, MXC_CCM_CCGR0_APBHDMA_MASK); -} -#endif /* CONFIG_NAND_MXS */ - -#ifdef CONFIG_ENV_IS_IN_MMC -int board_mmc_get_env_dev(int devno) -{ - /* dev 0 for SD/eSD, dev 1 for MMC/eMMC */ - return (devno == 0) ? 0 : 1; -} -#endif - -#ifdef CONFIG_SPL_BUILD -#include - -#ifdef CONFIG_ENV_IS_IN_MMC -void board_boot_order(u32 *spl_boot_list) -{ - u32 bmode = imx6_src_get_boot_mode(); - u8 boot_dev = BOOT_DEVICE_MMC1; - - switch ((bmode & IMX6_BMODE_MASK) >> IMX6_BMODE_SHIFT) { - case IMX6_BMODE_SD: - case IMX6_BMODE_ESD: - /* SD/eSD - BOOT_DEVICE_MMC1 */ - break; - case IMX6_BMODE_MMC: - case IMX6_BMODE_EMMC: - /* MMC/eMMC */ - boot_dev = BOOT_DEVICE_MMC2; - break; - default: - /* Default - BOOT_DEVICE_MMC1 */ - printf("Wrong board boot order\n"); - break; - } - - spl_boot_list[0] = boot_dev; -} -#endif -#endif /* CONFIG_SPL_BUILD */ diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 31cf1e6..256ccb9 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_TARGET_MX6Q_ICORE=y +CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/imx6qdl_icore_nand_defconfig b/configs/imx6qdl_icore_nand_defconfig index ab8b6d2..21cfb85 100644 --- a/configs/imx6qdl_icore_nand_defconfig +++ b/configs/imx6qdl_icore_nand_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_TARGET_MX6Q_ICORE=y +CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y # CONFIG_CMD_BMODE is not set diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index 1e57deb..6cf9852 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_TARGET_MX6Q_ICORE_RQS=y +CONFIG_TARGET_MX6Q_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/imx6ul_geam_mmc_defconfig b/configs/imx6ul_geam_mmc_defconfig index c147d4a..b2ac4a2 100644 --- a/configs/imx6ul_geam_mmc_defconfig +++ b/configs/imx6ul_geam_mmc_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_TARGET_MX6UL_GEAM=y +CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/imx6ul_geam_nand_defconfig b/configs/imx6ul_geam_nand_defconfig index 4e51892..d920af7 100644 --- a/configs/imx6ul_geam_nand_defconfig +++ b/configs/imx6ul_geam_nand_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_TARGET_MX6UL_GEAM=y +CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y # CONFIG_CMD_BMODE is not set diff --git a/configs/imx6ul_isiot_emmc_defconfig b/configs/imx6ul_isiot_emmc_defconfig index 5f8a574..72ae08e 100644 --- a/configs/imx6ul_isiot_emmc_defconfig +++ b/configs/imx6ul_isiot_emmc_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_TARGET_MX6UL_ISIOT=y +CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/imx6ul_isiot_mmc_defconfig b/configs/imx6ul_isiot_mmc_defconfig index 367dfa1..ffd12bf 100644 --- a/configs/imx6ul_isiot_mmc_defconfig +++ b/configs/imx6ul_isiot_mmc_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_TARGET_MX6UL_ISIOT=y +CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y diff --git a/configs/imx6ul_isiot_nand_defconfig b/configs/imx6ul_isiot_nand_defconfig index dde1cc2..aaaf9e6 100644 --- a/configs/imx6ul_isiot_nand_defconfig +++ b/configs/imx6ul_isiot_nand_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_TARGET_MX6UL_ISIOT=y +CONFIG_TARGET_MX6UL_ENGICAM=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y # CONFIG_CMD_BMODE is not set From patchwork Mon Nov 20 18:32:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839669 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jULHWVb7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygcrc0t5Lz9s71 for ; Tue, 21 Nov 2017 05:37:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AD358C22007; Mon, 20 Nov 2017 18:36:13 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 EF913C220E8; Mon, 20 Nov 2017 18:34:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D8292C220E8; Mon, 20 Nov 2017 18:33:03 +0000 (UTC) Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by lists.denx.de (Postfix) with ESMTPS id A28EFC21F69 for ; Mon, 20 Nov 2017 18:32:59 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id j16so8028870pgn.9 for ; Mon, 20 Nov 2017 10:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C8cf5wak/6YQmCiEzzP9QBXoTYYJ0Yr+uBbwww0kAII=; b=jULHWVb7Zt42x/ryE7HoXRXDg3PkS9t36mHlTxVSdB9QYTFGuCsT7Ba4VLP5fnGwSV Y01vVLvGsyD/NR2stq7Duspg4P5JNNR6o3UO5VIooVHgwzNbVVMLB6ayUMxcMJ+jN2g5 xgzWIslPM8OajqGeBgpUr538YtCkkQlFIxZcbV/X4XSkweGgd7GSt7cmfXOtsc96+62N AQ7VWncAN9uhiO4c/tBfmupnQIrf1QndKAYslRdnVhPjJ8/yl/HNaHEWJFbt5JsDLp+2 Jcy7Ph5uodzrBfJdpF5MURvrJN2HTBp23LONUjlZpwtKghMWP7PytXFURduOuqBrfihM RDmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C8cf5wak/6YQmCiEzzP9QBXoTYYJ0Yr+uBbwww0kAII=; b=iVSiAJ11kdXoIqALsV6H/yA9YTHl//iA85sPdxnnQpmy32gAD8lZarToOZmlFRREWZ PhOC1iwlup/7KqvcO+a8KZft0SdSgSokk5PmCKTwEIf9rQMfG22cWNLc5DISh9K1qPLe 3QVtSD669UJeBew8Cl1qjHl9h9YQsE6FEDZboM1MMPj79Ic+5kGEuCrpU11adTVsj+Eo NFb8GLEOQAAbFSpfSWLAbHXobh8lu8EMXdthVDnWHw64XBtOkrkn22ByHTaloz+VIlO9 p8M1HsdwPf52mToOzQk0fb0wsLL9Y7OYWMpre+gA5zzU5wsgtJ/1OUCB1EE4r/cKWWpX 7PJQ== X-Gm-Message-State: AJaThX4fQreq80E536K04OgVRym0+LAal8UdXCLb1FsopjR7g7Tepdbh SrtvgVS5btPJfZ4Vf6FBSS0= X-Google-Smtp-Source: AGs4zMZKilpsN97d4Dewu3tQkGHHwTyIyp9Hic2ocDuTr0tVOs/1Cm5Cu1U6O4amKnkELmuLZXu3jA== X-Received: by 10.159.197.1 with SMTP id bj1mr14945282plb.219.1511202778198; Mon, 20 Nov 2017 10:32:58 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:32:57 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:17 +0530 Message-Id: <1511202738-17448-9-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 8/9] engicam: imx6q: Return mmc dev 0 for icore 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" icorem6 has sd on usdhci1 which is devno 0 so return proper devno from board_mmc_get_env_dev for icorem6 and icorem_6rqs Signed-off-by: Jagan Teki --- board/engicam/imx6q/imx6q.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/engicam/imx6q/imx6q.c b/board/engicam/imx6q/imx6q.c index bb0c866..fe37088 100644 --- a/board/engicam/imx6q/imx6q.c +++ b/board/engicam/imx6q/imx6q.c @@ -193,6 +193,7 @@ void setup_display(void) #ifdef CONFIG_ENV_IS_IN_MMC int board_mmc_get_env_dev(int devno) { - return devno - 1; + /* i.CoreM6 RQS has USDHC3 for SD and USDHC4 for eMMC */ + return (devno == 0) ? 0: (devno - 1); } #endif From patchwork Mon Nov 20 18:32:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 839667 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 (mailfrom) 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="MNpS6tlC"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3ygcqz21wmz9sRn for ; Tue, 21 Nov 2017 05:36:31 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CE510C21FF6; Mon, 20 Nov 2017 18:34:47 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID 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 3FF65C220E8; Mon, 20 Nov 2017 18:34:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9CB2DC21FF6; Mon, 20 Nov 2017 18:33:07 +0000 (UTC) Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by lists.denx.de (Postfix) with ESMTPS id 9B2FEC220E8 for ; Mon, 20 Nov 2017 18:33:03 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id c123so8023517pga.11 for ; Mon, 20 Nov 2017 10:33:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pPbLF3eWnzJsem2ECXC6eb1hBZBcr/M7kvuSUQQ0klw=; b=MNpS6tlCK0EFEYGi7O2hT5laAAgt9Z5LwqGFkDa3GdnT0QWwbjqCGE6b66KWneg9Bu lAGKOK9fPaMLrHBSfcpbYfXMxjwBCE9C7or9PgayavuPXanwdBVRutbtkWRJJCncoVm2 HAKUj5Ed3ptT3HPHGXoYYaN+bc9SPEfzHZwELtuNzjrKzjULg+Gqo+GHpooD6XKOzlmt ULL1Oe/MnQQmlNIy47+EAc2Q2pbDdDXX/7sH4wp8O6b+R/TvM2mpai6P3hso3KqHnVNa GWyQLkc2ANo1JkHmmi+pu/dqDIv4oQ9a/5O4evkLfwgl+7DMAQleD0GureZ5tE1jSVze Watg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=pPbLF3eWnzJsem2ECXC6eb1hBZBcr/M7kvuSUQQ0klw=; b=ny/WBEsu4BmhPrghhu3dnZD0zHNstLF5VGekXvVqX7vs3XmxFjxu3ue6lMMa0X+MJv JIO+F3+6Yl1X0hNquTIJB3TJMR/IAhzt6KHNihBxPeXfj2gqN9ziQSE6sa0n1etzCnPw RJiEtHMraUv6e+rtSKeoCg+yNEIn7FK3ObBdZjzNoCiFzz1P4ix3uzFanoxEG8EuRjxd 1y/jz6Qlk9FEqNDYQtez+Ggbvuaq0lVs2L6kYmCDJAVSM0wSy6Gp8iu3THFqZUo2CWLZ 0JDdbhbpA35EoSKq2zuRaSqnMzZ+aabz8ydhsVZBzxx+/TPvErclbBw3M8uiqKbk7t1Y Ly/w== X-Gm-Message-State: AJaThX7Cm5ns3tH1Wz7dGnKWlO2swOOTMkxTTFV8jpRA0Rk4AIvG4zDh MY2uXRhJW3J8sabJyBUgNTw= X-Google-Smtp-Source: AGs4zMY7igwfAb2NmdB+xNx/Uf6M4noiPFbRn3DeDeEqYJHu1LoaW877PdUKgLrPZiCp0gRQdYkDAw== X-Received: by 10.101.69.203 with SMTP id m11mr13904013pgr.200.1511202782217; Mon, 20 Nov 2017 10:33:02 -0800 (PST) Received: from localhost.localdomain ([115.97.180.212]) by smtp.gmail.com with ESMTPSA id y7sm19493334pfy.144.2017.11.20.10.32.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 10:33:01 -0800 (PST) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Tue, 21 Nov 2017 00:02:18 +0530 Message-Id: <1511202738-17448-10-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> References: <1511202738-17448-1-git-send-email-jagan@amarulasolutions.com> Cc: Fabio Estevam , u-boot@lists.denx.de, Matteo Lisi Subject: [U-Boot] [PATCH v3 9/9] configs: icore-rqs: Enable falcon mode 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Jagan Teki --- configs/imx6qdl_icore_rqs_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index 6cf9852..aaf9646 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -16,6 +16,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y CONFIG_SPL_EXT_SUPPORT=y +CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl-rqs> " CONFIG_CRC32_VERIFY=y