From patchwork Fri Feb 15 22:20:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043221 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SR429vVz9s3l for ; Sat, 16 Feb 2019 09:21:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A80B6C21EB9; Fri, 15 Feb 2019 22:21:25 +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=SPF_HELO_PASS 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 2ED70C21F76; Fri, 15 Feb 2019 22:21:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2D8C7C21ECC; Fri, 15 Feb 2019 22:21:21 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 6142BC21EB9 for ; Fri, 15 Feb 2019 22:21:20 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LvBqe-1h3Brx12SQ-010Jcn; Fri, 15 Feb 2019 23:21:11 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:17 +0100 Message-Id: <20190215222039.10005-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:eWlQzyFcar2dNq6tYw/FfR70X3vEJsNmYrpGbCkcPLnUS1EQaaz KYbuOyz6w6zpKu8J23nBfo4Y+wpNcitdLHJ/0dfH/2zrASbwgwdfjulUTYhYKlLvDvSQl9m 6bVfcikauDDfYxPn09xAhF7lCHFNx2SX2amilTCipP1wNmpe+ftDZot2jPybVeJ1516y3lK eczssVzK1D2gbGKJI3UVg== X-UI-Out-Filterresults: notjunk:1; V03:K0:boRVxnUimD8=:mdzpfFVbnt61FjHSSqSuZl VCXZDBtIt4tEJtPRApMqk7UjBD3D/o4jPt8+FONZ1tlo0VQ0FvA0hmKr29+bllGK79Kb5Op2H Fsp/nfuDhgmbur5bTxfRKpIZaRbFmyGDRgv5eeVUbJkJPzOdHtNUer7fnvhjeBi8D2wSvMIjI 3BlK2iszF4Vy4OvIxgVrk1XGGqswJhavI9sZRXUKizxhF2H3rI8DEPJjtcazsCRJbM6teZzqs DHFLOPGKSdJSo33ucU3pC7hCcj2eTiKcXJDrXn1xY/ix50bzLpF557ZIeuj6nxZCCLPw81lRg wJ7N2KOzgHiZ+zVWY0F/W4xaHYtVRcBuDDLlzNLwDUan2VAMNxQ4xpSk88j9KMXrcNvxQLIMM RdTUNxHxPJ8EekFWbNhGrV0GB8lmwHizN9T5/o0RB+tsp8T+vzTF4HpYwbMBsDxCfu+JlNIT6 grFsJgi773wcuxXN31vH2rqOuku/sPHpBOSVjrhDFGGz0biP0zNNEAIW/DUrO+KzJ2LsjK8TI ZePDfhurw3Oo5nMjm1hd8ff5/Uqs05OkrYucWdGkItT5haYDAGCYPnzYkpurlGaYVOFNsmC6Z uIW6grAGeRRQGZ1vRydndPHJmA/MhVqvr0n/rjctEKdIg2Oq1rsE6VMgWBc16mBjpj+MFVVVB andk4GIAQChTRzf4BClLPQKnNaqCAsHYWpLuiNhnyWl7Dk+/cK7XpUXgL4IpZg6FcKBNdlWc8 P0dkEIC7hI6dYF5HLkkqqzlS2e6a1DT7V5ZTgg== Cc: Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v1 01/22] add missing space in comment X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Spottet two missing spaces in comments. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 2 +- drivers/video/videomodes.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/freescale/imx8qxp_mek/imx8qxp_mek.c b/board/freescale/imx8qxp_mek/imx8qxp_mek.c index a4c587a390..63cd605b6a 100644 --- a/board/freescale/imx8qxp_mek/imx8qxp_mek.c +++ b/board/freescale/imx8qxp_mek/imx8qxp_mek.c @@ -112,7 +112,7 @@ void build_info(void) sc_misc_build_info(-1, &sc_build, &sc_commit); if (!sc_build) { printf("SCFW does not support build info\n"); - sc_commit = 0; /* Display 0 when the build info is not supported*/ + sc_commit = 0; /* Display 0 when the build info is not supported */ } printf("Build: SCFW %x\n", sc_commit); } diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c index 1cfeaa980f..d7614329ff 100644 --- a/drivers/video/videomodes.c +++ b/drivers/video/videomodes.c @@ -397,7 +397,7 @@ int video_edid_dtd_to_ctfb_res_modes(struct edid_detailed_timing *t, EDID_DETAILED_TIMING_VERTICAL_BLANKING(*t) == 0 || EDID_DETAILED_TIMING_HSYNC_OFFSET(*t) == 0 || EDID_DETAILED_TIMING_VSYNC_OFFSET(*t) == 0 || - /* 3d formats are not supported*/ + /* 3d formats are not supported */ EDID_DETAILED_TIMING_FLAG_STEREO(*t) != 0) return -EINVAL; From patchwork Fri Feb 15 22:20:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043224 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SS33q29z9s3l for ; Sat, 16 Feb 2019 09:22:27 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 19B5AC22026; Fri, 15 Feb 2019 22:21:55 +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=SPF_HELO_PASS 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 257D7C220DB; Fri, 15 Feb 2019 22:21:36 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8CDECC220FD; Fri, 15 Feb 2019 22:21:29 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id D5816C22075 for ; Fri, 15 Feb 2019 22:21:25 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M0BFi-1hDfiW41nA-00uHl9; Fri, 15 Feb 2019 23:21:13 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:18 +0100 Message-Id: <20190215222039.10005-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:1y3bfYRqM4FZk7zJvoNQaLgKkcNt8OyyNfkkRZe2h3dFtWsMSOi 2NYxysdFw1bFsDBeW3DXE0axV9UIrw/UMwrSswzvKJmwngkXZ6/QZu043lOpoJFG1N2Mevr kKRjSC0182+jmCPZgc2AGgm182nvCFHWoPFLh7en/Fa01WHNebrnmfTPjHGblUDfhnt5mIW h2tN2aQgAbV0SxFgVG0dA== X-UI-Out-Filterresults: notjunk:1; V03:K0:yxvQMWKwN2o=:fUyeh1uxBUVFVUqRvxfIJ8 XLab8O5LanmFdEgTbd0kczFpHpSqElzWi8LIid6U2awfVkyIB9zKXjDvo/wvMcxPz1+7bYYyv 9Lh7WwFhY1P2WSQ3jwAa8wgcQo4ty/G3a37SfgQbokyPaK8Z4thWZ+UIDOliQ3swSnNr7k8q9 kLaPOWtHZMineyVPjYqJM4HXHHGfUFjFaj5iX2AOmHXPBZJm6WMjPoyEwE4dmuIabVLptMwoE gSn9bQvi7DRbz/spMZy8ja0/nbRABfHmPwebZT7Hg7vzpjOYO0dbh6ZQnliOkKVoytS0HSdG5 xxaT+duZzW5y74niy/D9R0G/xVkDJ+ild9kltD/HQcYdLxKV0YWNnMsDXCNdL1TFrCOfinqkG lr0byZTQlpICCasmQNfZHW0FG7pS4947S2ABd+IbFGYdpP6fKWn43CW173jhxPVGTVts1IFm8 REEF/h8a7UmCNQuo+my/m9c951K4vzRp6wwxAl7udgXzYtwkfSypqynG7Pp66M3HPEGEiGJiH qwK/657w4h+VUKiuYE8uwu49WJ4LR7eOFHIbXQlE95v95Eo4KsokhynWHDT/jZWqeHkNRfG7w W4fyupo0gU1FUUJIeXPiI0zEJSI2T9D2ThRUvre+ISg30GxyMXoO1kLecejuNkcl7Wxw8oXlq Sy/CN7kyUbTrQdhtAZPnvCtG+iJxHAEPyo+jfxyllmfF+xADHMsqxXp9qdTJYyI+uMWM/v4Zw gYVbmkW0nSVs5KIZ5cOyyZVHfcSmAl8gHWvGlA== Cc: Marcel Ziswiler , Sanchayan Maity , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v1 02/22] vf610: ddrmc: add missing include X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler The DDR memory controller include file for the Vybrid uses iomux_v3_cfg_t without actually including iomux-vf610.h. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- arch/arm/include/asm/arch-vf610/ddrmc-vf610.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h index c7da2b8a5e..03e3cecb95 100644 --- a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h +++ b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h @@ -10,6 +10,8 @@ #ifndef __ASM_ARCH_VF610_DDRMC_H #define __ASM_ARCH_VF610_DDRMC_H +#include + struct ddr3_jedec_timings { u8 tinit; u32 trst_pwron; From patchwork Fri Feb 15 22:20:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043227 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441STl6w17z9s3l for ; Sat, 16 Feb 2019 09:23:55 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9014CC22058; Fri, 15 Feb 2019 22:22:23 +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=SPF_HELO_PASS 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 19A01C22108; Fri, 15 Feb 2019 22:21:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7CEE7C22051; Fri, 15 Feb 2019 22:21:31 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id C5179C22079 for ; Fri, 15 Feb 2019 22:21:27 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LeKz5-1hQTVn2eD7-00qB8Y; Fri, 15 Feb 2019 23:21:15 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:19 +0100 Message-Id: <20190215222039.10005-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:39A1/0KoXeshc4FDc/2xP0CgZywt1L9HO8d6KKHo/qunAMR47bD lDWTwKwb0D4uZ2Nu0Cffg9z7bfo2BLYiOubaAsyOKyhV13RyH1t/4JTy8Itjj9Oh7mJhCO2 eo/EKbFAyIgYkU6ik2ne41DNAf2dMSDTZimu2HcXsc9Ac4ku4vPLlCklMUOlmp45sPZHrS6 QUKIa+fbjpHScHaV0tzug== X-UI-Out-Filterresults: notjunk:1; V03:K0:uSTieSs/y5g=:0IvXzD0HPTpWf3SYjKfCZU mBmsv53fLhd+vAsLvCGk6fZKLQ0cJCDz+GRD9WYDPil6+qTKHDnhIiSBHI5oGmCopFu5E8UsX ycOyNlBaCQkdB7hU5VDnU948o1gGNnBnkm4EYN0ptweCgzWN8UYkjRXM1uvJK0iqhGLp7B9x5 FQxy39Yqr4ez66VFRqf4yGdgBcRqzvln4L/XmeFQRlrXAp4JnQoXk2gCV1/byuCN4UdsDMTIe qNOPYqzD8gFF65PhWr3aZNZstiHekMBwoK9JUOoR8ZEPoHK/BGKtmHUipyuXpWzxtrhvdqH2r W62lyo1n/sVotGJa6aK0bYqgd239UbqeUdP+B3rr4f3edTMvp0zIM8s/PFlqBwh2Mq7LRl6Qn rkCAQaOdB6WVoa/K3QjQe3DqVsHZMGyUxQaYSFnSmmyEmi5R9bc0SoYp+nbJIDyyRzknxC3eY Rx88d+aXjQjqu4JikV2zTFdBmILKTQpdcPWXoDdBu4mU01Kn/n67zuP/kvG7X5BNVHEeIhL4l lIowsbMG3th0JZt1XGGyTrJWsOGuK/Kj8dmpU+8xw6EjOsfJwvH99jZIvHlcffXdAgZksPy3L ebVDIcpve5SGYqk2ZbpgrU5agjcra+djR8sfCNXELd9CyxqevxMUfqacuOqneDahBaRtleRsi RQZOi7JfsWfgHXVo6J+jc7XEeaqvwFudIELGTdxfpeuJBshIB5wuVeY9sLOStLwtxSb8z2Ovi CkLtc6uaC2eEz/QXLVfjWYfAgRHY87Y3AqB+Dg== Cc: Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v1 03/22] imx: bootaux: add dependency on vf610 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Allow using bootaux also on VF610 aka Vybrid. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- arch/arm/mach-imx/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index a1566cc2ad..313a886c6b 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -23,7 +23,7 @@ config IMX_RDC config IMX_BOOTAUX bool "Support boot auxiliary core" - depends on ARCH_MX7 || ARCH_MX6 + depends on ARCH_MX7 || ARCH_MX6 || ARCH_VF610 help bootaux [addr] to boot auxiliary core. From patchwork Fri Feb 15 22:20:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043237 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441Scs3Nnzz9s3l for ; Sat, 16 Feb 2019 09:30:05 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id F0B7FC22108; Fri, 15 Feb 2019 22:25: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=SPF_HELO_PASS 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 B00CEC220DB; Fri, 15 Feb 2019 22:22:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2E0CCC220B9; Fri, 15 Feb 2019 22:21:44 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 73FCBC220F5 for ; Fri, 15 Feb 2019 22:21:40 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lbs0o-1hKB3Z39Ai-00jKRL; Fri, 15 Feb 2019 23:21:18 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:20 +0100 Message-Id: <20190215222039.10005-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:2Uur8iTy7Zf5TrPLDkA2g5y/VPC9lvfiJPLFbFKBpT6XGyjh0oA uYaliGB1kzS6zgIeoK1DUEwZiB7ze3lNLX4fXbm+nAk5TsVjgSArjzriNKF69zU0W1ygUz3 86QaaEIGasvU0v8NvkZT5XnWTxYf90Q+sCCh7jGEWaqh3npVZV6QFfpyaHACV2yzduos9Dl AjlugUa+EHOvDo/fBv6hQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:YsRTxuzQMBY=:QICQ3Rd0eRlrXfyBr8CEDQ JiMnDtrBW7DF+dEuJbtq3MIKOypWK0k4C8u5E4La2LmsDDfEFQbBbYbbNJnKyQmhnbCfl04bx P08raiNWrteVdBHaOFUP2RxzKH0+4KLqwqLR4wZEU4o4W4a0XCtN/Y4PKfGM4nBwfD1b3WknW zTdz3Q1jm7UHWPT039p2YgQni9Z+UVgxGTUWsXjwMh7ruq27pfo8LvMoen866t1B0FIntfCjE 9rbJW4s0w37mSOsxP/X6bgc+9NTnJekWL/03gM/T2uuHb/YLrpkSxh+fqXNAfTz/JEEpFetXj n6p6/hRpfFkHY89MWUFss83lUzDt/BTf/YQYCUbNr6jPFMIenJJueEnVoOYYjmUWN0JI2V5jw scSgHgclPxFPGCGdEYhuu+A9jXqAVhB1UsrEwU2goX6JVvKmeUGDu3HIgXVM3nYOkEWUbUcN9 bD7EV5MlLif3peDcE1ofMut3cX6qxaI1KGbv4tIOM2rK8QBU4qN/2cG6ssU0DBqPeD9HkDHqJ cp6eOGbCoaolg8cHe2sN5Q09QQrRJg6DYyJhqpqr1ahmiibsu576gKeT1a0nfvNXjhrBDolKQ RkW+VvFr8JruxlXhgApYLb4nQgviM+EBShT9bc8dCunfa7GZTrW7zxAmO2sKcZACM65qN1UnL 2M2uJonSjMYgQafCCm6O9Pd+BNmMsMyhgeQEeXEJuJTFkMpNJO8jyBE2un6zJ20l+KpqhUo9T koonfiLFCQUXgftC9ub52uGya7P4wjbeO2yBrQ== Cc: Marek Vasut , Alexey Brodkin , Stephen Warren , Stefan Agner , Marcel Ziswiler , Michal Simek , Tuomas Tynkkynen Subject: [U-Boot] [PATCH v1 04/22] configs: move CONFIG_USB_EHCI_VF to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Move CONFIG_USB_EHCI_VF to drivers/usb/host/Kconfig and update the one and only user thereof being colibri_vf. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- drivers/usb/host/Kconfig | 7 +++++++ include/configs/colibri_vf.h | 1 - scripts/config_whitelist.txt | 1 - 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 60f37f40fd..6cda1cbfbd 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -154,6 +154,13 @@ config USB_EHCI_OMAP Enables support for the on-chip EHCI controller on OMAP3 and later SoCs. +config USB_EHCI_VF + bool "Support for Vybrid on-chip EHCI USB controller" + depends on ARCH_VF610 + default y + help + Enables support for the on-chip EHCI controller on Vybrid SoCs. + if USB_EHCI_MX7 config MXC_USB_OTG_HACTIVE diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 31ff8a00a6..2fe7f217fa 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -159,7 +159,6 @@ #endif /* USB Host Support */ -#define CONFIG_USB_EHCI_VF #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2b3572568b..9ca974bbae 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4533,7 +4533,6 @@ CONFIG_USB_EHCI_SPEAR CONFIG_USB_EHCI_TEGRA CONFIG_USB_EHCI_TXFIFO_THRESH CONFIG_USB_EHCI_VCT -CONFIG_USB_EHCI_VF CONFIG_USB_ETH_QMULT CONFIG_USB_ETH_SUBSET CONFIG_USB_EXT2_BOOT From patchwork Fri Feb 15 22:20:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043222 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SRk759Kz9s3l for ; Sat, 16 Feb 2019 09:22:10 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 75351C22116; Fri, 15 Feb 2019 22:21:38 +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=SPF_HELO_PASS 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 B5394C22049; Fri, 15 Feb 2019 22:21:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 238C1C21EB9; Fri, 15 Feb 2019 22:21:23 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 690D7C21EB9 for ; Fri, 15 Feb 2019 22:21:22 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MEVDT-1gsEch40UL-00FkOA; Fri, 15 Feb 2019 23:21:19 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:21 +0100 Message-Id: <20190215222039.10005-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:w1ucAhoeDAxzbZj2hkqc3x/3J+Cpj/8mqNRHqNcBRDpOgUqBYFf JAMOsniOSTyCCY43yb3b2vt36+5GhCGFDnMVZz/02tQrau7arlHclLwqA3NFVPp1YxJalZ9 c6/oAU+JmBYp/M0xVI4sGSe6qSgPWJ8ex1gwLfxHERAyLQsQVMGmWgOj3+fcbRq6tB6pDiV NxVwo9XOCY5qZN3Ja5XNw== X-UI-Out-Filterresults: notjunk:1; V03:K0:AtSfrAS6du8=:Y2kDkHgThOPxg5JAN4zklV Zkn0JjywKyy8ERPfW6FvfV9phQsH3fCtkmRWa69Ycl0EpZduJJQoY0+YylYqBeM5SIjcSfkag KXt1cYe98CB1G/h3nvk3xHA+bGzWD48BLWIQdkGYRimHN/s+eVfvDOv6WWBIv1+Nl+fzC1sN9 MFF58hToN0J/U5wQrIn9vNl9DwMjFYpg7BIZMfoDtXtRxmNx2KE+zghxH473N6P+bSBMtiHFG X1L1OO3R/XyfP7jsZHcpi3zPFb0U6YKY975+0wbNr1fSo5p3XHABcWm1k4uXgQm5EjQmPBRF9 JifxZyWz8ZK6WYCtofiCu1t+e7JRcp7vQ0JHJ2ewgcDKoAeuiGsvStAVlyM5KhRoSlpFgIw15 3kCZMLsqxM9MCHMVzGQsiIQ7pPu0+Y6X55UKS+rBzDBZyRL7ifVAKCYN+fglEnPI2c33MpHgT O67v+GjCjNk7WQEAq1FlvShvJ22Lhl5iNoO+15Xn2DpT6bY27g6KXD52QUZa87hnB6PlhNwT0 63tbfZ4ftgSwl/WVzmcnj0v9N05KqwD1UsZgYaG96Oo8SuxAilXvT/bs6wTBhXtECrUYw4xNn 3B+job9OfeRV4axlA7RaJ1J25AoGr+L0GW6csPcJvSe0u8u7FKeurCo/3S/1lvfdaWYRtzive 2+v1nzwTSiQXKFr45jJG2/7BDClrw4OayL6Uc1zotDMN448EJTyQAIWiqAgvaCHiEViuR0NYU p8tcGXyNhVFjDzKqql3eTEJef/MUsrq+POR+Uw== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 05/22] configs: colibri_vf: remove obsolete mmc/sd card environment X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Remove obsolete MMC/SD card environment configuration dating back to un-fused samples times. While at it also remove meanwhile spurious "USB Storage" comment. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- include/configs/colibri_vf.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 2fe7f217fa..7b974d9e97 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -145,13 +145,6 @@ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) /* Environment organization */ - -#ifdef CONFIG_ENV_IS_IN_MMC -#define CONFIG_SYS_MMC_ENV_DEV 0 -#define CONFIG_ENV_OFFSET (12 * 64 * 1024) -#define CONFIG_ENV_SIZE (8 * 1024) -#endif - #ifdef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_SIZE (64 * 2048) #define CONFIG_ENV_RANGE (4 * 64 * 2048) @@ -165,6 +158,4 @@ /* USB DFU */ #define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024) -/* USB Storage */ - #endif /* __CONFIG_H */ From patchwork Fri Feb 15 22:20:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043225 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SSJ1mH9z9s3l for ; Sat, 16 Feb 2019 09:22:40 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id DB782C220F0; Fri, 15 Feb 2019 22:22: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=SPF_HELO_PASS 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 A201DC220FA; Fri, 15 Feb 2019 22:21:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 173AFC22051; Fri, 15 Feb 2019 22:21:32 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 01D79C220FA for ; Fri, 15 Feb 2019 22:21:28 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M3TZW-1hCZn60JEG-00qzy7; Fri, 15 Feb 2019 23:21:20 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:22 +0100 Message-Id: <20190215222039.10005-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:2oTz2H5R6O64imJecz8rRZy88IfXOxYJaLdv8YWa6cs5u1Cb4Ri Kuxef77khGg6IqloMjzVWcel8eUvZ1zY/Vyp4RgjLySotE7MyycP4ikdK2SYpURqdwUv1xe Rx00ss34q10018WsaY4Mqa6phs7I6YnzcaydtngN7lzXyoy697s7utVxyOlmVE/jgVE3Zs/ ghJatyIV0MwnLn5U6JzmQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:SHPIrQ9xDOg=:5AyOLjwSTjtk/WnMyES9K1 e2SzFv26llKCXP1sTqR+i3SjlQcyyW697gKABNbWTQEcQYtsrS/89vJgxvFRG4bONYVoMLCIa Y04jlhlOJ2C5Z3hyqLOFpRBGCCy+PQkDOBPzsc24AFwMFPt4xfeSnKFs/nRL3Qh5klPegWE7S UYx2+NxoSgsf4e5QjmD0S+A9Xrby2YmoZQttuLYrtIsW6myq74J5YkuZDrL4MgZWQFQaLrLoI IfdoidLamS9DTq5U+VZ14Qsp4SxMncp8vLBXIfFvma3LEUTqrDodQvZH8tiKX/lP9rzGncsax juv/YB3NtXUw0D23jVyQc7fNiO+AOHmQz55pXPJ8asE8l/84uRSFHG0YrkjoKNCayIL4Azju1 rWad+ZLhUaWr2Wm65fzCqqJcdcDUgVhvWIBuXYGw1ae/vSPxHeZoWTJ1hyBc4kUFjYurPhae6 a9NwZo1nJCOrlBdTHZovJ/UEkGGPqaOy4YgBhx1KuFLQ+2sUnpCNg/J4NZDJziLHbLyQ+buWn M4Ze+YtUxGFKfxmbTp9bVQq2W1ex8w3K0l9Qd2ozy7Nkc+3ovjWymoa+4Mv+rVYIw+4Pn1G6l ESLlr9WlHkfCDhh4aOcte0phGE5BNJX78eQaVaBjzbaV87BuU3k/mj3YkL+HK2EowlqevOyWW nr54tDrF5ddRxuioD0dOQRwr5V7RWFiOkCzzXQlLZgQdsxlEQZXz0X/g1HOaCAjf7eEUiDvek 3F+bNiaQD4HSUe3ybUDCxU03r1ESAczCcPgUJg== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 06/22] configs: colibri_vf: limit size of malloc() pool before relocation X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Limit the size of the malloc() pool before relocation (SYS_MALLOC_F_LEN). Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- configs/colibri_vf_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 4192501257..8188582ed9 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -2,6 +2,7 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_VF610=y CONFIG_SYS_TEXT_BASE=0x3f401000 +CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_TARGET_COLIBRI_VF=y CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_NR_DRAM_BANKS=1 From patchwork Fri Feb 15 22:20:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043236 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441Scr1DDxz9sML for ; Sat, 16 Feb 2019 09:30:04 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E5B27C22047; Fri, 15 Feb 2019 22:28:07 +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=KHOP_BIG_TO_CC, SPF_HELO_PASS 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 68BEBC21FF4; Fri, 15 Feb 2019 22:27:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B2D85C220FF; Fri, 15 Feb 2019 22:22:00 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 9D263C220E1 for ; Fri, 15 Feb 2019 22:21:56 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MOh96-1gxVQ22TuY-006A9F; Fri, 15 Feb 2019 23:21:25 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:23 +0100 Message-Id: <20190215222039.10005-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:IwAPVmG/wXAeStqQDEG7fwijAsVUW14/dfrMgfBjeE2TWe13qhr QAp+gC2UibuBtjzj0HXXmW+iGscyJIgVqh15Kv+2o43xC0vBb8Ul1qPDi1+3KvCmXORPUFH f50WCvhSDAoPepOdBwZDZEsNs2cmmK0AOZdEHFaXAkoMCY93i39CeLILIacMss2TScFT+ZX RGuXwC2qoYcCnIcM5GlzA== X-UI-Out-Filterresults: notjunk:1; V03:K0:UpDbu4DsC4Q=:T7RzNS8MDGnnsNAKD5EN2u bZTT0sVriTDNfTP6vbt9aSYccYPX2bY7Ilm++lNRaqyQO4RQqys8I0ENTXybDXi9WAfIZKXuP n60s15uV9xq6Ykfw/ya1H99NYq1Y+vmLRrSBjS7QzGWHsXYOMM/ZValo/OQ+xaSoau0GMSsXC H3MmNDPvrITAFEwsyRtoAH+rA5lszJb/22jJdNwTrWP1BNPUdFGta86Kio84ezQdscBTGbCJY LPKmHB6cm0XKgEpJpPhp+gCD5lOZQpXlKiQKsbGXyZrQytlkMeGX0WODJhKuKhRQTJ3BsjGhf rqJzAfKq/AjvygWs4GMJONHtubJAV5ZvJG2OTJL4wdQdKPkTvb1PEC7/Ljg29LO9juwH7c1qy cBbsaRkkGto65ZoGwWlko2xU6ToQJg9vQIat80X78eMnC0jVne9gYs9WIH9qGx85EtJcCwcl2 g+NSTNfzzeEnuXLwO/c/UN1TCTeiaXzkChLNiAat3QygPFjH4TG+U0qDZyqwTr4Fwfx0f7X6T bBqDXXHILbQWMsZ1DuKAC9dqQakPJj/axPsuPRa9TLz6s8KuK9aatQQjQBylnQuCHpxPDIETv /cNPDyb0FVnPhH1NRSSPHRMz4QIW5chsYZBjbEu6AWD7HqvlFeF9Q53Ygps08qo+Jo4rhLMtb QKD8g/0xJJFl1khUL0GJEU2J2PrS6elDl1ZuVpPV3XCZRazB1gW6B7Fr3HnpzMMhVpeKHjgh/ 17fxJNh4Ar8PcxDKEw1w20xrYilpvrA/REwwTg== X-Mailman-Approved-At: Fri, 15 Feb 2019 22:27:48 +0000 Cc: Marcel Ziswiler , "Albert ARIBAUD \(3ADEV\)" , Max Krummenacher , Ken Lin , Tien Fong Chee , Otavio Salvador , Ian Ray , Andreas Geisreiter , Stefan Agner , Alison Wang , Akshay Bhat , Ludwig Zenz , Eran Matityahu Subject: [U-Boot] [PATCH v1 07/22] configs: move CONFIG_MXC_OCOTP to Kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler While commit 3e020f03e94f ("driver: misc: add MXC_OCOTP Kconfig entry") introduced a Kconfig entry it did not actually migrate all configurations to using it. As CONFIG_MXC_OCOTP was in mx{6/7}_common.h enable it by default on those architectures. Additionally, also enable it on ARCH_IMX8M and ARCH_VF610 where all current members enabled it through their legacy configuration header files. Signed-off-by: Marcel Ziswiler Reviewed-by: Lukasz Majewski --- configs/bk4r1_defconfig | 1 - configs/pcm052_defconfig | 1 - drivers/misc/Kconfig | 2 ++ include/configs/advantech_dms-ba16.h | 2 -- include/configs/apalis_imx6.h | 5 ----- include/configs/colibri_imx6.h | 5 ----- include/configs/colibri_vf.h | 4 ---- include/configs/dh_imx6.h | 5 ----- include/configs/ge_bx50v3.h | 2 -- include/configs/imx8mq_evk.h | 1 - include/configs/kp_imx6q_tpc.h | 5 ----- include/configs/mx6_common.h | 3 --- include/configs/mx7_common.h | 3 --- include/configs/vf610twr.h | 4 ---- 14 files changed, 2 insertions(+), 41 deletions(-) diff --git a/configs/bk4r1_defconfig b/configs/bk4r1_defconfig index e3852f4856..439207fd39 100644 --- a/configs/bk4r1_defconfig +++ b/configs/bk4r1_defconfig @@ -49,7 +49,6 @@ CONFIG_SYS_I2C_MXC_I2C4=y CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_MISC=y -CONFIG_MXC_OCOTP=y CONFIG_I2C_EEPROM=y CONFIG_SYS_I2C_EEPROM_ADDR=0x50 CONFIG_SYS_I2C_EEPROM_BUS=2 diff --git a/configs/pcm052_defconfig b/configs/pcm052_defconfig index 906abbfd69..fd093b35c2 100644 --- a/configs/pcm052_defconfig +++ b/configs/pcm052_defconfig @@ -36,7 +36,6 @@ CONFIG_SYS_I2C_MXC_I2C2=y CONFIG_SYS_I2C_MXC_I2C3=y CONFIG_SYS_I2C_MXC_I2C4=y CONFIG_MISC=y -CONFIG_MXC_OCOTP=y CONFIG_I2C_EEPROM=y CONFIG_SYS_I2C_EEPROM_ADDR=0x50 CONFIG_SYS_I2C_EEPROM_BUS=2 diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 704c8dd195..137baa71f0 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -128,6 +128,8 @@ config JZ4780_EFUSE config MXC_OCOTP bool "Enable MXC OCOTP Driver" + depends on ARCH_IMX8M || ARCH_MX6 || ARCH_MX7 || ARCH_VF610 + default y help If you say Y here, you will get support for the One Time Programmable memory pages that are stored on the some diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 0c9de6125d..a22c6a7d45 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -34,8 +34,6 @@ #define CONFIG_MXC_UART -#define CONFIG_MXC_OCOTP - /* SATA Configs */ #define CONFIG_SYS_SATA_MAX_DEVICE 1 #define CONFIG_DWC_AHSATA_PORT_ID 0 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index c8aa1bdddf..95dd6f9362 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -41,11 +41,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_MXC_I2C3_SPEED 400000 -/* OCOTP Configs */ -#ifdef CONFIG_CMD_FUSE -#define CONFIG_MXC_OCOTP -#endif - /* MMC Configs */ #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index a6a823ee1f..d2f8a58e80 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -39,11 +39,6 @@ #define CONFIG_SYS_I2C_SPEED 100000 #define CONFIG_SYS_MXC_I2C3_SPEED 400000 -/* OCOTP Configs */ -#ifdef CONFIG_CMD_FUSE -#define CONFIG_MXC_OCOTP -#endif - /* MMC Configs */ #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 7b974d9e97..e7b786e48b 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -17,10 +17,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT -#ifdef CONFIG_CMD_FUSE -#define CONFIG_MXC_OCOTP -#endif - #ifdef CONFIG_VIDEO_FSL_DCU_FB #define CONFIG_SPLASH_SCREEN_ALIGN #define CONFIG_VIDEO_LOGO diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 9231bd853f..4dc795c3f4 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -48,11 +48,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_ARP_TIMEOUT 200UL -/* Fuses */ -#ifdef CONFIG_CMD_FUSE -#define CONFIG_MXC_OCOTP -#endif - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index e0e1f713ef..8bbda2788d 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -35,8 +35,6 @@ #define CONFIG_MXC_UART -#define CONFIG_MXC_OCOTP - /* SATA Configs */ #ifdef CONFIG_CMD_SATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index f0430224cb..044a254320 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -231,7 +231,6 @@ #define CONFIG_MXC_GPIO -#define CONFIG_MXC_OCOTP #define CONFIG_CMD_FUSE /* I2C Configs */ diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index b6b27ee1d5..d2ebf92953 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -31,11 +31,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_ARP_TIMEOUT 200UL -/* Fuses */ -#ifdef CONFIG_CMD_FUSE -#define CONFIG_MXC_OCOTP -#endif - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index cdc8833778..6b20c6db58 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -57,9 +57,6 @@ /* MMC */ #define CONFIG_FSL_USDHC -/* Fuses */ -#define CONFIG_MXC_OCOTP - /* Secure boot (HAB) support */ #ifdef CONFIG_SECURE_BOOT #define CONFIG_CSF_SIZE 0x2000 diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index a895c936aa..cc7e87269e 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -42,9 +42,6 @@ /* MMC */ #define CONFIG_FSL_USDHC -/* Fuses */ -#define CONFIG_MXC_OCOTP - #define CONFIG_ARMV7_SECURE_BASE 0x00900000 #define CONFIG_ARMV7_PSCI_1_0 diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 686a383739..ba85bc91e7 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -19,10 +19,6 @@ /* Enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG -#ifdef CONFIG_CMD_FUSE -#define CONFIG_MXC_OCOTP -#endif - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) From patchwork Fri Feb 15 22:20:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043226 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441STj4dNDz9s3l for ; Sat, 16 Feb 2019 09:23:53 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2D51AC220C0; Fri, 15 Feb 2019 22:23:20 +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=SPF_HELO_PASS 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 2B914C21FF6; Fri, 15 Feb 2019 22:21:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 165B5C21FAB; Fri, 15 Feb 2019 22:21:40 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 12B5FC22048 for ; Fri, 15 Feb 2019 22:21:35 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lwpjy-1hAJfa0yXA-016KyZ; Fri, 15 Feb 2019 23:21:26 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:24 +0100 Message-Id: <20190215222039.10005-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:HS3JNmrGD9D8mUetEb2qsdgaAt2D3Q+/iiejP4Ki/R1anoFyTI6 qKws/uZiEXapACkiOEVekosxuWZI4GkhihxKkX3XxLLGnqhi6xrSyOMXt9O5C58ZLjRoKj4 xTxlmklhYlYEMKEFSyByrJL873RAQsvW+uLwMrTk0Z3vePWOlKorZr32H/vPVEyrmj6Ipz6 RiMnXat3C7/w9gAppP6jA== X-UI-Out-Filterresults: notjunk:1; V03:K0:E6n4N3EkzR8=:MhPOwED7/1ct+PZ2KqKpqb VmrYVWGxq7wR39W9exNYEiU5+xt3HDXoo7meA0ZdT3eHye7d9xDhLVLHKsGXCG4M4/3odW/30 h2vCsPhJEWO6P/jmpa2Knv0Vu87uAzAwPNfZahqvhJ8u2jKQnWok9/Sa9rgvHEzzl72v6SY7P QzTdotq344xo2gRvjrbAjY9wLbIcK2nJK/yEVTHqPaYgVq5A2Vgfm+bMtOnvCyb7GYnJ3cTPc 23k2nUY+0O8Q5LaF5tU47wdS8SO5YRdUZS4zMnBItbRc9tG9mmtbUMMT9uqUF5f9FT5zvFoMO +85L8HiBAfhX7HuN1Md5/a82w1ro4SXRm0km/G3r7ItfoeefMfl2NfpbscJAtG0/bn2TMqxyn fyAZbaBJIpV86U4m5nSEf2kZL6zW9cLXC9LOt0hzXt5tadwytOKaHuvIUohKVaaFHdEHqFo3L dnrgZN8ntQHW64Mc4qvwro0PX/Dr+OwyWXFwq28do1PsHW4lbjO54fQgUYbmxE3M+ox2ije48 H5xCJn8EjTNrWyXzI2WZCEACjoHpmzhgsXqPzi4uVS7Gydd21h+uWyEdihnbT0bYei/R3aXht vHsnkjK5WqRxIHZAW7BNBd3EXawo6kJoioevDJrGFpt0kyjedqaZqtqDnQLLgW8MTzTWdevID fPOSze3A7pI9uS7vJjYLQ6Bm9z3L8xb5QtyZohnsHmwISIjrx6brqMPbjZxmSxhNOVeac1Fb0 ieRYepb+1rIt+hdIPLGDyKH0XjW05fpSHIYG+A== Cc: Tom Rini , Stefan Agner , Marcel Ziswiler Subject: [U-Boot] [PATCH v1 08/22] ARM: dts: colibri_vf: update device trees X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Update device tree in preparation of further driver model migration: Ethernet FEC, ESDHC aka MMC/SD card, I2C, NFC aka NAND flash controller, USBH_PEN GPIO regulator. Add iomux resp. pinctrl entries to be removed from proprietary platform data: DSPI, ESDHC, FEC, I2C, NFC, UART, USBH_PEN GPIO. Introduce a U-Boot specific device tree with some required u-boot,dm-pre-reloc properties: soc, aips0, pinctrl_ddr and uart0 incl. pinctrl. While at it also update the MAINTAINERS file. Signed-off-by: Marcel Ziswiler --- arch/arm/dts/vf-colibri-u-boot.dtsi | 23 ++++ arch/arm/dts/vf-colibri.dtsi | 198 ++++++++++++++++++++++++++- arch/arm/dts/vf500-colibri.dts | 1 + arch/arm/dts/vf610-colibri.dts | 1 + board/toradex/colibri_vf/MAINTAINERS | 4 +- 5 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/vf-colibri-u-boot.dtsi diff --git a/arch/arm/dts/vf-colibri-u-boot.dtsi b/arch/arm/dts/vf-colibri-u-boot.dtsi new file mode 100644 index 0000000000..db86739805 --- /dev/null +++ b/arch/arm/dts/vf-colibri-u-boot.dtsi @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0+ OR X11 + +/ { + soc { + u-boot,dm-pre-reloc; + }; +}; + +&aips0 { + u-boot,dm-pre-reloc; +}; + +&pinctrl_ddr { + u-boot,dm-pre-reloc; +}; + +&pinctrl_uart0 { + u-boot,dm-pre-reloc; +}; + +&uart0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/vf-colibri.dtsi b/arch/arm/dts/vf-colibri.dtsi index 923dc2451c..5ce17076e9 100644 --- a/arch/arm/dts/vf-colibri.dtsi +++ b/arch/arm/dts/vf-colibri.dtsi @@ -1,18 +1,37 @@ // SPDX-License-Identifier: GPL-2.0+ OR X11 /* - * Copyright 2014 Toradex AG + * Copyright 2014-2019 Toradex AG */ + +/dts-v1/; #include "vf.dtsi" +#include "vf610-pinfunc.h" / { chosen { stdout-path = &uart0; }; + + aliases { + usb0 = &ehci0; /* required for ums */ + }; + + reg_usbh_vbus: regulator-usbh-vbus { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbh1_reg>; + regulator-name = "VCC_USB[1-4]"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + gpio = <&gpio2 19 GPIO_ACTIVE_LOW>; /* USBH_PEN */ + }; }; &dspi1 { - status = "okay"; bus-num = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_dspi1>; + status = "okay"; spi_cmd: sspi@0 { reg = <0>; @@ -29,8 +48,183 @@ &ehci1 { dr_mode = "host"; status = "okay"; + vbus-supply = <®_usbh_vbus>; +}; + +&esdhc1 { + bus-width = <4>; + cd-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; + disable-wp; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_esdhc1>; + status = "okay"; +}; + +&fec1 { + phy-mode = "rmii"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fec1>; + status = "okay"; +}; + +&i2c0 { + clock-frequency = <400000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c0>; + status = "okay"; + + /* M41T0M6 real time clock on carrier board */ + rtc: m41t0m6@68 { + compatible = "st,m41t0"; + reg = <0x68>; + }; +}; + +&iomuxc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_ddr>; + + pinctrl_ddr: ddrgrp { + fsl,pins = < + VF610_PAD_DDR_A15__DDR_A_15 0x180 + VF610_PAD_DDR_A14__DDR_A_14 0x180 + VF610_PAD_DDR_A13__DDR_A_13 0x180 + VF610_PAD_DDR_A12__DDR_A_12 0x180 + VF610_PAD_DDR_A11__DDR_A_11 0x180 + VF610_PAD_DDR_A10__DDR_A_10 0x180 + VF610_PAD_DDR_A9__DDR_A_9 0x180 + VF610_PAD_DDR_A8__DDR_A_8 0x180 + VF610_PAD_DDR_A7__DDR_A_7 0x180 + VF610_PAD_DDR_A6__DDR_A_6 0x180 + VF610_PAD_DDR_A5__DDR_A_5 0x180 + VF610_PAD_DDR_A4__DDR_A_4 0x180 + VF610_PAD_DDR_A3__DDR_A_3 0x180 + VF610_PAD_DDR_A2__DDR_A_2 0x180 + VF610_PAD_DDR_A1__DDR_A_1 0x180 + VF610_PAD_DDR_A0__DDR_A_0 0x180 + VF610_PAD_DDR_BA2__DDR_BA_2 0x180 + VF610_PAD_DDR_BA1__DDR_BA_1 0x180 + VF610_PAD_DDR_BA0__DDR_BA_0 0x180 + VF610_PAD_DDR_CAS__DDR_CAS_B 0x180 + VF610_PAD_DDR_CKE__DDR_CKE_0 0x180 + VF610_PAD_DDR_CLK__DDR_CLK_0 0x180 + VF610_PAD_DDR_CS__DDR_CS_B_0 0x180 + VF610_PAD_DDR_D15__DDR_D_15 0x10180 + VF610_PAD_DDR_D14__DDR_D_14 0x10180 + VF610_PAD_DDR_D13__DDR_D_13 0x10180 + VF610_PAD_DDR_D12__DDR_D_12 0x10180 + VF610_PAD_DDR_D11__DDR_D_11 0x10180 + VF610_PAD_DDR_D10__DDR_D_10 0x10180 + VF610_PAD_DDR_D9__DDR_D_9 0x10180 + VF610_PAD_DDR_D8__DDR_D_8 0x10180 + VF610_PAD_DDR_D7__DDR_D_7 0x10180 + VF610_PAD_DDR_D6__DDR_D_6 0x10180 + VF610_PAD_DDR_D5__DDR_D_5 0x10180 + VF610_PAD_DDR_D4__DDR_D_4 0x10180 + VF610_PAD_DDR_D3__DDR_D_3 0x10180 + VF610_PAD_DDR_D2__DDR_D_2 0x10180 + VF610_PAD_DDR_D1__DDR_D_1 0x10180 + VF610_PAD_DDR_D0__DDR_D_0 0x10180 + VF610_PAD_DDR_DQM1__DDR_DQM_1 0x10180 + VF610_PAD_DDR_DQM0__DDR_DQM_0 0x10180 + VF610_PAD_DDR_DQS1__DDR_DQS_1 0x10180 + VF610_PAD_DDR_DQS0__DDR_DQS_0 0x10180 + VF610_PAD_DDR_RAS__DDR_RAS_B 0x180 + VF610_PAD_DDR_WE__DDR_WE_B 0x180 + VF610_PAD_DDR_ODT1__DDR_ODT_0 0x180 + VF610_PAD_DDR_ODT0__DDR_ODT_1 0x180 + VF610_PAD_DDR_DDRBYTE1__DDR_DDRBYTE1 0x180 + VF610_PAD_DDR_DDRBYTE2__DDR_DDRBYTE2 0x180 + VF610_PAD_DDR_RESETB 0x180 + >; + }; + + pinctrl_dspi1: dspi1grp { + fsl,pins = < + VF610_PAD_PTD5__DSPI1_CS0 0x33e2 + VF610_PAD_PTD6__DSPI1_SIN 0x33e1 + VF610_PAD_PTD7__DSPI1_SOUT 0x33e2 + VF610_PAD_PTD8__DSPI1_SCK 0x33e2 + >; + }; + + pinctrl_esdhc1: esdhc1grp { + fsl,pins = < + VF610_PAD_PTA24__ESDHC1_CLK 0x31ef + VF610_PAD_PTA25__ESDHC1_CMD 0x31ef + VF610_PAD_PTA26__ESDHC1_DAT0 0x31ef + VF610_PAD_PTA27__ESDHC1_DAT1 0x31ef + VF610_PAD_PTA28__ESDHC1_DATA2 0x31ef + VF610_PAD_PTA29__ESDHC1_DAT3 0x31ef + VF610_PAD_PTB20__GPIO_42 0x219d + >; + }; + + pinctrl_fec1: fec1grp { + fsl,pins = < + VF610_PAD_PTA6__RMII_CLKOUT 0x30df + VF610_PAD_PTC9__ENET_RMII1_MDC 0x30df + VF610_PAD_PTC10__ENET_RMII1_MDIO 0x30df + VF610_PAD_PTC11__ENET_RMII1_CRS 0x30df + VF610_PAD_PTC12__ENET_RMII1_RXD1 0x30df + VF610_PAD_PTC13__ENET_RMII1_RXD0 0x30df + VF610_PAD_PTC14__ENET_RMII1_RXER 0x30df + VF610_PAD_PTC15__ENET_RMII1_TXD1 0x30df + VF610_PAD_PTC16__ENET_RMII1_TXD0 0x30df + VF610_PAD_PTC17__ENET_RMII1_TXEN 0x30df + >; + }; + + pinctrl_i2c0: i2c0grp { + fsl,pins = < + VF610_PAD_PTB14__I2C0_SCL 0x37ff + VF610_PAD_PTB15__I2C0_SDA 0x37ff + >; + }; + + pinctrl_nfc: nfcgrp { + fsl,pins = < + VF610_PAD_PTD23__NF_IO7 0x28df + VF610_PAD_PTD22__NF_IO6 0x28df + VF610_PAD_PTD21__NF_IO5 0x28df + VF610_PAD_PTD20__NF_IO4 0x28df + VF610_PAD_PTD19__NF_IO3 0x28df + VF610_PAD_PTD18__NF_IO2 0x28df + VF610_PAD_PTD17__NF_IO1 0x28df + VF610_PAD_PTD16__NF_IO0 0x28df + VF610_PAD_PTB24__NF_WE_B 0x28c2 + VF610_PAD_PTB25__NF_CE0_B 0x28c2 + VF610_PAD_PTB27__NF_RE_B 0x28c2 + VF610_PAD_PTC26__NF_RB_B 0x283d + VF610_PAD_PTC27__NF_ALE 0x28c2 + VF610_PAD_PTC28__NF_CLE 0x28c2 + >; + }; + + pinctrl_uart0: uart0grp { + fsl,pins = < + VF610_PAD_PTB10__UART0_TX 0x11af + VF610_PAD_PTB11__UART0_RX 0x11af + VF610_PAD_PTB12__UART0_RTS 0x11af + VF610_PAD_PTB13__UART0_CTS 0x11af + >; + }; + + pinctrl_usbh1_reg: gpio_usb_vbus { + fsl,pins = < + VF610_PAD_PTD4__GPIO_83 0x22ed + >; + }; +}; + +&nfc { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_nfc>; + status = "okay"; }; &uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0>; status = "okay"; }; diff --git a/arch/arm/dts/vf500-colibri.dts b/arch/arm/dts/vf500-colibri.dts index 3f33d970e0..c83a16fdcb 100644 --- a/arch/arm/dts/vf500-colibri.dts +++ b/arch/arm/dts/vf500-colibri.dts @@ -5,6 +5,7 @@ /dts-v1/; #include "vf-colibri.dtsi" +#include "vf-colibri-u-boot.dtsi" / { model = "Toradex Colibri VF50"; diff --git a/arch/arm/dts/vf610-colibri.dts b/arch/arm/dts/vf610-colibri.dts index 0a6b937fee..7275fec279 100644 --- a/arch/arm/dts/vf610-colibri.dts +++ b/arch/arm/dts/vf610-colibri.dts @@ -5,6 +5,7 @@ /dts-v1/; #include "vf-colibri.dtsi" +#include "vf-colibri-u-boot.dtsi" / { model = "Toradex Colibri VF61"; diff --git a/board/toradex/colibri_vf/MAINTAINERS b/board/toradex/colibri_vf/MAINTAINERS index a1217a47bd..3ee2b33152 100644 --- a/board/toradex/colibri_vf/MAINTAINERS +++ b/board/toradex/colibri_vf/MAINTAINERS @@ -1,10 +1,12 @@ Colibri VFxx M: Stefan Agner +W: http://developer.toradex.com/software/linux/linux-software +W: https://www.toradex.com/community S: Maintained F: board/toradex/colibri_vf/ F: include/configs/colibri_vf.h F: configs/colibri_vf_defconfig -F: configs/colibri_vf_dtb_defconfig F: arch/arm/dts/vf-colibri.dtsi +F: arch/arm/dts/vf-colibri-u-boot.dtsi F: arch/arm/dts/vf500-colibri.dts F: arch/arm/dts/vf610-colibri.dts From patchwork Fri Feb 15 22:20:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043239 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441Sf26YhTz9sML for ; Sat, 16 Feb 2019 09:31:06 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 79891C22034; Fri, 15 Feb 2019 22:23:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 B2922C22056; Fri, 15 Feb 2019 22:21:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id BA78FC220F9; Fri, 15 Feb 2019 22:21:35 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id B44AEC2204E for ; Fri, 15 Feb 2019 22:21:31 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M9Z0L-1gmCjo1ZB1-00D0pQ; Fri, 15 Feb 2019 23:21:27 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:25 +0100 Message-Id: <20190215222039.10005-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:TiaIfqAYv+q6YLr+PKYcO52gBqs28FU4xAfKfZNmsx//8oMIEb6 EXvK1mfJTFsav7YoH6t4b3b3U7MRHVZ/zrmqIlnxs0ZqV8nCGekygs0+3T1Ws4axJk2rNTK bNPWnr4tRv2Tjb5k+DdmSKiMwbcPqozT8gLnHKzJxV/kL6JUSnlRlLI9a33N4OwCE6fduCS jWMkkN2ky0zsnj6gdhMRg== X-UI-Out-Filterresults: notjunk:1; V03:K0:xnKFm9n/XUw=:QFI+gUktvnQPpItJVJfj/l e5a8TcrHt7S2CSUmqMZy2s9gtSO/+kRcuSEtKHtTcn2oVEYoFM7irlzay6q5u/MJtrYJ5OY9J f6HohkOpZHcap2BD5hCpeQCDWladZoQmFqr2u9Z9KxJ7GA+SH0Fq3hX+BQ+bu4J9HJHqewxfA 9Lw+Ta67He92a0S2tiMtCv7qkXu4+0VHVZyRR0zhf2dXbJ9NYTan3oXl4sLQubln+dbHwlUge C2fgAMN66/shH7+qmY3Tn3ephSrexwG1LuOxgAxFDWaR0FeCR3ZeehzhFepKNTV+C7iPOFFp9 5BPsNX53osY/jclYoulEfvK9cIN9VSenPpAjXLFS02dh4MdvEEWq9bgVpZHQwEJzUvw4BAt65 a+nTBYLvobS6ZZ28e2TgPWfoS4UubkAgi4Zu3IjfCVojctwrA5NCn1A4RdQo/lkkH+u/IzKoo 0QM0YUWfTtSJyyvTECI5wBpKndkwYYnOgOn2d4KHE20Gw+RsQSN24YQ9BQ7VQeqQFFrTNM9VH fnPuZGJ6n3UlcbZ5fnogL8Ny+Pj+xHaUS5and3rW+Nwm7Z7sfkvT4ofiPveM7la7mY7ar0cHb Kf3WEQxv/tHtz/Pvs9dZLWavSz9kgfojQPjymngRKv+CofblaJycQN7YmDQjZmgK0rrXxvdw3 veTORrymvvdbkepVU3/qdodZ0NagxvqDAlwtrRmO/4e2SeUC+eBHpmKVZDXjg8bhkMop/23Ne U/R239KVcWAiq8dCcjqqzXyFULGt3ZTMSN1Kbw== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 09/22] configs: colibri_vf: disable obscure options X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Disable more obscure options to save another 26 KB in preparation of the upcoming driver model migration. Signed-off-by: Marcel Ziswiler --- configs/colibri_vf_defconfig | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 8188582ed9..706d7ca634 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -17,11 +17,17 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y # CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set +# CONFIG_SYS_LONGHELP is not set CONFIG_SYS_PROMPT="Colibri VFxx # " +# CONFIG_CMD_BOOTD is not set +# CONFIG_CMD_BOOTM is not set CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_ELF is not set +# CONFIG_CMD_IMI is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_DFU=y +# CONFIG_CMD_FLASH is not set CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADB is not set @@ -46,10 +52,10 @@ CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri" CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y -CONFIG_DFU_MMC=y CONFIG_DFU_NAND=y CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y +# CONFIG_MMC_HW_PARTITIONING is not set CONFIG_FSL_ESDHC=y CONFIG_NAND_VF610_NFC=y CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y @@ -57,6 +63,8 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_MII=y +# CONFIG_SPL_SERIAL_PRESENT is not set +# CONFIG_TPL_SERIAL_PRESENT is not set CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_USB=y From patchwork Fri Feb 15 22:20:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043229 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SWF4TG6z9s3l for ; Sat, 16 Feb 2019 09:25:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1AC97C22047; Fri, 15 Feb 2019 22:24:46 +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=SPF_HELO_PASS 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 317B3C2210F; Fri, 15 Feb 2019 22:22:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5342FC21FB7; Fri, 15 Feb 2019 22:21:35 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id F04DFC22052 for ; Fri, 15 Feb 2019 22:21:31 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MGh4Z-1gq2lF28sD-00DYWo; Fri, 15 Feb 2019 23:21:28 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:26 +0100 Message-Id: <20190215222039.10005-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:fHZVAcyGHybrdw2duuKYSyEdDhYzqwyNH9zCfJxwLMQ+KIt7eGP B/sELHunHEzM3/kUFbTyfJPDAacQPruoinZJ4TkGeqp1hjCJNh9gT8RdRcLfQnXxQFAJ9mf wQ9q4aNiW+8G8TYKI+AkOoefG9bjDc3QQXEtpY07cQZjKBchC4W08QxJQN+f4/Pl4WBCAFC Lh2GbymHHGfGmMVdHwMmA== X-UI-Out-Filterresults: notjunk:1; V03:K0:W0rn745+oiY=:9gkPGrPa3sowdGDYUUJS22 +Q5Oae4oZMlJEpqWmEZxGR3wCXNFEqA+J8D8AAk7K0mIEfpLMFhwQSvi/mzKgNtiPM96arSeI d9PJza5ThPvjQjWggxoDL5nAZZD3qxtw85cG5EXhToZxrWmcbcejifzzx5lk0w3x3loted7oi U9YNgkJxrsPbCA9KZjT2iNVrNIegMi+VZJMARtTSTCRtuPnyjnKyf1Cb1mUv2Mz4vnkRilCcT tG9xkb7tjvHVzl+pCeWqtAVBXjt+/4A6CXT9WZSnJR5gGv/GRMqpsP6Fz9pELJ5eE7qCX7LVB 3vFVoyswWEG1RVKNo46QzPbacX3oKiJj33OY1AwUtpb/0K910NlD39cHJ4lS29+TsEbO3uGsQ Mu2uWf8lI9epQbbP2tjuFITbUI2AYqZTBDD/CSCkr/LOpvuYLqUdn14cokUp/ceehmO1ulmP0 FwkPEXZgDryw9FkbWoLdyBQ868T1BaEFomtBZ6Ra5ieFrm9EWA8IGKgsNfNTzWMVByphFWv58 b98mqxoo8i5LZqTpwMVrATzObwjAB+9pB1Aih2J0KdeGYbSLiuzUarg+MhtqwcR3pzKDFpUyo NkufqZvWTakH+/+eDY27XX5k6fZaTWHa7pTOrX9atiWVzxBzjpK0C3epJePsyutYX4Ev0hray g+EMsCq2E7QvdM10uaXeVzB6QtID2Er1dQMObmvTBu9Q3zAh9GgOCbXM95jidq+4KYxwIZpPM MMGC9loICOTh8sl/2uodT4SlVJ/G0aCJm5XnqA== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 10/22] colibri_vf: migrate pinctrl and regulators to dtb/dm X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Migrate pinctrl and regulators to device tree resp. driver model: DDR, DSPI, ENET, ESDHC, I2C, NFC and UART. Enable CMD_DM, PINCTRL and DM_REGULATOR. While at it also update copyright period and sort include files. Signed-off-by: Marcel Ziswiler --- board/toradex/colibri_vf/colibri_vf.c | 139 ++------------------------ configs/colibri_vf_defconfig | 5 + 2 files changed, 16 insertions(+), 128 deletions(-) diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 19cf748c5d..c9de3c0c76 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -1,43 +1,36 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2015 Toradex, Inc. + * Copyright 2015-2019 Toradex, Inc. * * Based on vf610twr.c: * Copyright 2013 Freescale Semiconductor, Inc. */ #include -#include + +#include +#include +#include #include #include -#include -#include -#include -#include +#include +#include #include #include #include +#include +#include #include #include +#include #include #include -#include -#include -#include #include + #include "../common/tdx-common.h" DECLARE_GLOBAL_DATA_PTR; -#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ - PAD_CTL_DSE_25ohm | PAD_CTL_OBE_IBE_ENABLE) - -#define ESDHC_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_HIGH | \ - PAD_CTL_DSE_20ohm | PAD_CTL_OBE_IBE_ENABLE) - -#define ENET_PAD_CTRL (PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_HIGH | \ - PAD_CTL_DSE_50ohm | PAD_CTL_OBE_IBE_ENABLE) - #define USB_PEN_GPIO 83 #define USB_CDET_GPIO 102 @@ -88,11 +81,6 @@ static struct ddrmc_cr_setting colibri_vf_cr_settings[] = { { 0, -1 } }; -static const iomux_v3_cfg_t usb_pads[] = { - VF610_PAD_PTD4__GPIO_83, - VF610_PAD_PTC29__GPIO_102, -}; - int dram_init(void) { static const struct ddr3_jedec_timings timings = { @@ -146,92 +134,12 @@ int dram_init(void) .wldqsen = 25, }; - ddrmc_setup_iomux(NULL, 0); - ddrmc_ctrl_init_ddr3(&timings, colibri_vf_cr_settings, NULL, 1, 2); gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); return 0; } -static void setup_iomux_uart(void) -{ - static const iomux_v3_cfg_t uart_pads[] = { - NEW_PAD_CTRL(VF610_PAD_PTB4__UART1_TX, UART_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTB5__UART1_RX, UART_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTB10__UART0_TX, UART_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTB11__UART0_RX, UART_PAD_CTRL), - }; - - imx_iomux_v3_setup_multiple_pads(uart_pads, ARRAY_SIZE(uart_pads)); -} - -static void setup_iomux_enet(void) -{ - static const iomux_v3_cfg_t enet0_pads[] = { - NEW_PAD_CTRL(VF610_PAD_PTA6__RMII0_CLKOUT, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC10__RMII1_MDIO, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC9__RMII1_MDC, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC11__RMII1_CRS_DV, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC12__RMII1_RD1, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC13__RMII1_RD0, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC14__RMII1_RXER, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC15__RMII1_TD1, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC16__RMII1_TD0, ENET_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTC17__RMII1_TXEN, ENET_PAD_CTRL), - }; - - imx_iomux_v3_setup_multiple_pads(enet0_pads, ARRAY_SIZE(enet0_pads)); -} - -static void setup_iomux_i2c(void) -{ - static const iomux_v3_cfg_t i2c0_pads[] = { - VF610_PAD_PTB14__I2C0_SCL, - VF610_PAD_PTB15__I2C0_SDA, - }; - - imx_iomux_v3_setup_multiple_pads(i2c0_pads, ARRAY_SIZE(i2c0_pads)); -} - -#ifdef CONFIG_NAND_VF610_NFC -static void setup_iomux_nfc(void) -{ - static const iomux_v3_cfg_t nfc_pads[] = { - VF610_PAD_PTD23__NF_IO7, - VF610_PAD_PTD22__NF_IO6, - VF610_PAD_PTD21__NF_IO5, - VF610_PAD_PTD20__NF_IO4, - VF610_PAD_PTD19__NF_IO3, - VF610_PAD_PTD18__NF_IO2, - VF610_PAD_PTD17__NF_IO1, - VF610_PAD_PTD16__NF_IO0, - VF610_PAD_PTB24__NF_WE_B, - VF610_PAD_PTB25__NF_CE0_B, - VF610_PAD_PTB27__NF_RE_B, - VF610_PAD_PTC26__NF_RB_B, - VF610_PAD_PTC27__NF_ALE, - VF610_PAD_PTC28__NF_CLE - }; - - imx_iomux_v3_setup_multiple_pads(nfc_pads, ARRAY_SIZE(nfc_pads)); -} -#endif - -#ifdef CONFIG_FSL_DSPI -static void setup_iomux_dspi(void) -{ - static const iomux_v3_cfg_t dspi1_pads[] = { - VF610_PAD_PTD5__DSPI1_CS0, - VF610_PAD_PTD6__DSPI1_SIN, - VF610_PAD_PTD7__DSPI1_SOUT, - VF610_PAD_PTD8__DSPI1_SCK, - }; - - imx_iomux_v3_setup_multiple_pads(dspi1_pads, ARRAY_SIZE(dspi1_pads)); -} -#endif - #ifdef CONFIG_VYBRID_GPIO static void setup_iomux_gpio(void) { @@ -343,20 +251,8 @@ int board_mmc_getcd(struct mmc *mmc) int board_mmc_init(bd_t *bis) { - static const iomux_v3_cfg_t esdhc1_pads[] = { - NEW_PAD_CTRL(VF610_PAD_PTA24__ESDHC1_CLK, ESDHC_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTA25__ESDHC1_CMD, ESDHC_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTA26__ESDHC1_DAT0, ESDHC_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTA27__ESDHC1_DAT1, ESDHC_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTA28__ESDHC1_DAT2, ESDHC_PAD_CTRL), - NEW_PAD_CTRL(VF610_PAD_PTA29__ESDHC1_DAT3, ESDHC_PAD_CTRL), - }; - esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); - imx_iomux_v3_setup_multiple_pads( - esdhc1_pads, ARRAY_SIZE(esdhc1_pads)); - return fsl_esdhc_initialize(bis, &esdhc_cfg[0]); } #endif @@ -495,21 +391,10 @@ int board_early_init_f(void) clock_init(); mscm_init(); - setup_iomux_uart(); - setup_iomux_enet(); - setup_iomux_i2c(); -#ifdef CONFIG_NAND_VF610_NFC - setup_iomux_nfc(); -#endif - #ifdef CONFIG_VYBRID_GPIO setup_iomux_gpio(); #endif -#ifdef CONFIG_FSL_DSPI - setup_iomux_dspi(); -#endif - #ifdef CONFIG_VIDEO_FSL_DCU_FB setup_tcon(); setup_iomux_fsl_dcu(); @@ -593,8 +478,6 @@ int ft_board_setup(void *blob, bd_t *bd) #ifdef CONFIG_USB_EHCI_VF int board_ehci_hcd_init(int port) { - imx_iomux_v3_setup_multiple_pads(usb_pads, ARRAY_SIZE(usb_pads)); - switch (port) { case 0: /* USBC does not have PEN, also configured as USB client only */ diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 706d7ca634..9a91cb4b82 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_ASKENV=y CONFIG_CMD_MEMTEST=y CONFIG_CMD_DFU=y +CONFIG_CMD_DM=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y @@ -63,6 +64,10 @@ CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_MII=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_VYBRID=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y # CONFIG_SPL_SERIAL_PRESENT is not set # CONFIG_TPL_SERIAL_PRESENT is not set CONFIG_DM_SERIAL=y From patchwork Fri Feb 15 22:20:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043234 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SZ20Tlrz9sML for ; Sat, 16 Feb 2019 09:27:37 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BBDE7C22058; Fri, 15 Feb 2019 22:24:18 +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=SPF_HELO_PASS 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 467EAC22052; Fri, 15 Feb 2019 22:22:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 15C09C220F4; Fri, 15 Feb 2019 22:21:37 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 3C1E3C220C5 for ; Fri, 15 Feb 2019 22:21:33 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LbKaC-1hMubD2h8U-00kybJ; Fri, 15 Feb 2019 23:21:30 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:27 +0100 Message-Id: <20190215222039.10005-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:t5cgjqak+QWlCtac6oUTEDe7yZQH4pzrY2te3Qc9MXHx/EBCpQQ sq0/jPjWrjQICcrRKpfCNP+JeWCWUxzb/JkxtYiVObYYkSRO0jGkLTwhH9aB3LQkviZJZVR CvsuOVv9Rji8GsIPF9C/qpU84SHeLjCIhHepWEfFgaAqndRkk3vMlhXwisB+eLWOko/IpeN BfbveoHc2JeCP7C5YXA2w== X-UI-Out-Filterresults: notjunk:1; V03:K0:Wx96+gmdatI=:TS9Rik/IQYvS/RXXBiKD42 Ryq09wddTHJzACUq3/XmtAUokGk3l/GgyaPKS6gdk8CtB4J/tn1gGmrDrlwtGKmztM8DFURwS p2DzXUcDjfDP0V3zAhEFN7pKjHYy30ZkVhIHBntKBJjYhIvgmR1gE8FkbRbCoFl3ZWTw6GeRZ CkpXFM6SI3Q16spp/588UTQepUQvT3k+iUWWS5+ILA7dqhGCi8FJgYN0aY1rGLhfW/lm4knEB W0RvP7OMODDJx7UtMcm//06PEq11TKIFfdQTwkAVkztC4LvXXVYSsjwAwuAW3PGUuDhuFgI7+ FpFYsSERZm4pmj5hiZdgfG89BpuT59KTwIjYzUEgiPKX1OIskHJ28CrRZEVwCgdHj7GrX0b2f syl995ySi3V72iPndL/Ye56LiyDAFuDNJR+JIWYFgUAV1U4LJWJfz1qYr2Pybe3v/ob+zD4QF pVNfK17uueFzUb0kCI5KPVleLboNEP6RNgKVFwYvJVlTq6Hx+ri490OMyOoVkThcIH7p+05xj lBTZzAsEdBhVTzIDf0D8/izRBbG+4NQ578l7YKRypFhStdcE9yxr+ZuCcAseuQF8ErhRT5eL2 xN6bKNRWMeMd0pR3s+y7UiLWyai4u6ehF8nfbN0oZetHGiWtfaP/E4romy1XJZK8yJeiDsZjh yhXwYeGhUVtmKD0uUjc+pFiCtKsQGfJwaiJPXZk/L2eNmMONSfE1ELb6VVcYdxqptKkm8mBKV /ZK5keJWtVDoOdd35etlVWiNkiV9sIGvdxYl8Q== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 11/22] colibri_vf: migrate fec, esdhc, nfc and usb to driver model X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Migrate FEC, ESDHC, NFC and USB to driver model. While at it also do no longer enable optional I2C clock in board file as the generic clock code now handles this. Note for space reason and as it is not required just for booting we do not enable I2C in U-Boot by default. While at it also update copyright period. Signed-off-by: Marcel Ziswiler --- board/toradex/colibri_vf/colibri_vf.c | 83 +-------------------------- configs/colibri_vf_defconfig | 5 ++ include/configs/colibri_vf.h | 13 +---- 3 files changed, 7 insertions(+), 94 deletions(-) diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index c9de3c0c76..421a4791a1 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -16,24 +16,16 @@ #include #include #include -#include #include #include -#include #include -#include -#include #include -#include #include #include "../common/tdx-common.h" DECLARE_GLOBAL_DATA_PTR; -#define USB_PEN_GPIO 83 -#define USB_CDET_GPIO 102 - static struct ddrmc_cr_setting colibri_vf_cr_settings[] = { /* AXI */ { DDRMC_CR117_AXI0_W_PRI(0) | DDRMC_CR117_AXI0_R_PRI(0), 117 }, @@ -238,25 +230,6 @@ static void setup_tcon(void) } #endif -#ifdef CONFIG_FSL_ESDHC -struct fsl_esdhc_cfg esdhc_cfg[1] = { - {ESDHC1_BASE_ADDR}, -}; - -int board_mmc_getcd(struct mmc *mmc) -{ - /* eSDHC1 is always present */ - return 1; -} - -int board_mmc_init(bd_t *bis) -{ - esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); - - return fsl_esdhc_initialize(bis, &esdhc_cfg[0]); -} -#endif - static inline int is_colibri_vf61(void) { struct mscm *mscm = (struct mscm *)MSCM_BASE_ADDR; @@ -289,7 +262,7 @@ static void clock_init(void) CCM_CCGR3_ANADIG_CTRL_MASK | CCM_CCGR3_SCSC_CTRL_MASK); clrsetbits_le32(&ccm->ccgr4, CCM_REG_CTRL_MASK, CCM_CCGR4_WKUP_CTRL_MASK | CCM_CCGR4_CCM_CTRL_MASK | - CCM_CCGR4_GPC_CTRL_MASK | CCM_CCGR4_I2C0_CTRL_MASK); + CCM_CCGR4_GPC_CTRL_MASK); clrsetbits_le32(&ccm->ccgr6, CCM_REG_CTRL_MASK, CCM_CCGR6_OCOTP_CTRL_MASK | CCM_CCGR6_DDRMC_CTRL_MASK); clrsetbits_le32(&ccm->ccgr7, CCM_REG_CTRL_MASK, @@ -378,14 +351,6 @@ static void mscm_init(void) writew(MSCM_IRSPRC_CP0_EN, &mscmir->irsprc[i]); } -int board_phy_config(struct phy_device *phydev) -{ - if (phydev->drv->config) - phydev->drv->config(phydev); - - return 0; -} - int board_early_init_f(void) { clock_init(); @@ -432,13 +397,8 @@ int board_init(void) * so we must use the external oscillator in order * to maintain correct time in the hwclock */ - setbits_le32(&scsc->sosc_ctr, SCSC_SOSC_CTR_SOSC_EN); -#ifdef CONFIG_USB_EHCI_VF - gpio_request(USB_CDET_GPIO, "usb-cdet-gpio"); -#endif - return 0; } @@ -474,44 +434,3 @@ int ft_board_setup(void *blob, bd_t *bd) return ft_common_board_setup(blob, bd); } #endif - -#ifdef CONFIG_USB_EHCI_VF -int board_ehci_hcd_init(int port) -{ - switch (port) { - case 0: - /* USBC does not have PEN, also configured as USB client only */ - break; - case 1: - gpio_request(USB_PEN_GPIO, "usb-pen-gpio"); - gpio_direction_output(USB_PEN_GPIO, 0); - break; - } - return 0; -} - -int board_usb_phy_mode(int port) -{ - switch (port) { - case 0: - /* - * Port 0 is used only in client mode on Colibri Vybrid modules - * Check for state of USB client gpio pin and accordingly return - * USB_INIT_DEVICE or USB_INIT_HOST. - */ - if (gpio_get_value(USB_CDET_GPIO)) - return USB_INIT_DEVICE; - else - return USB_INIT_HOST; - case 1: - /* Port 1 is used only in host mode on Colibri Vybrid modules */ - return USB_INIT_HOST; - default: - /* - * There are only two USB controllers on Vybrid. Ideally we will - * not reach here. However return USB_INIT_HOST if we do. - */ - return USB_INIT_HOST; - } -} -#endif diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 9a91cb4b82..344fe77234 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -56,13 +56,18 @@ CONFIG_DM=y CONFIG_DFU_NAND=y CONFIG_DM_GPIO=y CONFIG_VYBRID_GPIO=y +CONFIG_DM_MMC=y # CONFIG_MMC_HW_PARTITIONING is not set CONFIG_FSL_ESDHC=y +CONFIG_MTD=y CONFIG_NAND_VF610_NFC=y +CONFIG_NAND_VF610_NFC_DT=y CONFIG_SYS_NAND_VF610_NFC_60_ECC_BYTES=y CONFIG_MTD_UBI_FASTMAP=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y +CONFIG_DM_ETH=y +CONFIG_FEC_MXC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_VYBRID=y diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index e7b786e48b..1acc6e5056 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2015-2016 Toradex, Inc. + * Copyright 2015-2019 Toradex, Inc. * * Configuration settings for the Toradex VF50/VF61 modules. * @@ -36,17 +36,6 @@ /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR - -/* Dynamic MTD partition support */ - -#define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_SYS_FSL_ESDHC_NUM 1 - -#define CONFIG_FEC_MXC -#define IMX_FEC_BASE ENET1_BASE_ADDR -#define CONFIG_FEC_XCV_TYPE RMII -#define CONFIG_FEC_MXC_PHYADDR 0 #define CONFIG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 From patchwork Fri Feb 15 22:20:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043230 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SX218dTz9sML for ; Sat, 16 Feb 2019 09:25:53 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9F0D3C2204A; Fri, 15 Feb 2019 22:24:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS 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 BA4FAC22103; Fri, 15 Feb 2019 22:22:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4624EC22030; Fri, 15 Feb 2019 22:21:38 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 2ED75C220F9 for ; Fri, 15 Feb 2019 22:21:34 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MQPKk-1gVVCQ3CHs-00TiMp; Fri, 15 Feb 2019 23:21:31 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:28 +0100 Message-Id: <20190215222039.10005-13-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:lpVYAPaz1RtcgG+lIpKTsrhnZJryZOcJ3lmojZxtQzAat6mrHM1 P2u6JEYAFMcVDdJNOuP+Z2rzWpcdfH9U0O5zb9/iaCG9Ka1V021FfiM7EjUTuadzNktudIV tMnRI6cx3KVUfaMXk4VaZsGA6lKWhnJP0afDGITnJNxcr2/egoXJF/CxTnU68veBBw4Q5IN gB7yDoemzyK6l+7hCZiZA== X-UI-Out-Filterresults: notjunk:1; V03:K0:gbfPo8h60nI=:pTLQKiu7dndkj2StG5pnS+ /e0bJEJoaBRvRSnZTOxSmScjXM5kfrDFKUffqSjmYawpEisOm/dO2p3b289MtoRQ2sY2npvuc +RrT9R562bwZuo9p97b0dGubCWMVuF5xAPsdfoMxaayiIBAra2eIQsE/Fg9KIZq3uttwGT+qK XV9hCLij6gzodyKDxpntPBcMNVrCykIK7DsS3+PAjWAzIUHrP0w9HNscdjcSxj1fjf2nniCZg pKTy900qD4GU12z8mDham4VplYz8dTzUjNVDBZSW2KSyKQLYB+8X0K9j4MK7VmNGldBZ3AbX9 GuTzLob75DGhPbfkNbvDhtKbnmg+Bpmg8FdV7U9D8imC7fEYkltkowulbxXJwSlRxDblyeNFd ne6VrVIecp/Z9q3xP+Npu5VIgp8z93V6O+j8IBKnWi+oC2PEqOgXbgrCBDMgMYcLZBKZ3WXHH 1gahMiGchAniIoozzCsr8sNpS+0gljNpkliik5s8pVcPlWD6UYNFJsDIRi4QASgCYz2LekYQp WhGkMfe9Yd+wK4yefcUWtUpTErj/8tr6QKYqvSoeBUal8Hjh3VRm72CrUlgNamzWwu8Vyjx2a 5lBNc7vyo3pB3aSnTWELJcV7L6JQWBawNkNqnKETqwY0Ltv6x43hKl9fcyQEyVfgz9e/Mzn5B uaZiUHFJeY/m4hcYVFIKUAxwa9aiSeqvX0J6DAVfOby6XTHZaLdbOIf3EW4DlD3yNiRaJXBRA xw2BvG3TfiIR+VbwWceVy1L29OEZ6LOjM57qpQ== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 12/22] config: colibri_vf: use macros from linux/sizes.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Marcel Ziswiler Use SZ_X{MK} macros from linux/sizes.h for include/configs/colibri_vf.h. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- include/configs/colibri_vf.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 1acc6e5056..9effa56539 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -12,6 +12,7 @@ #define __CONFIG_H #include +#include #define CONFIG_SYS_FSL_CLK @@ -28,7 +29,7 @@ #endif /* Size of malloc() pool */ -#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024) +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -118,7 +119,7 @@ /* Physical memory map */ #define PHYS_SDRAM (0x80000000) -#define PHYS_SDRAM_SIZE (256 * 1024 * 1024) +#define PHYS_SDRAM_SIZE (256 * SZ_1M) #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM #define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR @@ -141,6 +142,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* USB DFU */ -#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1024 * 1024) +#define CONFIG_SYS_DFU_DATA_BUF_SIZE (SZ_1M) #endif /* __CONFIG_H */ From patchwork Fri Feb 15 22:20:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043232 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SXP5Gvsz9s3l for ; Sat, 16 Feb 2019 09:26:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 05F4DC21FF6; Fri, 15 Feb 2019 22:23:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 39285C21FC7; Fri, 15 Feb 2019 22:22:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6DE01C220E6; Fri, 15 Feb 2019 22:21:39 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 861C5C220E6 for ; Fri, 15 Feb 2019 22:21:35 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LqSzX-1hYDHh08ED-00e7v8; Fri, 15 Feb 2019 23:21:32 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:29 +0100 Message-Id: <20190215222039.10005-14-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:W6NS6Iz3Exxgwl9c3jC3gHHqnuyGz47dEJUHAgQL0gH2Gj3UAYj e/RxGEeLYhqEduZjrPHbq07kuDpaxMTS8DdT1c3FJvfAPfYG6/Fq1XlRUHmtyqSHycGLaGy /kwwGDNRdbTOb+du1ERF5OOVOLhRUmEBOuhp6EMSHmRxmvJkT8eAK3xI5V8+gW+8ls3BTpI HCVWhhJtGDoWozEMjXWmQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:nDLFTP02ljQ=:fC2sGSwEN3ddr/foQCnH3J H7ddHZ0FO+oGGL393f+bu38iaOeCiPoLYSSQGMvQwkc8Ks+juIHl6ZIyHWSGOx+Gcbymgpr4L d6FDg2rs2IlqD6Hn3PhwHpeUb/y6XRsxoNuDIvNZw8U9sbFBhAa/lxheVIjOsdNm7Rcx29nSM kn2S4Aj8oPex4EUe4/GNX8f9gfXgBThpURnAh8jUQL43feQH3DFvUwV7YihC4LGEvS3H9JMOu N29NpPf8nCEo1G0hI7iWuKc7xQekfDIh+ns4Kh8LKrLLWCJ0TR+QtJnioq7lmacwvWAY0YJhV BbUBxtaPEO+oTtyPtoA1dz5hf6v4M76CK9/iQG8Ucw7PFoGU0l1Ot++q/d9ITgIBCBzOivsPi 3nMFa+CY4lk/50g8cy7XWY0IVizuIbg1nPQ9iiixBYu5aS1OHDEmdAZ83vNh6jLER8Hq9Ti+p BsNzlTxRDxZovwk5ngnfL/ghew0+qDK6SXGDsw6TQghPhSLxaSC9HLwvWUZLkM7ImMXz4Ni6Z e4OqTPF/08hy4EWquEO8kDeWi/TDV639JruMKZ7yY93yARdFp/UqTDIDaii1r+8X0xyVhKq1/ 0y/rsT8F5C5waMS65lCNIieekU+gwGW0ceRlw4sKdT5PYSi8khQD7agWGgHvnWX9kh8JLo8vF +eF3BWlhaHGWKdV0VPFKdUvOjhxJqcaAIbRGFsV7JV8uM5pg9SrNrk2yjICvZ4+T1eTb5LwWm LN1W6xDzmUuxCMCQozdfJj0eXP/rlA/J7ArJfg== Cc: Marcel Ziswiler , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v1 13/22] colibri_vf: add distroboot 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Add support for distro boot. This is especially helpful for external devices. There is a global boot command which scans a predefined list of boot targets: run distro_bootcmd As well as direct boot commands such as: run bootcmd_mmc0 run bootcmd_usb run bootcmd_dhcp ... Refer to doc/README.distro fo details. While at it also re-order boot command macros as well as the CONFIG_EXTRA_ENV_SETTINGS. Signed-off-by: Stefan Agner Acked-by: Max Krummenacher Acked-by: Marcel Ziswiler --- include/configs/colibri_vf.h | 75 ++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 9effa56539..83a33ff786 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -48,13 +48,15 @@ /* We boot from the gfxRAM area of the OCRAM. */ #define CONFIG_BOARD_SIZE_LIMIT 520192 -#define SD_BOOTCMD \ - "sdargs=root=/dev/mmcblk0p2 rw rootwait\0" \ - "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \ - "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ - "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ +#define MEM_LAYOUT_ENV_SETTINGS \ + "bootm_size=0x10000000\0" \ + "fdt_addr_r=0x82000000\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "kernel_addr_r=0x81000000\0" \ + "pxefile_addr_r=0x87100000\0" \ + "ramdisk_addr_r=0x82100000\0" \ + "scriptaddr=0x87000000\0" #define NFS_BOOTCMD \ "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \ @@ -65,7 +67,15 @@ "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define UBI_BOOTCMD \ +#define SD_BOOTCMD \ + "sdargs=root=/dev/mmcblk0p2 rw rootwait\0" \ + "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \ + "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ + "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ + "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ + "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ + +#define UBI_BOOTCMD \ "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \ "ubi.fm_autoconvert=1\0" \ "ubiboot=run setup; " \ @@ -76,36 +86,43 @@ "ubi read ${fdt_addr_r} dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define CONFIG_BOOTCOMMAND "run ubiboot; run sdboot; run nfsboot" +#define CONFIG_BOOTCOMMAND "run ubiboot; run distro_bootcmd;" + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(DHCP, dhcp, na) +#include +#undef BOOTENV_RUN_NET_USB_START +#define BOOTENV_RUN_NET_USB_START "" #define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4" #define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x82000000\0" \ - "fdt_addr_r=0x84000000\0" \ - "kernel_file=zImage\0" \ - "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \ + BOOTENV \ + MEM_LAYOUT_ENV_SETTINGS \ + NFS_BOOTCMD \ + SD_BOOTCMD \ + UBI_BOOTCMD \ + "console=ttyLP0\0" \ + "defargs=\0" \ + "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ "fdt_board=eval-v3\0" \ + "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \ "fdt_fixup=;\0" \ - "defargs=\0" \ - "console=ttyLP0\0" \ - "setup=setenv setupargs " \ - "console=tty1 console=${console}" \ - ",${baudrate}n8 ${memargs}\0" \ + "kernel_file=zImage\0" \ + "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ "setsdupdate=mmc rescan && set interface mmc && " \ - "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ - "source ${loadaddr}\0" \ - "setusbupdate=usb start && set interface usb && " \ - "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ - "source ${loadaddr}\0" \ + "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ + "setup=setenv setupargs console=tty1 console=${console}" \ + ",${baudrate}n8 ${memargs}\0" \ "setupdate=run setsdupdate || run setusbupdate\0" \ - "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ - "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ - "video-mode=dcufb:640x480-16@60,monitor=lcd\0" \ + "setusbupdate=usb start && set interface usb && " \ + "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ + "source ${loadaddr}\0" \ "splashpos=m,m\0" \ - SD_BOOTCMD \ - NFS_BOOTCMD \ - UBI_BOOTCMD + "video-mode=dcufb:640x480-16@60,monitor=lcd\0" /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ From patchwork Fri Feb 15 22:20:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043233 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SXn5FXgz9sML for ; Sat, 16 Feb 2019 09:26:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4DD1AC22050; Fri, 15 Feb 2019 22:23:06 +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=SPF_HELO_PASS 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 98DEEC220EA; Fri, 15 Feb 2019 22:21:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 44019C22052; Fri, 15 Feb 2019 22:21:40 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id C37DFC22056 for ; Fri, 15 Feb 2019 22:21:36 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M8gMf-1hG8AY1Ehv-00wD2G; Fri, 15 Feb 2019 23:21:33 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:30 +0100 Message-Id: <20190215222039.10005-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6FL+bwbByCk1UPyyaWdMq5/2Nlow+htifGai5j+qcTeg+05+ga3 bS+3nMA0cQFtUUIqRXoRzp4kdXyMv/YOV3DEUshY3Lwzuye9kqHD8z49CLnYsiAywr3S1QH NpYbUxAqgN7DCYgEujcNnNE2XegogZb9n8Y4lQJBjB7ow5qlQ9zPky0UdXighMBgkrg4bY7 pcnSoTPlaAxKz28iZQj0w== X-UI-Out-Filterresults: notjunk:1; V03:K0:tqoIEeBfqbE=:IYJawXCDmghJzDZNGv5B2d lAPy00IyRbcScCk5c9oz59kiIXTBhnhe1Gzm2n0637e0SfigU8Rvoamzb1pp0QD1xtabOBSGa 0nHZIUAH9caDO1VqYNCAO2O1nS4GWs70MSce4TrNXRVX+9Z4F0UwRO5j9OTxKR41kdvEKwksx FonZ+kkaNofd5HmWEnJJbYWjnrdoMUWAkx3QljognAHcQCHrmVzKVCRAF259OooqSaxmtAtB9 9D8+UGQjwB00NjRPbn4RDZPwdxf2hymS5ZWW0f/cP/iUOn1PZvpVaYYHVqA5ZeHep5JKJQIjB KV8cfzLTaxgUN2pX4mz0TiUEQ8Jns+1IJLoiXl+phKKjzjq1XMnubDr5CuJnYtCGpx787B53u G2drPxwDVDKUeqQz1rfFCEB6cGFtAfqVRHJ24rDenLH22O/sdLSS6+D8oz5pRY6DOGM3uRYA3 ue414IfcN2yO4ibPvYJyf7o42claDBXzNAmEJqmgTtTfY/JQK/Xqdy9ACiZzZhWlx/dmQaNQz REFqXGX+2rKDMp0K6+mNBPNWkpaLdHn797ZfCTXGk4v6bVZT1eKD9KsOoiC0axN84f885/h0b XVImnawX4GfC+aHPkv6NzgQ3FbEQqzcIZsm6wnGmgL7hwKqqh0IH/q7hAgOnGHEJugI27AzYc kTsn8NihbjCKoeV+kMrqU8028fqgi/2FU2DFb0kXFi5+T/VUivVnsaSIzXu5owz0bxB9HQsXW Q5ybA/H92A1e5VHoiVdFJNbMvJ1XyXiRg2l7mA== Cc: Marcel Ziswiler , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v1 14/22] colibri_vf: set fdtfile for distroboot X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Set fdtfile to represent the current board. This allows distribution to load the correct device tree, which in the module case often deviates from the common fallback ${soc}-${board}${boardver}.dtb... Signed-off-by: Stefan Agner Acked-by: Max Krummenacher Acked-by: Marcel Ziswiler --- include/configs/colibri_vf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 83a33ff786..0bbeeb902e 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -86,7 +86,8 @@ "ubi read ${fdt_addr_r} dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define CONFIG_BOOTCOMMAND "run ubiboot; run distro_bootcmd;" +#define CONFIG_BOOTCOMMAND "run ubiboot; " \ + "setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;" #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ @@ -108,7 +109,6 @@ "defargs=\0" \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ "fdt_board=eval-v3\0" \ - "fdt_file=${soc}-colibri-${fdt_board}.dtb\0" \ "fdt_fixup=;\0" \ "kernel_file=zImage\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ From patchwork Fri Feb 15 22:20:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043242 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SgY44C4z9sML for ; Sat, 16 Feb 2019 09:32:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 46F31C22034; Fri, 15 Feb 2019 22:24:04 +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=SPF_HELO_PASS 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 CA930C22112; Fri, 15 Feb 2019 22:22:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5CBB6C2210D; Fri, 15 Feb 2019 22:21:41 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 1DA12C22075 for ; Fri, 15 Feb 2019 22:21:37 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lgngm-1hO0XA2O5m-00oGOL; Fri, 15 Feb 2019 23:21:34 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:31 +0100 Message-Id: <20190215222039.10005-16-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:3alMZqrIoIcHjU0v7uzQaM8MTBXKGCtPRDJqCj72y0TuIg4FSXn 6RCb05IwmaneymENFkeNl3COOAsX1Hn9VwokH80zvTX87QAnCdANkuBJRDlysBQMUaMCSYG nj3z9mp4lX+UxMab+MLI5hXTypZAXhk3Fn8aUDO+TVdrbpmGguDDSmSVMC2RlB1JgCT/5tu pjv7jLjIzfcL9d1oBGeXQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:JYHTn2niNLI=:C7qW8NUjHT/KKKn4OsF37M C/85tIrr+2jHfU2EjfR5nVoc2vxwQuuvi4bglJPzKGhaA4DzPmxbqPOSBPJ6OrAZJLgKWyxVo 2lN3OpVOgbDerKMIv30y9JHIx9h0OnxU8Thgr6lvhH7UED3huY4C9sCOMfdSMiDf28uYy2Q6H zliyJ6O8Fp1UMLp7Q7MI2pAkHgCQrkOkOcJ557b5JTQ61jQLJgcwcvZn8dEBJSDb5aekYuxal V1yPnFPxIWNrm/faIG9fP1xXcJCZO74lfHi6o1ezEh6MFS3XE0aIzZ9GGOMTIvjbyGuvYG1eA qymxfzP3Z3TbJ4GJ/rVxNo2Q3fXnq2+TBwtQb1/D1YJcE1D0kbGn//xD869lJcMaZ+2Je6o4a oZaQzt5ozeYJ72yfxEeh238ps60LApNegCsfSwe4jTqXxRDSUbhl1FPMNpVBamqt8DDdWJKT8 WqA5LkTE7383s4q1e2hwAqB6Une2gGcXhWLdpLdXgMs+KHob8TjjkMue57UMfJ8Cl6DcShKdO mnf6xnOfaEB0isybO+qfLyPaY4uDahYSTe+c3hE8bGHwEh1AHqDbtprE+ZI98ZeNxPpBzvqNx jZO18Gscy1XFTXLKT3slYTeEcQxMcSy3l+5hDwgPNqE8vV37nut4LCYPGM471ZbYrffElbDZK lJGzRBGVu3eStT3wEVPsV1sDK/dUKSN1XzUxTUMVdaCRZ/peeCA+34eNpcqVaoRweJ9wjoZn7 Lhc0qXdJJBNRqunL8GpogssDIiS8hRLhFqT4Ng== Cc: Marcel Ziswiler , Stefan Agner , Bhuvanchandra DV Subject: [U-Boot] [PATCH v1 15/22] colibri_vf: sync the board info message X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Bhuvanchandra DV Use similar info message as on other modules. Signed-off-by: Bhuvanchandra DV Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- board/toradex/colibri_vf/colibri_vf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 421a4791a1..d28a73332a 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -405,9 +405,9 @@ int board_init(void) int checkboard(void) { if (is_colibri_vf61()) - puts("Board: Colibri VF61\n"); + puts("Model: Toradex Colibri VF61\n"); else - puts("Board: Colibri VF50\n"); + puts("Model: Toradex Colibri VF50\n"); return 0; } From patchwork Fri Feb 15 22:20:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043231 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SXB0JqQz9s3l for ; Sat, 16 Feb 2019 09:26:01 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9AE4AC21FB7; Fri, 15 Feb 2019 22:22:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS 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 174FEC220DD; Fri, 15 Feb 2019 22:21:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7B9BEC22051; Fri, 15 Feb 2019 22:21:43 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 56322C2210B for ; Fri, 15 Feb 2019 22:21:39 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M26nN-1hDwIu337b-00u1Au; Fri, 15 Feb 2019 23:21:36 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:32 +0100 Message-Id: <20190215222039.10005-17-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Nic+DqAh/tMKaG1uxjr+QcgW5k4xeP8EeCqlXLEyQSJxMOkoNNa K/vY97wWqe04mU9/PsyVQu3XIMhZ4OTNTQ6Q0Sfet24Rqq+EU1mq8EOzZ+vbsLawUR64wAS HC8izd7GTWMt6nsKa0Wm8kRQSEdx+TfVuy3ONnNm+J/uhstt8AThs5VkexxFF02nsBWlMDN PujNhEVAiQ5A487tLsNZA== X-UI-Out-Filterresults: notjunk:1; V03:K0:KTCn9fUjHoU=:IcM/uaIvs7mj/8/uZW2sfZ svJObtfiIoHuuvpzl8UgLV4DCFGzw3m4h14Tcr81GctlmVmI/CA0+LB62/jVohSUQuMWBEV7o thOYaB3ELjor4+tJmubN/TEhzo1Fy9mqP03gWKbNiWGnasR8yHYiL7uzv8kZNj2xrnAVpWMgS OcNvX2r2SV3x9vNEN8KvOi8PSfYnN3aUVf25expm69a0ngdzMdxB2nLqsMFheYqy6MXVfc3j5 z/ld/crqS22ONofxIq6Al66DFW/y1ltPzvnwhrFvooXhGQ96JSP7aTDa70ei54O/ec9sD3f5T PBxKAnB5PFWRiJpg3WBLLuMJOU42imyxz+ND2kqpW84V29U0s4VoztAtGX4IOOaCewT75lGKj DnYfm+FiYWfqpsxEwTs+kg7ROW/6oWM8iILO313A5YoaazLySK2b9cYvoTCGWHk0X7Dd6SyEi eS0xijwy51+QByMAZsDlNPRAiYo9eTOeER9gvCSIQJ/FA3f3gpA1A9WnmDfX+IbH2IyWCqSzk pXME7dSq+8+ZOBEcDyY73DFWX72HTGlnoVdpcSqeJlPM/B8/bxFlS7elVxX3KgZcD+qdHmqhy T+tYoUU8d+n2zhwmw3LGNsSpswj8k7ykU4odGGldJbhu4Gm/m1QMv93Xo1sxjmji9ktuhZv3B rchlcULm2Ulzt0CPt4NiNIdNZCFoi634XNynln1mPqVKlhUGJY5iaJuyB6CgImMGOKIhhW/pY nkOGV5Q+n1qjXIRElwYGh7iHvl0k6rdh5G7/pg== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 16/22] colibri_vf: enable user debug by default X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Let the kernel print some debug messages when a user program crashes due to an exception. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- include/configs/colibri_vf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 0bbeeb902e..030281bb67 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -106,7 +106,7 @@ SD_BOOTCMD \ UBI_BOOTCMD \ "console=ttyLP0\0" \ - "defargs=\0" \ + "defargs=user_debug=31\0" \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ "fdt_board=eval-v3\0" \ "fdt_fixup=;\0" \ From patchwork Fri Feb 15 22:20:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043228 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SVX1FbLz9s3l for ; Sat, 16 Feb 2019 09:24:35 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A4E12C21F7D; Fri, 15 Feb 2019 22:22:38 +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=SPF_HELO_PASS 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 9BC49C22042; Fri, 15 Feb 2019 22:21:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F01B7C21F7D; Fri, 15 Feb 2019 22:21:45 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 7ECC5C22107 for ; Fri, 15 Feb 2019 22:21:40 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LbbhN-1hMdUR3ZHP-00lFiS; Fri, 15 Feb 2019 23:21:37 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:33 +0100 Message-Id: <20190215222039.10005-18-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:0ygvNRQPbqCpq2PeIWfJlwMc52D0BOaapXUGOO6UnzKIUNyKxbE 4hqfkyRbMepA38QRlfHweIZJVbsJKVAbaYdWkjnxE3gPT1KR2KpQ+fMKXCsfxtwXytlShdB Gv/1p8tnnH9Brv8vja4DlN+VKtqhFXoDtDtGjjz5WSNjXKZGXmtsYtq1sObBip7xX/Mr+Db 4jXbAOOQM9QrB517qmnMQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:CrPh1srZrO4=:l7qLahdciEH1U38RvH1rAo mZXrwQ5WQ7sp0X3c60EGsa3sFqYm8vLdKmK+PPAap4IsebVMLpkLfQWrrJvFsETGmgqJID5a8 sg7izHw8WNKE4S15VSyrexZnDliqkOlMb1/X8AMdo+pyxbwVjRhFWYPQRkAW5SANOAgxQAtAv OAgQ42cLF84i13IY1acXpD63c84lvyWXEsyvByL2UL3fyWNn+Ax/xKjNxdunie4FLEt4oPpHm H9uzSZcZGfRxm5bdEOvsDTETNdinV5M5fc5ef79x31XNDBO+zwY9KegXrf1zRazY+T2IaSVvb TSG0cicm5PdDHfcSLseZZiMoTlWlePJeuzpaOojZNYUtxtkAlUYYJfT8c0NNJ+DvyUBcIAfcF tiym2+TnZkp2ueFn7CGgEMyEwHde0jeSgjTm2PMHlzdUr9mwW+0EmrYtkD9PCchGeeIIzbni9 6RJNDIu63wGPCW7dk+vhZ7onf6wZc3ZCxAk1rBbIlXlkhyyk96mHIpy1GVuOT7xZTNEgJV8hA SA54RRMpVzK7l5On9nkhqn7DcsoPuJriqmC1wZjYqLfaj61SYGTJNs3sRUYLQiQeVU/1z5nZ7 WVe+VUzwCmCbCOa8Z78MAuYNjoN7NS/vyeo20Kzej2g/zmhPjs/Rqf2I26NWc4fINWEgC1G+U 4QbMw8k6bTlosNkYhyslXw8rmTa/79AKMhuPka0pnm7dxc2iipf8jlBiFzH8jIjwtxu29MkTp sr0yIUcSvffv7YzlxaPiP5bnHHRNlOsgC5YaWg== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 17/22] colibri_vf: disable undefined instruction events in user debug X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner It turns out that OpenSSL calls undefined instructions to detect ARM capabilities at runtime (via SIGILL handler). This leads to stack traces e.g. when logging in using SSH: [ 877.464442] sshd (613): undefined instruction: pc=76ee2da8 ... Disable undefined instruction events since it is used as an autodetecion mechanism. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- include/configs/colibri_vf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 030281bb67..b2f27c1977 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -106,7 +106,7 @@ SD_BOOTCMD \ UBI_BOOTCMD \ "console=ttyLP0\0" \ - "defargs=user_debug=31\0" \ + "defargs=user_debug=30\0" \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ "fdt_board=eval-v3\0" \ "fdt_fixup=;\0" \ From patchwork Fri Feb 15 22:20:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043241 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SgW4D6cz9sML for ; Sat, 16 Feb 2019 09:32:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 46C88C21FC7; Fri, 15 Feb 2019 22:25:46 +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=SPF_HELO_PASS 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 B9576C220FA; Fri, 15 Feb 2019 22:22:42 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6B360C220C5; Fri, 15 Feb 2019 22:21:46 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 83CC4C22056 for ; Fri, 15 Feb 2019 22:21:41 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lebpg-1hQCOF4834-00qSFh; Fri, 15 Feb 2019 23:21:38 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:34 +0100 Message-Id: <20190215222039.10005-19-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:QZJAbicKsRPkAPNRWIHpswrblV1FZ3bFtjXKas/NzliXahb9Bav kSRWL8dkzRoYM5r055MIYnaa7OA+8rXZSeExwEjr59fvIlwma1oc3U979kyTD6hAvrUZfdj Aiv9CxuR2wl0kG9in1Q4/5I1i1mbRK568PEK0CwGtE+HBHLT2jOvNL4VnhRINzoemEJ1kn9 /6/JCAS/t4mg2MNQuX0WQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:5N94mGTGdX8=:Qt9k/ONrgxg7OWms+Otu4B IraZYOW3i+9d0Vun4vq4Q6thhTPs6m+TAq2vp7/ihqMpWbuFEYDEPFOVyRO5RIr4XdrstUFPE YKhG9aVDXCh52rwGOIzLBtMTvpCmu5CI/ZuuApbjq02Q4+c1QuMLOJcUdObvAwojoAY7WlcAl c3ffeTZGsce0qN91tTrBUryrqy63Uc4QqY2yftNdg39dM0QxlAVrceu/d++WGg5vrBrHAW7l3 gH1pqeeugy31pxGOMFKXHP9iOhrjAhrQ8CAvUZGeuiTBPh0fPn3JRoA2eDRkeZz4Wvq01o+RM Qn4VXYbCV14jSjjct8Q3kDWqFxP67nLgZXBql/Av2puEx2WlHfQYCOlx+yHYs1FhopUBdrHCg 9wd2xx0EordAKStDjflKd7CQnFCDJZrirwCKtCdJoNHaoT8nEB4ZYED3bQxYYLQu9l8zbPjN2 ZdIue2SBAV7bT7TKIz7AnSBHW1GITV4ON+amS7a2IGm92h1/1fWZkpv9hkpQcCzax9qCFJ7NM A+FFnZZpixJVzeEk61M9pAENfPP8VnEJp/ASsxZa8WQ5ROpj+tGL3IqdsMEfHzkY/ezauZUun QSYicSHfrcatuVjde/GUcZUiYwkDEURwj5Da4NOjcc6PWm7I7sTQYvjIxT9J+69quR9TYHH5i fMOGptkjVYSXP5vZCMMp/jNqKb0LCWsMu+QouIf9VblLldsEtRBxfJoF9OVPIXqN5VUkB5yqq B6HWTWmDchKAAKvKMpiAanbZ1ID5XXV43FjHJA== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 18/22] config: colibri_vf: enable mtd partitions via dt X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Use device tree to set MTD partitions of the NAND chip. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- configs/colibri_vf_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 344fe77234..8f6cceca7f 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -91,4 +91,5 @@ CONFIG_VIDEO_FSL_DCU_FB=y CONFIG_VIDEO=y CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_FDT_FIXUP_PARTITIONS=y # CONFIG_EFI_UNICODE_CAPITALIZATION is not set From patchwork Fri Feb 15 22:20:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043244 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441Shc63T2z9s3l for ; Sat, 16 Feb 2019 09:33:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7A7E4C21FB5; Fri, 15 Feb 2019 22:25:59 +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=SPF_HELO_PASS 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 57A26C22026; Fri, 15 Feb 2019 22:22:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A3B4EC21F98; Fri, 15 Feb 2019 22:21:52 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id C3C78C22047 for ; Fri, 15 Feb 2019 22:21:48 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LkhhS-1hT0kh3XwC-00aZ0x; Fri, 15 Feb 2019 23:21:40 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:35 +0100 Message-Id: <20190215222039.10005-20-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:fh9s/9ybRfTfB01cKP1fri7Ha2NftdwT07SWceNA7ZU+axGgLKw 9ecmSDZJxIXUPxi9V8OfAZCwnHRFclXn4ZUKrLzoha4rhP5Z+AzSI+8wBiUO7GSMYZlVIIF /qsB2T2t7fHwyUssMCqvi4uBS60RmYZu1FXdkN6ORZcBsgn2w4wd5RUUshS79VbzNTesvQf 9YMgLhDRR3Vw06NlNZpHQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:XhFOpPnzHZw=:feRVDNeTmYFJvVtMWiTW8W 34d+AgDYyvKcPuEZ2PYTPTO7kZBx1dOg4id+veBWQ8cUILYyZUh/RWd9a9HWQrCm2Qxy4DM61 hHpwah4AiBGXt3KZfyq9ErkWUbmLuaxDYUACSSh7fpM/yEUYqY+Pg3i1JM5EFxsCi33Rq49Nm nglkvO2SMx9uF63q8+aPZpTi1o6v/Ty+1TH99CMnFJyr55N7FKubWhHIggEw2kxq+p9t8mX2C RhM5BlNQBMiBr/cX/2itZ6x2R0AJ385n7g8AtdkScbDfXTa0zr++yUUKL3NBNCgu1HNJepQqA ItFYWLVNwL59AaCbDhzO5/lDJNBF5zg1HOXvASxcqAPFyPWpc4LS2StK9pssoEPNcnlgHQZZs KqjETiDk/srLXj7yBnqets1aCnJqeyzlHKvHMWuj/7kju2YFo3+mg7qQolEEVe7G56aUi+2VN 872+1iF8JIALcQRTnJe0u4VPJDLY3qcHRpiI3kA7FpL6qdPooCX63JbZitemnqYyCongkxbOz vy/dMPP014u1iw1I5VBKK1H5mu5iD+Xo11tQB+1nZzOtri5S4nm0RTJomv1OLo/CPEk8CTTpx AQKgi9fsmpp2rf/nOn0JEOTazTOAPiSEPT43eRprJWNvL8BcVHeKaAwZNJQ5bQSqEwHsn2qLp HRKQ0fQ4X7oQRLrTDysnZoNeedwIPMvW+8FYBs7s9gva8GCgSiPF41PEFB7x5uZ3KsWZSfK2C vtRoB9VmFZk75g+6sEVJDqYIOyV6svvvo4WyKQ== Cc: Tom Rini , Stefan Agner , Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v1 19/22] arm: vf610: add uart2 clock/pinmux 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: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Add support for Vybrid's UART2 (Colibri UART_B). Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler --- arch/arm/include/asm/arch-vf610/crm_regs.h | 1 + arch/arm/include/asm/arch-vf610/iomux-vf610.h | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-vf610/crm_regs.h b/arch/arm/include/asm/arch-vf610/crm_regs.h index 9fce49ddc6..0c9ed52933 100644 --- a/arch/arm/include/asm/arch-vf610/crm_regs.h +++ b/arch/arm/include/asm/arch-vf610/crm_regs.h @@ -200,6 +200,7 @@ struct anadig_reg { #define CCM_REG_CTRL_MASK 0xffffffff #define CCM_CCGR0_UART0_CTRL_MASK (0x3 << 14) #define CCM_CCGR0_UART1_CTRL_MASK (0x3 << 16) +#define CCM_CCGR0_UART2_CTRL_MASK (0x3 << 18) #define CCM_CCGR0_DSPI0_CTRL_MASK (0x3 << 24) #define CCM_CCGR0_DSPI1_CTRL_MASK (0x3 << 26) #define CCM_CCGR1_USBC0_CTRL_MASK (0x3 << 8) diff --git a/arch/arm/include/asm/arch-vf610/iomux-vf610.h b/arch/arm/include/asm/arch-vf610/iomux-vf610.h index 01bc2998b8..8ba03e5a17 100644 --- a/arch/arm/include/asm/arch-vf610/iomux-vf610.h +++ b/arch/arm/include/asm/arch-vf610/iomux-vf610.h @@ -132,10 +132,14 @@ enum { VF610_PAD_PTD24__GPIO_70 = IOMUX_PAD(0x0118, 0x0118, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), VF610_PAD_PTD23__NF_IO7 = IOMUX_PAD(0x011c, 0x011c, 2, __NA_, 0, VF610_NFC_IO_PAD_CTRL), VF610_PAD_PTD0__QSPI0_A_QSCK = IOMUX_PAD(0x013c, 0x013c, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), + VF610_PAD_PTD0__UART2_TX = IOMUX_PAD(0x013c, 0x013c, 2, 0x38c, 2, VF610_UART_PAD_CTRL), VF610_PAD_PTD1__QSPI0_A_CS0 = IOMUX_PAD(0x0140, 0x0140, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), + VF610_PAD_PTD1__UART2_RX = IOMUX_PAD(0x0140, 0x0140, 2, 0x388, 2, VF610_UART_PAD_CTRL), VF610_PAD_PTD2__QSPI0_A_DATA3 = IOMUX_PAD(0x0144, 0x0144, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), + VF610_PAD_PTD2__GPIO_81 = IOMUX_PAD(0x0144, 0x0144, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), VF610_PAD_PTD3__QSPI0_A_DATA2 = IOMUX_PAD(0x0148, 0x0148, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), - VF610_PAD_PTD4__GPIO_83 = IOMUX_PAD(0x014C, 0x014C, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), + VF610_PAD_PTD3__GPIO_82 = IOMUX_PAD(0x0148, 0x0148, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), + VF610_PAD_PTD4__GPIO_83 = IOMUX_PAD(0x014C, 0x014C, 0, __NA_, 0, VF610_GPIO_PAD_CTRL), VF610_PAD_PTD4__QSPI0_A_DATA1 = IOMUX_PAD(0x014c, 0x014c, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), VF610_PAD_PTD5__QSPI0_A_DATA0 = IOMUX_PAD(0x0150, 0x0150, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), VF610_PAD_PTD7__QSPI0_B_QSCK = IOMUX_PAD(0x0158, 0x0158, 1, __NA_, 0, VF610_QSPI_PAD_CTRL), From patchwork Fri Feb 15 22:20:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043235 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441Scp6f67z9s3l for ; Sat, 16 Feb 2019 09:30:02 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7A07AC22026; Fri, 15 Feb 2019 22:25:20 +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=SPF_HELO_PASS 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 7D36DC220D7; Fri, 15 Feb 2019 22:22:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6711EC22057; Fri, 15 Feb 2019 22:21:48 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 6EAE8C2205E for ; Fri, 15 Feb 2019 22:21:44 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MaLU6-1gfQq44ALg-00Jr0l; Fri, 15 Feb 2019 23:21:41 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:36 +0100 Message-Id: <20190215222039.10005-21-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:lKbO4Q+A2aQ9f23rtaUiSBFLSsIeI6wd8UHt24rR8aF6+ZoWJ3A +sZpmQSm8DUTc1t7Z9Nt1zytVq6wG5YdNLK9Fe5LuMxUptUCxHDOlD6WNUhqIsITMOhVld8 L1dvc0zsJgbOCtWZYNcziPcGtRGNnBNeORgETuO4sN9Ig58uvjc9ZGYv4IQxcV63Z5bijm1 co90331znOwxUr6VArmbA== X-UI-Out-Filterresults: notjunk:1; V03:K0:0QxfPF4y0Zc=:nFXND6TcV1BQQMn0lvTVD/ 4sGPK9AKZu7gW86dqRL6ushYA3X8ysVwzJzFzjFSAbxEk8qnJIXaZkjI/NTK0oTy6QlD/o9c5 oJe2LfXaMeSCc5dhgbUecVGDjTVrG+UIzGbdtPfk1y/VDXWXzQ57QwVauZiH9lsr3T2c9cqu6 TVx/2C03kFT4wbLfJgF0DQeD5GnJ0iQtQkqalPuCdGHTBejd0g/CzidRqNtElylGh0HWnl2Ai H7oosJaz+FcVwWuOhDHO3Vl0c/dZqECIZPjDcHY649JPGmq6dUg9Sg6020Cg3xc78zcIjd86c 33oKgrCA8WWe7TghbmNt2nUIho+J8p0UWvNRu3C1HEkQiXdr51Hej8ETYCME0s3KMwT8iWHzG gGXpIBdMs3U4ShX431u0p76dTnb+GqX/QTHZuoz5J7vSr2a2toJvxc9y9/Xe4Ft6RQ+4kpmRs StPOyQf0qnla96GDSAG02fDUHgVJvweQZeyA9puGHy9aYEe+/2z296GVTWXMiGOJk0wyhhKsW 4AJEzpgwJHixdPcqMgsFUtydcfeX+Rt2ocgsAn831jPKcfGvWxNMu0AVwP948QD/DbTaUtyAT YpRCX778VXbBLQHXAKdyKZuEWa2cNxYM4+XuHlWBkvwZdG53VH94acmki/VB3M+L7NNLL8XiK wnScD8Ia479JdyX3UgKh6Wf7X/Eu+oqij8csbdRkp9LU1BPOtYv51LqNzv6ZaS7OxirSu52IA vW34Z7xnhlw8bBFqR2R1LVHpuoxBJ3qVaKZuGQ== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 20/22] colibri_vf: adjust timing according to data sheet X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner Using the DDR Validation tool in Processor Expert uncovered two timing inconsistencies. Since those timings are related to the suspend mode they do not affect or change regular memory behaviour. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler --- board/toradex/colibri_vf/colibri_vf.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index d28a73332a..8c4909af54 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -99,15 +99,21 @@ int dram_init(void) .tras_lockout = 0, .tdal = 12, .bstlen = 3, - .tdll = 512, + .tdll = 512, /* not applicable since freq. scaling + * is not used + */ .trp_ab = 6, .tref = 3120, .trfc = 64, .tref_int = 0, .tpdex = 3, .txpdll = 10, - .txsnr = 48, - .txsr = 468, + .txsnr = 68, /* changed to conform to JEDEC + * specifications + */ + .txsr = 506, /* changed to conform to JEDEC + * specifications + */ .cksrx = 5, .cksre = 5, .freq_chg_en = 0, From patchwork Fri Feb 15 22:20:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043240 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441SfM1qMKz9s3l for ; Sat, 16 Feb 2019 09:31:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E60F7C2210E; Fri, 15 Feb 2019 22:26: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=SPF_HELO_PASS 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 3C3C8C220E6; Fri, 15 Feb 2019 22:23:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C1A80C21F7D; Fri, 15 Feb 2019 22:21:49 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id CB2E1C21FFB for ; Fri, 15 Feb 2019 22:21:45 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MJlT8-1gtfvu0U2G-001ECF; Fri, 15 Feb 2019 23:21:42 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:37 +0100 Message-Id: <20190215222039.10005-22-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:zIMVVA+V5jRo+S0YuMTf7r8FBxRcBilKUVBXBViUeEwDR78cJLi VKOW+1H9NTLyo0NJ0/Y4L9SEAxpmCnt4GZxHzLv2lw7hw5jbWHcekYOA/LFTyG+n7hxfE0C nEDRgdXF+pHwCzTdvvuF3Y7PpDZrbAj787WAZ0+iDt6ibjNHenY+/hsmTGT1lDiSOsY1toy HBVRkMjkKdQZR00rbx1xA== X-UI-Out-Filterresults: notjunk:1; V03:K0:2nS/eyZfE6A=:9GlzpUeTE6s4S6R8IvtjHJ KKVFAXlAm7yUN8/UfTUcvVY7Rj8plTqKzNfjdmkBgmBaOs5VS5fGFQ1k7rutEMgYsI7KHUh70 0Eu19hZ02d5TpE4drTDaEPXFdn6O8syRiVRXV7ylzWGy4k5011pBHeS5KB2ESJWNEur/rYqSM oVJy6lb2nHHt+uOzJXxFkUk0L/2vY6xjvXNVR+ieEx5/LwpzAlesoHj1GqphfMPE9EWOqe6te vL72HnMRtbnMv0fnmuVOzKS38Unf2tCZ5xiha56XMf93vqOhUyog3rLM/YYLqSEObASzmijwv EWgUK9XSefvtbTII/jPkmjMKA4p+DJnRmWlfUbdg2h6Sgb+8eHpo504DmxFA4HGve3OVc5NIR 316eBfBOGZ1DC4f0oor4y0uWWfECdvjTQS27vmrJuuQt5cMT/s9Cvu+BvOPvi9Q666OGsu/va es/twQx//K7DU7VShi27I2KKRLAaActU9x05cU+qO8I/s9a1FlCUZqcqyuyeGcZj9qY/F6jps wWtZ21fOw9BOhZnMEeYS5ScR7NNmfMJuOccGRMa9c5xlaDD9oXg8bjed19dzibdwxMDPRzKOD pkA+/slBgfmqfomWQPj/T3PbW2ejpu6w4vUnbfnzonREsPBFiBDrOYsIBUYr69lkA5LiyMUP+ l6ePFexQTaNmurDwYip0LQ4l5TvpZqK9lX0BMlOzZWd0Mfp/r/ZVYuieNWz8vjB5Tm8qyderU UmR7RkbKExuswi8u/4BF1ldvEppq3wEHSjzhlw== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v1 21/22] colibri_vf: use leveling evaluated by DDR validation tools X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Stefan Agner The DDR validation tool (which is part of Processor Expert) allows to evaluate leveling parameters for CR105/CR106/CR110. Several runs have been made with Colibri VF50 and VF61 and it seems to evaluate very similar values. Use this values by default. Note: The newly evaluated parameters seem to require CTLUPD_AREF to be enabled! Note 2: The tool also evaluated 6 as a new value for PHY02/18 GATE_CFG (Coarse adjust of gate open time). However, this seems not to work in practise. Signed-off-by: Stefan Agner Acked-by: Marcel Ziswiler --- board/toradex/colibri_vf/colibri_vf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 8c4909af54..87debf1360 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -27,6 +27,13 @@ DECLARE_GLOBAL_DATA_PTR; static struct ddrmc_cr_setting colibri_vf_cr_settings[] = { + { DDRMC_CR79_CTLUPD_AREF(1), 79 }, + /* sets manual values for read lvl. (gate) delay of data slice 0/1 */ + { DDRMC_CR105_RDLVL_DL_0(28), 105 }, + { DDRMC_CR106_RDLVL_GTDL_0(24), 106 }, + { DDRMC_CR110_RDLVL_DL_1(28) | DDRMC_CR110_RDLVL_GTDL_1(24), 110 }, + { DDRMC_CR102_RDLVL_GT_REGEN | DDRMC_CR102_RDLVL_REG_EN, 102 }, + /* AXI */ { DDRMC_CR117_AXI0_W_PRI(0) | DDRMC_CR117_AXI0_R_PRI(0), 117 }, { DDRMC_CR118_AXI1_W_PRI(1) | DDRMC_CR118_AXI1_R_PRI(1), 118 }, From patchwork Fri Feb 15 22:20:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1043238 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; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 441Sds70Htz9sN1 for ; Sat, 16 Feb 2019 09:30:57 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 887D5C22026; Fri, 15 Feb 2019 22:25:33 +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=SPF_HELO_PASS 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 266DDC2210B; Fri, 15 Feb 2019 22:22:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4FD8DC220FD; Fri, 15 Feb 2019 22:21:50 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id D0CB9C2204B for ; Fri, 15 Feb 2019 22:21:46 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.163]) by mrelay.perfora.net (mreueus001 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M8jvO-1gn25b1Z6q-00CBTz; Fri, 15 Feb 2019 23:21:43 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Fri, 15 Feb 2019 23:20:38 +0100 Message-Id: <20190215222039.10005-23-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215222039.10005-1-marcel@ziswiler.com> References: <20190215222039.10005-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:pFnYhF01OWaJo84NWv5W/aA1BKxGaZ3ez5ghh5dxGg8aNp/uCbt 6h0+DOx+ZqPAZ7Maq/AnHUvDzXRDVAytp5pj3cgeS59nEdQnK4uTcd2chRmdhh9dCmYxE36 P0qfqJ11k6Bbzvywd5B3Z/SKJJndM1BQBmNK+5NyWbWFCQLVkDUc1jcmkp57jakqtvCsRgk eaRxc+GflRRRoA37ltggg== X-UI-Out-Filterresults: notjunk:1; V03:K0:0HXp5o7ncZg=:cfCz/KxfpqAeaHbqUQX3BD nPYr0jsmAmDJvTRwPky5w9LlWSF59CvFaZCUhEgGMnuZbx7700i3dlvgmdxydKdbcPWOc3GzA 9ttH7Ftwgfp5esb1iFYHQLalTfTDDJmbvUqnOOCXdQ+l0gbghhCOiBSyi/IEuHzaWQLxWuz1Y 9ilmByoeao1TBTZzvoYj78jLCK1yoN0OnxfDz6kL4TiJmP4l7+jLtI/n7YgknqdicFmVJJZ5Q DpSK16QPxT67QwdT7j/iOACRg03dk97+2iabN4hZqg8mYNmdJqO3JxJ1nXpRV95UcyZCbZmvf Nq1V80Rz3uAzYcNyT1n8jCdRwftvGqL6W49FgcPmlr7CbEz6DfP26dDbMj+phvZ+vs/qdwR3x r93m3dE3vfUEi7veCKNzZYAWLXRW87GPZiIsnTVDETTgnCy6QRpWuj+Ue+uRZWnaYkBHvZqFj CblMd+KyVe/EOtBxIgBJDpKEhFY1Fr95Wogcily/OeGEpKlE/qvteCndGnlDsLJl3EcYi4/8z xsqFq5L6sdH1uQok+UJN3Jb2e+kL2Rk1yIuIuYIoUXjmkUl8NwNZ5SrQhdjgyiqmftPT3+EXL f+6JBr1VxlUdzSDPUHgVC0jVsVfdFJP+WU79x03y35FS/hJ/v9S6s7/oMH7gHTcVYG9ycfelX 4xgwyrdmpsIWS9qvU4dQxxmPtTVDdQcnsyrkdei7g0hMOuCWKd93ChXRLULH5T8+n78qcJG1s 24ggGgykCFDDnbLm8MUwQD5rxlAUeEFbDH77DA== Cc: Marcel Ziswiler , Gerard Salvatella , Stefan Agner Subject: [U-Boot] [PATCH v1 22/22] colibri_vf: fix sdboot for vybrid modules X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Gerard Salvatella Currently, Vybrid's sdboot variable tries to load the kernel from /boot of the root partition (typically second partition when using the sdcard image). However, since we moved to flash the kernel in a separate UBI volume, we no longer deploy the kernel/device tree to /boot, hence sdboot does not work in its current state. Load the kernel and device tree from the first (typically FAT) partition as customary on all Toradex modules. While at it also change from rw to ro as e.g. systemd will re-mount the root file system rw anyway after checking it. Signed-off-by: Gerard Salvatella Acked-by: Stefan Agner Acked-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- include/configs/colibri_vf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index b2f27c1977..0d57e303a1 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -68,11 +68,11 @@ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define SD_BOOTCMD \ - "sdargs=root=/dev/mmcblk0p2 rw rootwait\0" \ + "sdargs=root=/dev/mmcblk0p2 ro rootwait\0" \ "sdboot=run setup; setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \ "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "load mmc 0:2 ${kernel_addr_r} /boot/${kernel_file} && " \ - "load mmc 0:2 ${fdt_addr_r} /boot/${soc}-colibri-${fdt_board}.dtb && " \ + "load mmc 0:1 ${kernel_addr_r} ${kernel_file} && " \ + "load mmc 0:1 ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ #define UBI_BOOTCMD \