From patchwork Mon Mar 25 16:24:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064532 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 44Sfl256wfz9sSM for ; Tue, 26 Mar 2019 03:25:50 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EAAF6C21EC2; Mon, 25 Mar 2019 16:25:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=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 79289C21E1A; Mon, 25 Mar 2019 16:25:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2B028C21E1A; Mon, 25 Mar 2019 16:25:43 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 79974C21E02 for ; Mon, 25 Mar 2019 16:25:42 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MPFiA-1h44h32vDM-004Q0Z; Mon, 25 Mar 2019 17:25:34 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:51 +0100 Message-Id: <20190325162512.8702-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:BdSnq+vE4JSw7spWE8Bms0iVESwWJrXv2mHiYBHFzL1dApm+hoM +9BMB21+7SVbx9uK9CbLgSBOm2bsk1ZQMemNWnOCjWc0/3mnxNbCDstxn+gkpUL++Wrjaa1 1u8EFaXSAoQ2G023CMzisBPtLjmvnftmFZ21vx1lOG5RzGvHVmWOYTBIXf5nirik+cLM64f CL+Z1wgwSO2sc85f4J/Sw== X-UI-Out-Filterresults: notjunk:1; V03:K0:tWonkl13h3c=:l4Y0de/tyd3br0Y3VRxjDQ GbQ9r/ehK+95Mhf38ABYEX2qpM0HzWALwQzt1fJwVtqLHGA2NRYukd9qcgf1CsFjKNd0FeOl8 6hFgsPhtyEG/CI5l/KZwa4mm/GfQVwwsybqntBtQ+xwUCy78uQynWz6tKPN5u7NAZEmna8cWA k8hWKuFYaJNCJfEaWGtbhnhnNnfGmn9OU+tGw6IToqfHOjUFvlIRonDuwXl+73MzDDcJs/fjt C9OJWLaQsUQ8zjFLIYCIH0iSGs74L6Qf00UmQCbZcQFWLebpW9cVVuOakYpCy0pOKd+m1GI3q bG+3pLzMJxHUlX3OG4OqWpeq+ulPCRGXgQByYgVyAsLXgAqPQ5BXJclxBf6MjTYYwdPs8Tc4R rjLlo5BbYApWEuxZb+77BFPZFcwX/JA1tTrDyV1TmlF6nJot0HO+jZZYs0qQIv1e5VLNefU6s D702ZqEeel0k/UsCHh5nXBeWfFz5tlw6OmANTKy7r5rsspOpBcBnyqv+2jIO1Nf+RZ03B6pH8 tfGBGl4jZ16JD5lblskNY5AcTpxXYhWulbrDFm2Hw4rysmDhNpzd4aPbg27YIlS3O4Ie07Nk7 6teLQP9HK2u9VJul6Rz1xWhpfunFXL7mfPfUwnT25FWM6jZ2pOMc+K9iJlitVtSHh06IOp7+E day/gbZ2C5knE4mlEUIDgW97yr8oVVWyCIKjpqKR2wo+zmykj8YWd7GCftsX1O9uucvL7SEjG KO0yYfGM3x2ou1RQgnb5R9bpczB2EKM7pzS7hw== Cc: Igor Opaniuk , Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v2 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 Spotted two missing spaces in comments. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- Changes in v2: None 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 Mon Mar 25 16:24:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064535 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 44Sfn13vdDz9sS3 for ; Tue, 26 Mar 2019 03:27:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 2980BC21F82; Mon, 25 Mar 2019 16:26:29 +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 EAFB1C21F7E; Mon, 25 Mar 2019 16:26:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 91DCCC21F7E; Mon, 25 Mar 2019 16:25:52 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 2F5A2C21EE4 for ; Mon, 25 Mar 2019 16:25:49 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MGh0R-1hCdI90zoX-00DWoM; Mon, 25 Mar 2019 17:25:36 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:52 +0100 Message-Id: <20190325162512.8702-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:TY6Oa0coG2L/JK4+XVp+ftlKPSs63Z1fhAHYo4tjhDuejn5UpqF InYi2yUmNlFkWoEmzGCOievWt/wTMmj27i6+D+Vejo3Ztt5cG9CzFsdNU6XqQ8bJoQqy8CO 7pzFzMQBz5TTm4KMdzSppnuLPRMATCoyMTKEOZnqNjmLaWewsBOGsit1dVzCwXDQrDYguST bsaB1oTA1P9yjhR3mM9fw== X-UI-Out-Filterresults: notjunk:1; V03:K0:t5c7T6vrAXE=:OdGSnIZ+kqluwJXXIvw/5J 1a/XMvmcB/9wr5R2GcVtK/bpRTRWJkmPmEQBrPI9ELrPYP7XIA6QJ+r6H7Ce2GCjU+n2AXJJx sXtZ5FPUJIYX/xnnKB+wgi/R6A5ZaGZoh0rZLrQHGB9o2WZnnYxcW0hPhy4mZJdW6erC91lwP Vd7dTv9YdgzOOQPKCGUDVEXwdXV6lQTiC3lW7696isXWrtDFuEhjd6EoSSP8Ne2LTDvECDmhL ifY01swq3gL0zAT+QmOTXYVlb51XoYTxab/vDhhID2rHwqXtifgg8oXGwAoZDaox/KEUlD2b6 3NAfwFG0I0fvx5wLgnczAABqwOavVdocyIvaCl9ws4YUO6MzFY1556jRm8fuZyyJRAkvOt1hH uCgVYuEFHyG1OKjPbnO3Ki+98QuaEf4UHhj5c9uY25GKujR8un+y+D+pO5qLqtNOueTXTk9KC bKw8VVObSc7CUrj+ZHnYD1rT0FU2echuuZM94TTPpTmvrfyLwxxoOEPHkXq8Hr9a37mkKRPf5 dEIN//y3vb/HOEwMBFyjhwEolucusliBEPHwTrh8E06YHgzH5ZpwWOEkBeYF86hvJTFumwfAk s/hrsf6KglQtewmrrefe3Im3pFKl7/COweUUOd2bGW1UXY4uefLEcgDy2KXpYZ8aM2R9g2F0t VQJPWuB2LH78kLHtB7qCvW9/BEFhxPCAXPBCeU+dWttev3Fq3vxbpCQEM8oF7HGH8EgyiQUBr xH3sr9BsGCsJIYjsyFNCcLwecS4kYeJbT+G1Sg== Cc: Igor Opaniuk , Marcel Ziswiler , Sanchayan Maity , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Lukasz Majewski --- Changes in v2: None 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 Mon Mar 25 16:24:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064533 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 44Sflm6lFlz9sS3 for ; Tue, 26 Mar 2019 03:26:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8D511C21E88; Mon, 25 Mar 2019 16:26:01 +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 0635CC21EC2; Mon, 25 Mar 2019 16:26:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 072DCC21F9B; Mon, 25 Mar 2019 16:25:52 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id BB5B5C21F24 for ; Mon, 25 Mar 2019 16:25:48 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MHEyD-1hDBWT3cJP-00E4m8; Mon, 25 Mar 2019 17:25:39 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:53 +0100 Message-Id: <20190325162512.8702-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:v7GGdQViHTSCuREUVYvKi+tojLMzVGUJWW/cR9X9Yp73/uwM9S9 sNbS/Y+Vt5Z6NatqwbUbmx7rgxdVPf1h/gIgCEqFf1Tvznui+duU8dADNFjiVhZ9C4EMAzk xoPsrTWansx+NgOdblMaHbrQmtwIyMfN5SlPRsFgRRsmIGO6JhsoKMSnW0blljSm3pnW4Vl t5HbzTj18KrZ4dndVI3IA== X-UI-Out-Filterresults: notjunk:1; V03:K0:QD0skX3Q/C8=:amPnFrhSurVEaJvbT15M+8 gDhnCNlpET6zyQLES4z9SSKtR5eiyfNqgncd3h9hBfSqDkwMxq1iMUs3F4/zJQAf8ZKaUjEkx uu8TKiVBrc9UhfgOK1mQDRTK+YzaaOHdiCvlHhQz/6kChEK0gWGryz06QsDdpCvWJnHSyJskX OCRV3zrfTTy0naFqaUk6sjfn5WDUcI6CaPtE8kEAKwldJXJgsdM0bvtaE04roa7n4OqjGn/yn qUaHuxKTblu/wKL2iDyrMc0I66SebtVxzHRwkJHReG8RQfS+Rq8FA2Cf1VWivcQXXgtMaYmjc eHFKWqsj4iCnErtDJFNk/QONqhfnNI8Onj3PsbL2oT21lQ9N04SEmDXnfQ6/JufezupGMMwir 4ANboTS0HhCmFMtILggZcV8DkbHQGEPu2InWCM51b1ZqNwTx8ugneS+GKzEl/nlyfg2hExZDv qo74Ejo/feZ+J0d7M98TGe3UqMwd8JJSjSM9B1FRsAtAt4/EDGBWn9OAyUgXuT68KDgEl1gn6 T7cPk9Y9yhUghi64eCxub5lnAivoRckbiXPQmIy4toDRYOlkDtdKne4MiOOswII7pJt2hhHDM TH8PSQVYve6ufL29hCmAhhblwgHrtXD9pPA9qcztqwphlfFJodENFehOhWW0vRM9ieZ7r3qHB YLBuQ8fQMFlaByYfZHw6WC84kmSd17HgP2Wa57End48Ar/eWxlIZXmZn8ML9KOeZU84MyBLbE WrT02Y2sqw2Jbxb6ONkK1Fpe97q4y3+8HaVMUA== Cc: Igor Opaniuk , Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Lukasz Majewski --- Changes in v2: None 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 8631fbd481..ec09ef240f 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 Mon Mar 25 16:24:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064538 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 44Sfpp1mwjz9sT7 for ; Tue, 26 Mar 2019 03:29:06 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E10C3C21F87; Mon, 25 Mar 2019 16:27:39 +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 A15A6C21E70; Mon, 25 Mar 2019 16:26:25 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 211F8C21F82; Mon, 25 Mar 2019 16:26:06 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id EB320C21F0C for ; Mon, 25 Mar 2019 16:26:02 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0McFtJ-1hRVOy15gF-00Jb5A; Mon, 25 Mar 2019 17:25:43 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:54 +0100 Message-Id: <20190325162512.8702-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:JitLYIUB3mLVIxKF2vVwXpZO7L2/jLszx4axm8SHFAOSG+BybAN QgBmbUIXKCw2weWwzvrdWm2Wax+84Ize7prylYFFV+OXcnWAWl8lVroKEd6OgsL5x6LOiN+ r4aRglE4Ibp6dxL6271YepCKz9HBfeEATd0As6gSocNEkz27NQXFEGQd+SpmnpbLDGHK4Pa PwP2S7FmOaPgEAVrCyvag== X-UI-Out-Filterresults: notjunk:1; V03:K0:tu+Q5dDnI20=:A3vz5W6mD1QQr7WF+9uV6B Ze19a6s81GiBZ9bLlQ7+q/mH6tJJBIbGyomYX9qPSIK1f1mGVke+UvrUDYoeQd/A/7QXSNpvD PyppJaSSZMTHVasBJIeO0hDZPoq+IGB105Pym/ZWw3mNtrSIv/Izt23A3LbUGX6dL/C2W8znd zTX/gv7LZ3cn8pog5W0dbpw0BGl4kcgKJ3CZ2zAWNudN4IIBP+BxQmT1Zk793AwZYFAYaWqzY FzIZIoqsxam5ijgjGh63/EOzWsZl4T8rKjqR8BOsS5/cNBeotHsp84U13VCHRvjJd1v3eSONg 7wI+lVMg3Qm3dWL0hM2fYbGV+Oy3x90Uc3BlkCwM3UOfK5usqnlX4yVmECXWE2VQwKl4hzDJc FnwcdvqW7qrtBW6BmDvvVp3fLAjtCnFgTFl6u7ZcTDRq2/ffx7ygk5xZJUpqYsy2x+fFvcpp7 MGm6myZa1dJnvrKK41Y+cMh24aZ5ihjZLnrAbckhAB8Ud/POAILehL4Xdg+nvd+ZgXrj/aYV3 Y9IdkkRv8XUjYrrZ7RIuBmMGD+syJF+zRwJeAI4KMj3G0aqJ+TlKSUAuumux/aLB/aoriGhEW 22rsMqh+GOTqk0bKnzqlX0duVmYCyd0eORZRXTVOzGUAYebcf20coaYGo17HNy00+h8Ff7fHu XoAjdP2vZyQ4WnUaZ+B3vKjIVpzdqzPOJ835T72U7ZpKj4Vqg+q+Qn5OfzqHGBzHb1xV+QrxN tLBYgFuRrHu1w7trVYSabEHjtVMTSVgbNVzykQ== Cc: Marek Vasut , Igor Opaniuk , Stephen Warren , Stefan Agner , Marcel Ziswiler , Michal Simek Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Lukasz Majewski --- Changes in v2: None 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 ba1e6bfa43..0fbc115801 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 db00376d92..7c14b24bc1 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4522,7 +4522,6 @@ CONFIG_USB_EHCI_MXS CONFIG_USB_EHCI_SPEAR 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 Mon Mar 25 16:24:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064537 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 44Sfpc1ql7z9sSp for ; Tue, 26 Mar 2019 03:28:56 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E1CC7C21EC2; Mon, 25 Mar 2019 16:26:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=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 9B26DC21F59; Mon, 25 Mar 2019 16:26:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4CD50C21F0C; Mon, 25 Mar 2019 16:25:52 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id B62F4C21F22 for ; Mon, 25 Mar 2019 16:25:48 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M0SIl-1gphbw0WcP-00uarG; Mon, 25 Mar 2019 17:25:45 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:55 +0100 Message-Id: <20190325162512.8702-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:KOM6N4GY7pzS9XcVjiuUNbqNIHPI20pDvQZPI5S4rrSY+N3NBHB rpYPYarEsXWxKrcW4W1GnsW9q9ONQ82y+FYn9s6TL1k2JPpcy9ySeU5sqc7YNcmyZ/ar59k xY4YbQ7v4apba6/RfCTJxiWN1VFsdcwzQxBoJgYIwS/luaO8NVEQzwZg/C6g00Eq4hVBYff YE6N65nhG49v6u1AwyhEg== X-UI-Out-Filterresults: notjunk:1; V03:K0:5wrM+8e6z0M=:w7umcK/+4LVFlKBZxS+Wln McyZKKu2zp+p/RNlP16725Nvs/bF2vYw0k5UpipjD9FSPlLzD8IbxFovyRigS1fLckxT36IJk 5NVstKnM9jeuoox/O5DXV92biwc968KyDm3yCW4IvZOu5TofFKFj6ihmDVrvBDWHw9o7BI74v bygAUAjEIssIWGnhkAJsDLExYaZ/hO7rhZ0UiJ7c9bctGo/w8PiciIo+a6Vug2XdA5dRzBdYl PiIeaI+PMUNuFGEVIgeKQ6/iN1Cm3Ho7ubMSEVsDrX1Cf+f6umGXs90E+Cf0DJL+vB3tEy8Vn z8jKS48vhUFehqBOiZUZjOkOoJYcO+RkKg8yP+NxAIUpff34P/Ifl0DFGsSjEDw/U7hOFFTpy Bd1Ifqn77+QREjyX6bQjFqN3rabmOd8DLyrvrHIEM0h639ENRe5eV4qGonyG+3WFqKJWjVToQ QITp5CeJYwEyTTlObQnUg90Q5pbaZzIzaX7bRQcz3jumLJ2kTcmbKXJlmdSBaeHlHnuzEazHe E7rxPrh/NCsQ25OU1KiBmEmO7IosbS2pcL9wzlArefMK110uErlZrMW33zA677QF5IhNiPZBA yYtoJ2JUhlujqCiz1yktApmGjdYxrOvXGHdrqwE6gQ6j2Y+9m0XMDpuBW2FxsF7H3MvZp+NTy Re7b5b34AQ7BZrsdksalETj7SNPYNlcqXSivZ3SxASeL6h/nj5eX8CqCYMr5YW6++dVepIcax saz2nIoopFrZFHdEyk7XySBt5XVJSm1dRJcx7Q== Cc: Marcel Ziswiler , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Lukasz Majewski --- Changes in v2: None 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 Mon Mar 25 16:24:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064541 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 44SfrK27nCz9sNf for ; Tue, 26 Mar 2019 03:30:25 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D21ADC21F35; Mon, 25 Mar 2019 16:26:15 +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 71380C21EC2; Mon, 25 Mar 2019 16:26:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 00CE4C21E70; Mon, 25 Mar 2019 16:25:54 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 74242C21F58 for ; Mon, 25 Mar 2019 16:25:50 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LpuQT-1gWOa53iKd-00fgMu; Mon, 25 Mar 2019 17:25:47 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:56 +0100 Message-Id: <20190325162512.8702-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:N6A/I48hTBxdM51usTDDOwwmP2hNj3d6sLtaNQTCTTvwPWIkC2T Z7nTyZykVLXyebTWIbtMNfaWqWNqYPKuFtJyT3lhCR+dEFPyGyxheXy1GfJj7cOPKEAuG3y iDxJFG6wXazpwnBiHMmtTbbgT8F8N4HQJX/R2QCNG3Pc4fwyn223m9aaCtLRPz9aM0t3fVj jz8Oy0cEa8ZeE6XYkQp9Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:2aPzhBUXc9M=:1RSe7M9mwvdye5z/l9L+LP 2QMC7Rn1lcstS78CBxHq9rCJwE/78UNjK1XRTnEMc0xXaNd9axQqTe03Q5phulQLnaH5fF6x9 F78V4J5kLZwSXdBFpQnelnB4H2AhRbKH8Heeubzm+geVQntpYAKHBelzJaLgLGGXqExTA7xIY zmrW+rpoIXvtV6HtNDHeeliBLpNweJsR4ibGUJcrMpHhu0CWdKGtU9xYpDU7QB32uvSAFkyD8 4SFxgDXjugTxGWDA5EQ/rJKLVlUPAdPjauUEQsj1TV/mHWz+XVy/BkCeA4gKWxTMdQ+IWXFPF mgD9CBn2rBAULbZHXoSbUIxyIWCTyE7UBfFeYVI6DKy2hP3ATHLiCeLS9G/+LVeRlGmZuwMwW vTsA7FlsSApR2lTAgdn47J6+5j1eicfYgozC7xzhE+0S19xpa8sEqMkU4yCNwxgyNq+GjxkKj O4hmMC4samumpJFYPLhGWhc+7qovlw7XIeB9/iAXvTKQOsZZDAyEu3WBGCK7IxvVuOKLZ4yd6 glf67vkC7yE6cY4CRjrSvZoN0SqPRF3i52wINBb/GIRoOzP9SGdQMZG0q7TTEkG6xewIiexD7 vAfcwNxEw7CieujqzZoFYQUQ1YrvMC6A0XvsTWXAeIvS0A50SP2oWyfHMi82ZLreCLME8ptJx zkCC/eCBq0HjCSNhqTtJEY1fNkS8p27n/asrYadszGL91ewjafzxtt21HAwl9sG6qmf4KcfS4 JSbfg1wi89b0sCmseSMTH7tJDbK6GMgUZ0w6iA== Cc: Marcel Ziswiler , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Lukasz Majewski --- Changes in v2: None 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 Mon Mar 25 16:24:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064571 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 44SgPl73Lyz9sRx for ; Tue, 26 Mar 2019 03:55:55 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 3BBEAC21F24; Mon, 25 Mar 2019 16:55:35 +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 999DBC21EFC; Mon, 25 Mar 2019 16:55:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6046DC21F79; Mon, 25 Mar 2019 16:27:58 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id B1A49C21F58 for ; Mon, 25 Mar 2019 16:27:54 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LkRJt-1gXTyd22ln-00cMz2; Mon, 25 Mar 2019 17:25:53 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:57 +0100 Message-Id: <20190325162512.8702-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:xZaIF6g/5WcCR/aV6ZW7F5d+P2fldZxSgRnHHmnmNqcwTXYwcFQ sl1PhIiIOlPrttFEKqSogTBwu1lO+suhtTxPZAv4TsE6UjD1azreLVYXTnTqVuFgs/bQFEO 1+XSe/Xnd84mTylm+iDSh7LARuHx02sCZN/8rMpnt0jBXiTLAEQw+EF5qIOSoVmgrUAu5h+ RNrPAMo8tCIq+6cnjteIw== X-UI-Out-Filterresults: notjunk:1; V03:K0:W4YRpVZhS9Y=:DMiOqMWnNOSbaoroUZfQGG S5iKTFco0f8DaXn16XpDMF6+aBq18mvgWe6/x/KR9rMyhTors3k+seqr1JAea9IIHnkZn3UOO n9RQWi2TUNWunu/7gSTYoJkfteITDofTI/SK8cuHSziIWHCuSqRf4XFnwAQdk/oz7pz0lTD8I oY5Vczl1Fo16+tSY5A69ciBy1FHoCAaDWPViTLIIyOcsArjfAeH0f2AL4pdjI2ex8IQMMGVZc hLBCcurhGLDneEmCWeqeHsalJlHezgfseGsggHYnwr0kx3/3O6lDu1x5+19fEb+SmuzHxRxth t40endreN8Kv0YvQ8ZIiWVhBZQcd9fagVBgoY/vNYDx9YQlL2ubGHwCiQuPWVd310M/kas2Mw F4o7ryDRSiGzSd/8so1ARV1r+SGe9BbEYjx2e1eidbFO5KPLHGAYMysz1mifi1EMYpCPK3Y1z YCfX/2jeCO23ewUrc/3kNe3ABo7NG7ZMQ5n5lG7Z9p9HQmIKnntXq1CdUNjlPSRfOhdDPG0N+ 1pE8nfkcWUq12uAaiMrYgJjIleWgonahHaTkiF5Rgp6W6drM9YiOsiDg3IFJy8EoqB4rP6XSb rQg6QlYn/BLW9f0RaK0w7RU0tn+SMsBtDdI9zWyKMDjOn5pSIyp6HRcNdUgnEKrRKg4V6Y1Ys /8pau3rkl+2gbWSTYT2oxyj/cKAGcw16H8/z4qzQ3vIvzFjXHePUk44B2ASvv/iWDQIsZdpYQ 5iLfOpPE1spcd2kYMmK6oEIGyyLtBtY2d4wQOw== X-Mailman-Approved-At: Mon, 25 Mar 2019 16:55:17 +0000 Cc: Marcel Ziswiler , Michal Simek , "Albert ARIBAUD \(3ADEV\)" , Max Krummenacher , Ken Lin , Tien Fong Chee , Ian Ray , Andreas Geisreiter , Stefan Agner , Alison Wang , Akshay Bhat , Ludwig Zenz , Eran Matityahu Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 d6e677fba8..0e645f58be 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 a5d7cb1be0..134145c473 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 a9e38a70e6..6094d1bf18 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -230,7 +230,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 Mon Mar 25 16:24:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064540 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 44SfqL2QVpz9sNf for ; Tue, 26 Mar 2019 03:29:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 057B3C21E68; Mon, 25 Mar 2019 16:28:21 +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 16BFEC21F59; Mon, 25 Mar 2019 16:26:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2EE5AC21F7F; Mon, 25 Mar 2019 16:26:04 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 70F30C21F42 for ; Mon, 25 Mar 2019 16:26:00 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lgnku-1gfVOW2bkE-00oEwP; Mon, 25 Mar 2019 17:25:55 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:58 +0100 Message-Id: <20190325162512.8702-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:1D57GHMHLKAAJ1Uci59JbvUe83nDtdX+2BFtAr4EsI2kIV8liHe XUUuf7flqn0SIxGiTk8M0oZ5JYBH2IG5APrUrxTaYKSMb5gyT3r8QdwJ5S6RKOsxPPW1guq N5zCyulf/x8zLo4UkkZdOAGdpvYE7gHd7WGhOYqJ3PdzcYRLiVASBQpEbO4qaaRSO9VLKOp 1NidWie2br+McA1HHSYgQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:kXgQE+EDJUc=:PNgHr/FEzeNi4oqNFAlgdV k8kZ5zCDLLiSf1nfVbmSEQqm4MjEomOJzx9WAQR+F10wpInI/ctmPuw8n3CBqGqlmOTezE40O fQ+edBZpQONUPN47NdgPJmRHg30dtPRXI4srhVfSP9G4tnSqwGRHkGUoyWBhZ6c9AHf2xnVjh H8icX2W5RbPpBKw9DgeuL1Ro6zdjJ8fPb7V6cEl1tJ0VKNFMNEotmq2WXmeogU/wvkc20Uiae W81kVB7mP+77q/VT9yTujM+w44SDZjZEc3uoKHvyfC8Yll1jCCCD/Iypc2U4G/ZRxuQQmDrJV dU8epH0Kn/vs4htFWvEeDP0Qc+6ibcZVPqUFlVnNco0TPXhz9oaZZm6aJET+79BY6QzvWvIBT JAcoUEYFUySFrqI8cDy5AbJr7gVfWDZkSi22lmma5FAWZM17VUBtHo1vhK/u3pMYCM/pRyfIx 6152Rpd+BZNsHO+LOf1+peq7nhDDpE3uIs8UzNApX2czoRkp8tOfWB+DCT12xYjbWMpr4BXtH JyBRo7tR36ZsLVac++TrEergJLFxkJOdJs0TdEemAhdjmx4zuqHr6p9Pc20ABRabQ+tA9xWK4 R35/O+6QDxtxESDISuapiIcxsg/W1sOgZz1qLeUbLpv92gRREiHUuCWe8Q7mVH6jWSxDIGn9J pCN1huUuOTe8Ft8Vw+jlwNffCYreimqDpFIF2e5ri4qeebQ+Ecig+0yODjeg0f/M53x6XuGAM Gwt5imr5AFffk7NGjTkch5hOw1wC28GWh+GZVg== Cc: Tom Rini , Stefan Agner , Marcel Ziswiler Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 Mon Mar 25 16:24:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064548 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 44Sfw54vYLz9sQn for ; Tue, 26 Mar 2019 03:33:41 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 573DAC21F79; Mon, 25 Mar 2019 16:28: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=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 C0BC7C21E5B; Mon, 25 Mar 2019 16:26:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D5A1AC21FA4; Mon, 25 Mar 2019 16:26:02 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id B74CDC21F24 for ; Mon, 25 Mar 2019 16:25:59 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LqBwU-1gV0zs0rRo-00dkpH; Mon, 25 Mar 2019 17:25:56 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:24:59 +0100 Message-Id: <20190325162512.8702-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:gXG59bsQY2+kjwK17TjpUQLJfQLuODM4tNbfiEWMdKbc8L8nODo D/R6mynigBd6JJ9kzszrkRyexjSczKWT9TaBC86b6I9fk3MVw1oX3v2ov4YcA8/ZrvWz9Vo 9cZs3XQVpGzeHqz2rEtaChigfGvybb6c8NazykOX4FaSCcTi3YAVFKAQJbckE74Js79nrIS PySyRzEO/KWpOXQsXxcxg== X-UI-Out-Filterresults: notjunk:1; V03:K0:z7uMOEEILnQ=:c7lIrhbnYowGUq5aMVViI1 f1pep9Zz6PCitFV7OlXIhoum/BkyJ3kW212ncT/EqW33MUzHhgrz7FwMpqznm0his+rVm2iK3 BT7uF527ZMAr27hjEVeM3hRi8qpiHlrFxzm6n5IHIOP6giWD7qcJrgEZKyifi88E9vt6CJ4oT 8vHVF4zDz+m6IP0IAIL5m8Syd8N8GVoCLp4B3aLKF+TnFzXjNnNvJoguu6gxMpy21ACwPFlDM 3G9LysNFzAEMWk8imCp6FXoade4+nTw0dgvS1yWWKOThMy2bNt4uMoLsMXuDax/2Yx8D6zjtu 3y5n6vZgB3JSVmbwXlhJav335t0IlA5xtsMLsrg1faIU81/+pjjTVl4v7xZLLv4Sc3nq7A9Yy SYd7GqnTBVSnQ3Ujb4S5qADVDCgErdFKZfw9sv2ly7tT3Wl1XyMMu5XiVTpAWY1fnuKSRiNrB YW8uCVIS3Yc5BLslzrmLAjjzJyiu0xrv6Xy2/F2Q+AamKkuuEcn8JTS/R2A2xuZ1/ZdRgEaTZ 7W2Mhx4cM5YJzrrWdw8KWt/9FR1o3fbiSXF/S8347MF4Qo9EPxwX+huhLfx4jXKaBNQoOknnS 0fFjYR45pD0rC9ask/aT3xFrmoi2Lzv4SnW4bk/FgPp3Wf28Nvcoz7idE3B7e3q4bGj6mlzMZ suLMCa1BLQe7Hx4GKtkMGqW/Rhq633Pb9ABO37WQZSft89O5ZF2jQ224TIc5UcAT4rfFnxfoH tqdAJAzYIMzHJkr7Qa6EEIjTpHgbBLRFzlTsmA== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 Mon Mar 25 16:25:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064552 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 44Sfxz6jyjz9sQn for ; Tue, 26 Mar 2019 03:35:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 93FE1C21FDE; Mon, 25 Mar 2019 16:28:05 +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 3E87BC21F89; Mon, 25 Mar 2019 16:26:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C9D21C21F35; Mon, 25 Mar 2019 16:26:05 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id 87124C21E88 for ; Mon, 25 Mar 2019 16:26:01 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MF377-1hAzfC2zgh-00GHhI; Mon, 25 Mar 2019 17:25:58 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:00 +0100 Message-Id: <20190325162512.8702-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Lj/amJypb8BsSzY0d63VYot7yt+qs6ENhh4Zjm072uOR6wBXpLU FDm8s0tnf2QVlZYGl6p2MPYwNLOU8Do0247424FUONyJt+UdFGAvn8UVpbsjizlMTqp8Epp A8n+QriUW9t1rSLm3Ah7hg6Mx8fz6yDeAElAXf0CeP8VY3JpeX26QrQR4Zg/eJytukP/dNV WcwgncPPHHZvI3Q3bZ5Hw== X-UI-Out-Filterresults: notjunk:1; V03:K0:ogK3DTEFWbc=:nzHbJq9ic1nGyI/ycXgOqs 6lLyzDrf0NFecqQFkBGw30cyd5zwSLIEwxLD3X3gTfpl8xN4DC2/LJYWev2UyMOrgIseE/oDg Wr4H8J+ytZC50188a+dkHkAquqh7LfNgdxYb7XeTlzlHgVZsR9dT6oggX2X0Vwgk09N3IAqvW kMXaSGFBlGSVRlImvqZDYxFb7x0h11WPwY9Vztxs1ADuC2zNOBRCmHyq3mODEpUS0Fa3gTIts 6TJjteECoVE+f/dSIDnUI/PbV06XoXJscKAxsRGworSnZ3hiUqYWTq1Fu/ywnRT5+Cx3M6dqK W+p9pSUEaIp2cLeMk4ib397P50tk0UZtj8BajdILcOsMzGAixd/UjiPBW6NUbIm/D65IuriXL /OtPwzAixhaELfQFHlXxIeJfH683raesrgmFK4pqYmjReHoSvNz1kW5U4sZJeD2h8cFF1GaEE 6JM40u1TKX907nkvPzEUU3FT5ua+gRSeeS0sLIzmCnpLAPRmNucuPt3OHF7M8KnttBM4WwyKY 1NH+GiNn3Ea/uZJSztcrB9TafP7wcDyyPOQB0zA3Joq/4KsKEra5h+wjdXY1U0Ht05pv2YNk5 JaxmM8ninC9K1YC2ckQ1GQYCnM6j8OXaLlHH8E7iev/ySlcWWZwvIXQyLZe82w66ciWywU3kL nqrMVQ9Q0AIVZUIEQYIrfmnY9B82K0iALq48onO946oF191vlnx8LxTeGanL6cTtcwYTfHyKr 5T6gYlhZugQca6WjkqJ8KgXXcxmsQ95T0foM6Q== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Igor Opaniuk --- Changes in v2: None 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 79f702f2bf..8e0dea2dc2 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 #define PTC0_GPIO_45 45 @@ -89,11 +82,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 = { @@ -147,92 +135,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) { @@ -344,20 +252,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 @@ -496,21 +392,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(); @@ -594,8 +479,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 Mon Mar 25 16:25:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064539 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 44Sfq81m7pz9sNg for ; Tue, 26 Mar 2019 03:29:24 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CE942C21F7E; Mon, 25 Mar 2019 16:26:57 +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 203F7C21E02; Mon, 25 Mar 2019 16:26:16 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E2D0FC21F38; Mon, 25 Mar 2019 16:26:06 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id D7DA6C21E70 for ; Mon, 25 Mar 2019 16:26:02 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M10GX-1gqFqa13mh-00v8p2; Mon, 25 Mar 2019 17:25:59 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:01 +0100 Message-Id: <20190325162512.8702-12-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:F0aAi07CER1e1lRtk3y++AzJ8IayD4IzVKVe1kqVZFf24baO6Rh E1normJFwQ4ZTXgFy62wzW1lKDSf3xcIe5vL6nfDJpz7Vibsarx3PVzAQ12Z1sGiNuYZIEP Q9B4iSgltoArTsJxaCW7rbGWJkN+8ybd/ZxrHNWIxE2bC5uDNEy5eeEAgXwr9e0AshhbmdM OWH/LHotFElmQJnhANA6A== X-UI-Out-Filterresults: notjunk:1; V03:K0:IqOKudmXg8k=:TcbdzpIcMCeGPmuwwJCAOR H9gK+Mt4ALUAfujWDmy5BtBi91wcT9LmlmGrYO73bhBQoICvmTu1KkrJTfDHMnRhxliPdVg2l yxEneEknUQpJNPwOb5dNkW3yfbB/d5YPNda+hxzDFZzN+dKOWWUqZkpCi8nVbqnMgJso8RAM8 1tjsWRH0cYP/ej0SbnikZH7JnPD3hUZjIQMPybCjuybzPRHgKefHNlJDxdaKxcAk6Jkc3ow/k +F+LijGm3xpKn7Mw0zec/6hBGrLPErWNhxzpUU9WoSAXIAnJdJeef/MVo2Y11h2A7Gln/zRSX wu8sgcup5kovdtgE3Dy3kfSd21IuvdYWE95X1tZT86umUV7nXdxhVqYi88MLQixwAxDceZwMs FfuEXZiXJ87gU0MqC6voycSUXTG+71PCCXHNXAH2ulibUPR4bceGdC7Iyc/UJJxSoFdPC48As 4io+dYshZHyHFOGfYXOQgE9k+BEfnRzJo1vbdjisRcphIG4gL8hNa9H8XQzvlKo2U4mlZdMzH KUpsfhIBN1dDjeRoPdPv3asLBkWZUkzigzuHSX7ofSJ8ZcH0sKfo7xVcPZiuz5zNn+seH9+br QoqT3njZo7N/gTyxWOuGwMFULQJCdXYwYCtQr1MzcrZomHXEYPYzWGFXcdNixZJuxbYL8aaiK n+Un8MI8CYXBMx/k3KHXUbodSrBFq+h5vb3mH0TsD/FVBPHbwNOgJxB5ys85Bo4PH41APld2H i/9NHXV1jmEFLDzTfJkpFVd4DiFtYL500cTtGw== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Igor Opaniuk --- Changes in v2: None board/toradex/colibri_vf/colibri_vf.c | 82 +-------------------------- configs/colibri_vf_defconfig | 5 ++ include/configs/colibri_vf.h | 13 +---- 3 files changed, 7 insertions(+), 93 deletions(-) diff --git a/board/toradex/colibri_vf/colibri_vf.c b/board/toradex/colibri_vf/colibri_vf.c index 8e0dea2dc2..c4d05532fe 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -16,23 +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 #define PTC0_GPIO_45 45 static struct ddrmc_cr_setting colibri_vf_cr_settings[] = { @@ -239,25 +232,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; @@ -290,7 +264,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, @@ -379,14 +353,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(); @@ -433,13 +399,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; } @@ -476,47 +437,6 @@ int ft_board_setup(void *blob, bd_t *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 - /* * Backlight off before OS handover */ 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 Mon Mar 25 16:25:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064544 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 44SftN1z0kz9sNg for ; Tue, 26 Mar 2019 03:32:12 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BF6CEC21E90; Mon, 25 Mar 2019 16:27: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 B7311C21F9A; Mon, 25 Mar 2019 16:26:23 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E14C9C21F79; Mon, 25 Mar 2019 16:26:08 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 8A83CC21F89 for ; Mon, 25 Mar 2019 16:26:04 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MCaH6-1hHqME44Ti-009Nof; Mon, 25 Mar 2019 17:26:01 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:02 +0100 Message-Id: <20190325162512.8702-13-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:itgqMz+Bf18AoKOOU0LFwlduSiq/LN06kp/Nzbkm/OQzee4jn6D etV81kbcP3YSI5StcKJ73P+RE4HvFpyFi4txKSmv4QGrc4f3GgaPDwq706SK55uD6DSEmQi jnS8uOHSsf36tY482Rpl2BtZ3td8CoVjfE47X4S2In9n6381EHQTaXNf6JHsZpfylI3290N RsuzaKDCncDGtwJueLHXw== X-UI-Out-Filterresults: notjunk:1; V03:K0:A9A1u93rkdE=:NUWfe9kz4GlParXsNrlflZ ULDWuK4wHFDMb7dY5+pFTwkpdzdk49u1Ti1XyFpwaAE7LHMkWEJzmuJq69rnPw6bIj+83nRra aBOx9eJGiHZheNXX1d7ToUBsD+Irq2MgMenfH1xmw/F/HeSZVtabTR89oK/QAXUmE+3AxBlLm vMM1Xg6ELonuTGycGtdPFg9xI4/JQeGOMytfeMHx54dSeDaV55d/sEGjVf1RQF3r255p9oVbX B89csoDgNO3TmNp2vIWnJAILsH7qEz4o/ht0E8wBsA2H1Rbt3Nu1Ye/EiuWWcB5CeUfrAVM7B tp/NBFyhJuxM5KTSSxg+9fdygDmL/HvzEhMrJaWc7gQD1MeaM2K1hbZFLTTc6HsuKL7DnzYFF nOyC//bIgFwSZocUdFJmfPD9YZvlHsu5Qd7z4QErRKB1D0TwVfe0+KKxjn7ifFdmWxNt0QgoY Td4lWGESThDHQI3f8fIHz7PD9TXaKYL0qbtjw/vb9ineR0MenX+io/plpu0qUdLMjSkNzA1eq xHU+gEANjU1Cmkzl+vQmhxB8/ToyJdYoLTfWshKfv0Fr/Y4Rp8Uur6yydkDQlwhIDbAjHj2V6 0QhHWoC6QcbnLaBoxXIgDU98cWB4I9ljSGs/XyEQvAPTpjICYPyCs7DeXb6jQpsBkgw6cKrTh Baj4tudyLHhb0pODe2b9BavlIBxfo/veKVh8cQZYuOuD4OY0hCFPxpG6b/QHBspYvyRuaTxMC Nn2OmRhe6htHLnXtgxeufkn72Du3TZWj9Xz7lg== Cc: Marcel Ziswiler , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 Mon Mar 25 16:25:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064547 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 44Sfvy26mhz9sNf for ; Tue, 26 Mar 2019 03:33:34 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0C742C21FA1; Mon, 25 Mar 2019 16:28:37 +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 0A9B1C21F2B; Mon, 25 Mar 2019 16:26:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DDCC1C21F0C; Mon, 25 Mar 2019 16:26:10 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 39512C21E02 for ; Mon, 25 Mar 2019 16:26:06 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MNboq-1h2R4S2qQE-007AtV; Mon, 25 Mar 2019 17:26:03 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:03 +0100 Message-Id: <20190325162512.8702-14-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ExkdN3IKXTZ4GsPWR5ko8xX1ZvywxI5o31wOLJrGsZExqgHl4Uu f70WwI4HRbmBltuPq2V59eWrKm36X/UsmW8vC5xc8GpZcwrLlNj9TG0RxN+W0MqGDzS9kZl P4PfEWvIWFhawsSUnctgN1WeTFOiI3IokLDQJmQZpKq1ogFOAlV53QDuysZimXIB+ZSp5at R0mIO1oG5ydS2I3h2qDUw== X-UI-Out-Filterresults: notjunk:1; V03:K0:hf5d5A8H7Gk=:ssiHRlQintdRieeSRkl2Zp XwrUQYWk3R2Ja+pnDEgpGv9G4dOHf1G22xcdtzmaaHwi7ISBsANcuvVaT54JvK2lxsKGlVcHz QpObP2YLrUrPDKLTDLbz84ZGRVIWH6bjfAfCzdvxeKDbSp7JOLHIF9elGtDbLlrg+0yxfG6sy qWj3f/poBxLkqrsZGBxFbUJ0y7gyeVhyTZvkNAR9NmomIxDcsdF8ghJv3Ycukrv7hK0vY8PBD AV/5ydLNCvclTlLXdwRhvkyWLbzUwBgGuYxFP+wcPlLmb/A5nvYkT8bBk27CB7g/2Wqc3tWzf MhlIti1aiyeY9UrLkWKBLbmi3t1ygEaIPJbVM5NdH5HAqVkg41TZwB+lnUPDBvMXRvQzGERwp nTSGqYjtudZp/jdXVg9s58+yTYhbmaJ2JkqxPkM3pTRIazW0i6uvxeEI9JLLa6PmNIgRSO7ud 95yQqhWWvi2PymZfVg9FLq8GT0Mt3xS8h2TWadd5O9/idv0NsLWFODS20X/baRUJabLagTiE3 KnxYtLtuLy+5+XeP4nE73FgB3IhhLsEWSjakLiRMfYGZZWyto6E3DM0mkdq7MBcwPC03uFcuI f3LH6sA3Nj6AUwV89EUPl1+Ni3gTBmRc97/FPenFBT9ttOV897BqqNb5Kjw8FYYzYXr1VtGCV IgNM54J6wvEJ4inF4nmxQiSpUXtpnTVEZ985dRwj5cS53tT2UtSUcwagtgLeY4DYfxxzAdh9y GY3gmbN3qvaXFd/H0lJzq+XKWy3oMy0biZodnw== Cc: Marcel Ziswiler , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Igor Opaniuk --- Changes in v2: None 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 Mon Mar 25 16:25:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064550 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 44Sfxs4zSvz9sQn for ; Tue, 26 Mar 2019 03:35:13 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 64362C21FE7; Mon, 25 Mar 2019 16:27:11 +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 E9342C21E56; Mon, 25 Mar 2019 16:26:22 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6847AC21F7F; Mon, 25 Mar 2019 16:26:11 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 2ED42C21F7A for ; Mon, 25 Mar 2019 16:26:08 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MKaTx-1h9q031oPv-001vhs; Mon, 25 Mar 2019 17:26:04 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:04 +0100 Message-Id: <20190325162512.8702-15-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:VK+cgI1V3whAnYgWJMDD67cXhJ36l+7Z17oPf//A6B8sqzlbvtZ Dzy/MsUlHlY5cv1u06tQNz04Wu49PtHkI7xPsGlVOy53RbcMufibKCQV3T1C+Io27QbWnDZ Sp4B699I8O51DWEQdJF6/ErXpF0x+tVdJyC5HncQTC7aj8q66AAhsQxvdBIKvjtYJVh5wua OFHCudnqqW7kWUpL2I72Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:VS2dFQ/Rzhs=:MoWajSG2mczgHG4N95FJ0Y xFCkmT41N0d9jO22QsKB5lT+fG+yV4o52yAopEWk6sFUdLYJ8zdlZiRt6ZWAgHoef6Y1udAKV xBtbBnsOduSSp54Udag8kFG6jw533ioUpiEneEiz5beYaoMeuDZAP7cvMFFEbbtuDgw9Z95jt KUiKyWabwUof+fkLgQjIJ4xPJr6wWIG3K/0LYidXJu8dmHNe3Gzwi6Puv9IKKtWIxKtVxOCDz VwL52453Z5hjjvOHrDcCB9srlV/F5RA9WXKBfHF/VP3AQlUzzLTLIbEPdQ576O8Y/YZ+/++nA ZKH/q22UEbw1oh3mEZoU03uyNKXOjyD66TDZnvM5pV8yA+fjyyDaTAN3Zen7B4LpAFVx9mPiW j5B2a/GTWzVnTY+BSbBNcFSyKQLO3ZafBV054afOi3yByLWdtj94IlK7R28WlkEiUmesFaByy /OL3QaLriBvLlupkuSM28h2GmY818CKHRPhrU5hYw3m65QsvkqzAmNIqyCd7lB9eB8Aghiu0j WUOXNgy1GkN0QsHKcFxWw+OW8HGMIfiHSPYok7JMwYHnn1ymGqG13vLikdN97jPWateU8AFQo tKtMSWlSH7GBrJ+dk7g4JdpA7KRqtSBR9Ka6ThKKd1QIWyTtXN0GjMc1XYsajeWIPPrnHNbV1 1HOWzP4MlmQlB+i3XpQ7ZIPyMf2tjOMEoPFOf2NQsC2ivqp5+SRv73EhTs+f0DV/QwmQyx+7U g3+h9nPTywuNCNklkuSF5zxkX8qP0OgfI0lWxw== Cc: Marcel Ziswiler , Max Krummenacher , Stefan Agner Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Igor Opaniuk --- Changes in v2: None 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 Mon Mar 25 16:25:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064549 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 44SfxM61Xtz9sNy for ; Tue, 26 Mar 2019 03:34:47 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8E352C21EC9; Mon, 25 Mar 2019 16:27:52 +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 46C86C21ECE; Mon, 25 Mar 2019 16:26:30 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5D4CAC21F95; Mon, 25 Mar 2019 16:26:13 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 22F1FC21F38 for ; Mon, 25 Mar 2019 16:26:10 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0M5Nyj-1gls7l1VQV-00zYfM; Mon, 25 Mar 2019 17:26:06 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:05 +0100 Message-Id: <20190325162512.8702-16-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:qbmZr1Yqy6pHjdyyMd9VKcMX5p/aD9EBnnKzKUv3CcrbPgZCXM4 1PyAESIgEcUv/efovTl1qJ92yawI3xxPWL1CxS/K0N72bRwre5gw9D/21WtDJ5MvHngtmvt S8cdP8t/CumxtWsUQ5fzFy4o6Y0qh9Dr7msZHBQu79meSG4hnvzLwdouvKryDxYv/MlCeHf s0jnolVcxP24LEdDJdNaA== X-UI-Out-Filterresults: notjunk:1; V03:K0:3qNJuEaqel0=:K0mgBELPrR2L9A3R0XJMoR pw8YvMd8GG5pZcUVyU2DDfjA3PZoZwac3rV6ht4upClbDR3jYN8a5+GDmgpHf4ahMrMflhAz/ 4lQXbgRddLWncvUOkRPIbKIv4J9nPQXy0EXQsRIpCxth8044eJIeB/+iaMQdwwfjotUYKWlwp IlX31iadffKbjMpTrSR4w1PmnCk5PKTjFCpidw8g4TgJtNJkgLyYFbp+7wgOJOYkIPVVxQF+P E8hAXj1sBMff5xdEG6SKRNLl0B2g2kao0YK8W+4WFzSDnoRfpGAeLhu8TMmasMHhj1EzOT5N4 dULUmo8YVrqWVRbpcI1eHk+37Z3BLhbaxDztKWCHvmT+wacowVSVF0fu5w0FBY55Da7uVGPNR 4sGWHAWh7KE+EFH8oXFr64BVatv7iKEdKtKzDEPtj5k7NF7aRPtOptGx5h2grG+1zwlOY8FLo bU/JsOv/4KG9v+dUX5hxQw6TXxOjzomstzjXsECue/yko7TgXOoscM3lqq9SWSVILG/+BcTu9 OUeONH58rCXg2wZ1z8iizLeCyA1XTlGd83Zq2XDay+815LFLhdUzbwUX8x3NnAWtV8czFJU4o o22dmLcKcJ3tbLPIKVL6RppANlptFExqdn8L15MItHG+5mL9fp7Je+Eq8BfRcHHuU90irQht3 6g4PxzUPWdSwsTzuKr6q0MYNcXfPWh1cHvMgAZEKCCc3//eJpe2gfu39JMu88ngoGnj+sJBY7 cziEDaDNN70lVCie+Lqu3+T6jn0s2+S1pVjYdw== Cc: Marcel Ziswiler , Igor Opaniuk , Stefan Agner , Bhuvanchandra DV Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 c4d05532fe..9c5bf4951b 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -407,9 +407,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 Mon Mar 25 16:25:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064555 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 44Sfz420hQz9sNw for ; Tue, 26 Mar 2019 03:36:16 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EBF6EC21FBB; Mon, 25 Mar 2019 16:29: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 3F2DFC21F53; Mon, 25 Mar 2019 16:27:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1E006C21F24; Mon, 25 Mar 2019 16:26:15 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id CC22DC21E68 for ; Mon, 25 Mar 2019 16:26:11 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Ludx0-1gztom0IZU-00zq2t; Mon, 25 Mar 2019 17:26:08 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:06 +0100 Message-Id: <20190325162512.8702-17-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:br/uuX8dKS54JG+ZnKkcnM5RIgSfxsnJNw12487/FTA92oJ9bzH +pta1tPXAbqe5VfACYyreItv4UeCjVFzX8KcnCyLqp9iH7fP/cpwpdqLl8BUw3o04sQtzHX wP9CBUj96ylEBnYMf8gotN+x/qqAUx+EwjH1p3qKp6eFIZPrb19HXXJR+bFT9xKHcnAxcm/ wvoixZmxNnYKOIxmyVFFA== X-UI-Out-Filterresults: notjunk:1; V03:K0:sr3KOFwfUJM=:dF54MXacEeJxalZdLYYyHo vVP/EHqfRQ2sleaY4pGnHSaCIDFaEAF1EGPnANx79EB9Aoe57le6mqV3ZxnAUkuZP0IIK6bWC 2Pqu28CSTLjwsPB7vkE9lukEwF8GgkeAR0X+ljRFUn+a+v+kBUojCgLcjcE765flGacQm6cvs odMsxc//gbRFR/uqjQmealFtDG+y0omRhDoDrFBstKq7WFPFyzuAw+E5W+tPWuEJ5Fva51MJP 3WNliF13EfXkaCEjyACimy0x6x12Zd4yQapk1EMm9GKLpILKKlIx9vhM1fy6gwYSrlOHQfERK ecHs2KUweju13aLYYWHVFQB8TeoJVmE2y/FDEKUEe7swb361kA/pe6Ei9zlAZ9OV8EWV5wWyq ykxlVceRqTclPk1CZAbIXJ+U1pttOYDi2RbNIeLt36zLOAL9gZDXz4bqzxQsRSNC+ndzHPlo9 6RIJKihIcyRV/CIDIOezWIbW9uR892hOHdC4ojyaibZsjTZFNkekjuL7cFWMBX5C2DKZOC83t RJKhd8DCTPpo95DmdW8yxIRIIae/6GqL/jIzfvH8MD4603mI3B7ZdYITHgBurlRl7geOxZGw5 ejqpcATnj1mfXhx3owLL/itqU4aCV29SKNa8+E7gE3W/swBwDlKmZC5X6Wnphu5oQAK/0otrW C9w/8mrRZ2zY3f96VB39hMGWL3Xbi12G2PAnBi1BRXfT5vfpq9Bg3s48L9dyrzrhGm3qrkc3E xfanJ24GnNnkyMbc9pTPZTJrolg6ONKVFbuQYA== Cc: Marcel Ziswiler , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 Mon Mar 25 16:25:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064542 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 44Sfrz4RSKz9sNf for ; Tue, 26 Mar 2019 03:30:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4BAB7C21FA1; Mon, 25 Mar 2019 16:30: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 1F75EC21EFC; Mon, 25 Mar 2019 16:28:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1F2D4C21E68; Mon, 25 Mar 2019 16:26:18 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id EBA0BC21F2B for ; Mon, 25 Mar 2019 16:26:13 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lkhla-1gaVBV3Mwu-00aRRf; Mon, 25 Mar 2019 17:26:10 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:07 +0100 Message-Id: <20190325162512.8702-18-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:hMiE+EkgNEo+bR+bOzucIdILIJRwsouNCxLW2L83HyXZ3B3DMXH yxe/4CamlebS0kB7/8H3sMLlRQfEKhPVbRJ2y7ROJeOGef6IWKCLT3r75rHGNnSkawe0avB SjBQL17vhpMPcZOwhilUWDzcdCZOHMAi9OF4TAFuKD60AKXQ+9RsFlDly32hbI2XkTTm4rM 2cauDl70Y3S6ZJOMjPaKQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:olvzNJYgp9I=:HnoRDJAU43E9h5GJWRjrI+ 3Ffhqpi3T0CQ0XRhqJ2X6Gvo3xjcOd5wATiSBuIqURTukx6yRXmjsfGWYMPjwEcKBOkLQDqTv 9qJlaZ1uGrSvp5DHS9mmAW26meTiDmF2cMcIOJCZLh/a82k6wiPA2hH+q/dG1l8u9UXiPVAMS uoA3tj2mzp/uQH06TDi6qITKc1RmYK2M6Aj2Kh7xmjLlkLXfy/kqzbn2A9RXk/ErlAOwP13qs /TIZhBoWJh0KqTRyHSGho7LfmmpMEqmPOoGC2KEE0nTmq8ISwu4iZr77ntbj9HjJ3j279o+Rb U1tS6DaHZkvpRFrsWdPgUtVEFe0MBK6BI/I46jUkFZ4LeYT/KgAUEEKykh1V9qRTKd06//pHo AHUfHKlWPUvDVDXLCUoD4MUgWg4WZ6YYdwfoAsyVX5gonIzqQC0xtcHF1fXUw34lWKKvzw93D ZMReXc97Qn2wKICn3KqarsMlk/8sflD0ZOjQYUwy6il8pBjvWfuu5dgihfwuDSIB7F16J+l/6 lUvb0OTA4T+851yg2hk00tzgt/oy/l1E89/joNOsmhyGRXSBI34debiYgnzmbC0G6Ihsfa1yO Gd9HtDHv7XE09Mi8yJ8XkZMDw9v98b/19BsuIVxbYQjskivq0hFByTGcfvJW6fHMbpmHu0ira bEY2wqHJUXX5MCMhAVDv7hHu1/9JEXbmfaxQmD8mGfIZsCnCNlPro/tV0Wy7bz1AT4/SOoRka yD4ij1pNgg8x1ix+ofNmY/hUVieMkwo9EVxErg== Cc: Marcel Ziswiler , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 Mon Mar 25 16:25:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064551 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 44Sfxz2ZCPz9sNw for ; Tue, 26 Mar 2019 03:35:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 14CA1C21FCE; Mon, 25 Mar 2019 16:29:48 +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 0D7B9C21ECE; Mon, 25 Mar 2019 16:28:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 630B3C21E56; Mon, 25 Mar 2019 16:26:19 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 75252C21F75 for ; Mon, 25 Mar 2019 16:26:15 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MNKpz-1h1bju2q9h-006u2s; Mon, 25 Mar 2019 17:26:12 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:08 +0100 Message-Id: <20190325162512.8702-19-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ggGVrD0r0UA6QzRLUUeIqOR8Fsu7UbJy2Z+MotxmX+2uzJ2IrY4 V4iVjfvVqoQmO6xEyygVkQpWZq872wmpz7ZZYgacEHww2S9z0snFS8F3GWsxu8uYo7jXNji E8W9fMZj1fJPfCbLEXrSljdv9Tg0xvjMbAccfZ3/2XBBtosFm39vIy5MLMqOB8f12SMhl0y SZzj198TEj3gX0HnTbHaw== X-UI-Out-Filterresults: notjunk:1; V03:K0:6NxabFTc6vY=:ZL20asNjzykwZsNs/cHZvE /AA0VWA4tM6exB1IayqmJI0lcxY6wbCsgb7OvxdlURh+vvBNUSRgmyRkSDfSCJMJXh2Z9jUpZ CsRZTthKj4KRl75cjN2ZhbkDWsYbTF9WYiLWIUv6VmQilvNht2doUKYyttT0zpjQx/yoH0Jnf zbq8ePCjUqPOydNk6z3GWaW5fIx6L0F0ehAq9WFNekY9FA/lCpeH8m/+UvB7HAK/8V3qYn/6a iVlD62mko3YX2jOxuxEkBQOrF+tTuTlAoDQHZSj/ryScZ2XAsyON4UWjg/q9xLR6MJoVk03Me rFB5mEEbjdXhRFryXgfbpfsTmW3KfTxst93GoijbcgG/hVdsqNMHMMT0Y5yNZKBB3/z/yrCqu MALSk/in5zd+hDCVTEkU4GEVZ+/2Jxrjc4fUS2ybE8AitI8snzn2LGXJ+Xhr3qx999rswVR+W KWr+wvrKmweM0fVeq3B8s/07GPOnGMEDvAS85qGdy2p7AjFnIMFFTa1kmQp35ykA66GLCQVew PEMrLn6+3294rY4IrUXDoeBRcAIPcY6Y+AiGIrrdW3jJzbkOFScq8SDInfggvE3L9TJSeUjAe FGFIQa6CCF0GswhyKS+6Si2TPIE/1TBtrnvefJsQaCZ8QqFyR74zeeHUUisHNcvzHN1q0Cis1 vPHyFjxQ5D+bdRry0L6o/ySDZqtTJ21tYXP5Zv3GmHC/b/a2AEo7RmvpfSWxBX5uPmwzO2RPm WvCYKSAXjlZvdiMjwGwDX7GI7ojdOBVe8DDOSg== Cc: Marcel Ziswiler , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 Mon Mar 25 16:25:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064556 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 44SfzC4Z4Yz9sNw for ; Tue, 26 Mar 2019 03:36:23 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 59F4DC21FD6; Mon, 25 Mar 2019 16:29: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 7A54CC21F63; Mon, 25 Mar 2019 16:27:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5A4A8C21F38; Mon, 25 Mar 2019 16:26:26 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 328BEC21ECE for ; Mon, 25 Mar 2019 16:26:23 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LbbdF-1ggJfZ0cXL-00lCfg; Mon, 25 Mar 2019 17:26:14 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:09 +0100 Message-Id: <20190325162512.8702-20-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:bNrFfJ/adGQ0yr/4Ubr2cBUM+luvksbIGX+sqodRvwSecAKG93Y l219ULGbcc9KPLg06wzN+4cr9XScFPZU/MS2oP3LpfgX2ZI+u5EX57L3JS5l3PmFvLPPyw5 TfIKmsnUTsnTYQ7Xv6cjQ+gKlEVMEl0hDzEQ2DHiISxLjjOaTHf1DFfOpgO5Jdg5Unz7swx vZXxxlCevSPJa4S7sy8QQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:AAlywec7hso=:CSbsk7xp7jf0p7dNwuI5Nd rp9CMvFT9CtkIvtXOsHhjjqJmaYYOdk/E7c7RRnQbIiYLJx5/0R6mPEDayPwtKLX//5Z+xTLM 6BrnOLU8hXZ09sdjrfd0IMlB1oRSmuku/ADUIZRam1pu5AKaNt3h4gkmgiA+afNyu0C96e5W2 mVDJ33+EnORVXwjD2L3OtM4vxYrk8JD3QwxyyaRLIxN4sf8tsUUZguj6vUQMfGjjGYAgXBPib vZAyHN5iXEl9ETbL3Tq0RzjuFLKZeFUYGEEy68jP8wFbIZHkFoIUmm99pdTKB+6y4nKlTNYOa QICEa5p3/yY2E5cACaEs3itFQy8BwIDCcwpbH3vhpZmfPxYx01w9TQWZsHbFZACObs83sbmiM rD0v3CrzwbtgtjosWInw9YFb7JU4wHNMrROM7nrEWt4z/2y4GjDisXxhq2+MUZfkjJyMS6u+d oSRFzksUcao0pNdopyMv7qfw7m8hH+FUF1Cckjf2qgC92V5wXbs2yDBG7j8p0okDk2z+u1pbJ lMHdvJwfu0jOHnWxhRkkglPALoE/w+eJIg5SuZy8K2d1N5K/tE+KL0Y/tVEKAUSHlpFMc57Hr b6dcgsqZ/8WFp6pzd4pHRuhQnArxax5gLSuO3AJMjZiJ5/8Tq8W4pmM6ewOfudbNN4a8L+z4T DvkVm14lD0ldDWNUR9QoSzw8z8pHfSh9d2PYC/pE3GKNmMCuLIzitxl1Kad2wLCujeQRN8xDE 1ojBZaal8crP8BKgCrYyXHFOomxhnZtD0W0tVw== Cc: Tom Rini , Stefan Agner , Marcel Ziswiler , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 Mon Mar 25 16:25:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064546 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 44SfvM0yJMz9sNf for ; Tue, 26 Mar 2019 03:33:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C4228C21F87; Mon, 25 Mar 2019 16:29: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 54E69C21F7F; Mon, 25 Mar 2019 16:27:07 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 37BBAC21E68; Mon, 25 Mar 2019 16:26:23 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 75498C21F2A for ; Mon, 25 Mar 2019 16:26:19 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0MT9Dk-1hacDJ3R4Q-00S9ef; Mon, 25 Mar 2019 17:26:16 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:10 +0100 Message-Id: <20190325162512.8702-21-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:CsuMLvXQsHGO+suEtWeyOKOcv19XaYlAFqNMfRHhIM0lDeyIOOz PhHynTsz2BbIYnk3TA0ORP3zfilBqaQYzugH5KfoE8+piMUyfkiN/Tyl2Ld0PJJjkagln8a WL1DqM3WI04s1t6Dydjj514lFYYzqs8tuKyyFpYnqB4N7xA7M7sMsMSOylihMTENrri3iZe 66FoX49pQkQXzerg/mgBQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:xWhR++sjn+8=:20xp9MHIDcB/9ErTUNy8ag g/wiMr0cZGimFvb8KjNP9q/5mRFUtns7252Ck7Deba67YNr0JB7T+2BNs3ZVu2ckZ/S2r18YJ 53/nYy4RBuTRm1GM59JndU2XWoSjxWhx712+PkgYSU8QdLzCJZbMvuXNc2MXkfdXV7lvF1XGY WdUMYOK59BJHFma4vOQ4gTEARnCciGNgBrZ843yMXspU0Az/su+XjHPuYec2NCYEM9B8HTSLc EUxGPIsWBqVHYqmtd0OhorkWMdnz9ToaK/EIzDLaQ5QVbrwQzZ/f7jaHXB+dpF3Vdgn1tO0u3 rLq3+t39rEx6vT0TeIxFnDK00znyxvrrS641TmLjZGg4uEhogGgfIPAc1nQ2da7JXJkiQTwCY dCOyZqlHqee60J5/bzBiKaAjtG5fEuPPbkcTEubvpbjOUwdcXRBJjM7BTzZqY6Gg3CeqkPKFX 3AeNW0EM60+BmR7qc8xFx52ZcjOyaEu0T6rhAbEmbuEJa7y95mAgfs+mU80RmzUDEKdlWSkLi N592kU2eGJebfTxkyOoahPIImT+qZ8F1QzNIypSq5cgdLMigF3IMpLZ59cL26oenMY7YbNBCg oI0u9t32UnT4M2PpqDJRtVvLRlUPrZ3ZjXfqbFDH5Q0sMRjRcaU4C82FxrOuwiKzCoL2cGF3H AcuU0mSYrLLWvcGOYQyy1o15QTq29kdE03vDCjfeRq1ZLwC8rTIxpQvFluRo75VhICEFX6Dyd vLMmDv3JfOQIe18cl7K+RiXnvXOCDoYBTV8nCg== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v2 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 Reviewed-by: Igor Opaniuk --- Changes in v2: None 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 9c5bf4951b..3e39912f91 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -101,15 +101,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 Mon Mar 25 16:25:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064554 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 44Sfyb2dXXz9sNw for ; Tue, 26 Mar 2019 03:35:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 162F5C21F9F; Mon, 25 Mar 2019 16:30:37 +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 E353EC21F53; Mon, 25 Mar 2019 16:30:34 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DB663C21F75; Mon, 25 Mar 2019 16:26:25 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 35D69C21F42 for ; Mon, 25 Mar 2019 16:26:21 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0LpuQT-1gWOac2Pwt-00fgMu; Mon, 25 Mar 2019 17:26:18 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:11 +0100 Message-Id: <20190325162512.8702-22-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:tM0Kq3QeqSX3q/OMjMuF0hvCIIxzagkHapIXgcxpcXvop3rR6Tq jH1SVWx4VD0MaX/kxyVoy5hubUNOWQFpyctEICAODMgKfK7zR3u4/yFrTt014nnhLP4figy FFFthzLyQY7wwLaWNf3+W3xADFFPqYJ4Mu+WWqZPijbdKCzWM4XpJw87xVdMYABHiV6lKta zG9e6NXC5ANdWJ/FB5bIQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:A14o9SZRsAI=:GRiroquYjStSFfV/6Y+Y0f h/9eNxYYt6l3jYJTQd1QB3Uuj9j5qUBQMm2/gruaORDHhEybyt1dGHhArmKGKt3G4IJeV4VHP OWonUmjdyQCqSJbDq3pJ0CAsSMsIHIdbhJhW0rxrwoAf3eoEtjn+XnGnyUflkohM1zzQNYOyL fUZgMjsgt+kLNu2BtaO2lIQw5csy81LKWzOcccxsOBDLOQD5nqOOogteMXXqX+ywjIQfACrGd 3NYP0HZI0h4J/gN4lfvUmWvraklahYVCZD6+SArAzJbESecngh019WzxF/fgfgygO2aUC4a0Z 5UroyyMAK8MvqnHim5POqfg49zdctpwPmj407JLBGjldcjB0URd/1+lBTjWfKE3KYDkqeINIz LwNd95uAt8zRIYkNHpX5ul7LdXTQJ3DxTMeBvUAdnive+jLU0bactz633ZHS6LneNwLwO2Md6 DY6PN0bhh19saDndu8XfgHQTg+L+6U364tR+zwnXuet/mmYysocArocGlyU2efeSV+ZwEhmlB sfXYVir92+s0MvbRNePWKFdXgTp0HA6Egspj+7nYCDUxXzT9P5tx5+zHXzB9L4ZVouA0X1CMS kMJnp4nshW/8LQFM3HDCnfPsCPvi8UL/QCNVAwHpMGTu4dRL4sbDCv+BsNnFpHjCTOjx+fV+Y ickdrz2okNAsyRtHkXx3Ggu3Fek9qV5dAonsKALUxMcD7Jnw6Md2Ay9gRDipX5sxX5Sa82xHG D3XRqSg/jgdY8viVmpjJsNh6TyftgWFx4rTzIA== Cc: Marcel Ziswiler , Stefan Agner Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: None 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 3e39912f91..9d63fbf3bd 100644 --- a/board/toradex/colibri_vf/colibri_vf.c +++ b/board/toradex/colibri_vf/colibri_vf.c @@ -29,6 +29,13 @@ DECLARE_GLOBAL_DATA_PTR; #define PTC0_GPIO_45 45 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 Mon Mar 25 16:25:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1064545 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 44Sfv54MtMz9sNf for ; Tue, 26 Mar 2019 03:32:49 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4A52BC21EC9; Mon, 25 Mar 2019 16:30:15 +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 3810FC21F22; Mon, 25 Mar 2019 16:29:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EEBD2C21E70; Mon, 25 Mar 2019 16:26:27 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 5C5BBC21F7F for ; Mon, 25 Mar 2019 16:26:23 +0000 (UTC) Received: from marcel-nb-toradex-int.toradex.int ([46.140.72.82]) by mrelay.perfora.net (mreueus002 [74.208.5.2]) with ESMTPSA (Nemesis) id 0Lwpo6-1gtKFP2OVc-016SoN; Mon, 25 Mar 2019 17:26:20 +0100 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 25 Mar 2019 17:25:12 +0100 Message-Id: <20190325162512.8702-23-marcel@ziswiler.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325162512.8702-1-marcel@ziswiler.com> References: <20190325162512.8702-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ufYq3EEV/6nVtFm1r2XfM8t0hleXb6urU4Vy/DNUVzxKMN240vz e/HEnRejAR1cF6pTvDwbNhvpQhIZ5Zg3bSLy2bldh5Fevzc388yQmlLx2eNh5Dh7ezXdx+s HXhDCmOzYjuL201+YbuSaSh/fc7WMYC7ItgKgOsFlJBjIsLnW8xfLz5nmnf+y5LYBkpMBFM Gb+pkaBsZX+aCuz1KmD/w== X-UI-Out-Filterresults: notjunk:1; V03:K0:Z1m+jySZ4m4=:tNjJObCXitE47LTHJQQRaU eLgCopy9kuXbtsI77G7rI4Mlt3GEbQLHCBTNH7QGrAJE7Q0OaydfADihbx9oB9+2wKTvUuUlU 80BlvfRFGIhOZJrhLiIiKLo+K/CR+3eNlC1T4Qj7uM/1cbtxxE5OIf2j4iwgmnSPT9/MIz/xW tmOonqpBrertbkVVtFxYvBrjdjvHBPa+B4DoFxF7aU8X0/OqOn4PPrhgYgr4+GJfLiHlpt59P qhvldcLQHIjvNuM3P9iZq7LnqUNLIewoB6AsdR6bqxIgh/iW9fGaX8L9sFDTQvOf0ADYxGED5 D4MZvA3ktSbwnKiU0j4pqOXdvBqCnxEZxhpaLGSLUKLevUJ7oZRyNMSMB76f1VocuPLrCb4CQ qq9Co7iCJMLy353MzI1+V4Iic83Q2GJ9XTpDiIg6R4K1UhFXGu4b3l0KtVo9xyhvW5Fm/YD7M HP8JYtSlGmsLi76cxBZZuGolGSthAQ/A2cP055FG/rINaNO6JQsrdKtj92qoeiJxcb3PqN2hX enHJQkLzzO3V2jXTq0uxumpIFsPVwLqVb4C4/F7ckFuvfeCNB3E1Moan3+RekEQC/Q877+cnW 0jG44xasFr8bXrEsCvx3F3G+gRTN9T9K5hZuvcdEWWa+ls6tk7tGsGmXNgBfcgZJEWKHXaNg/ FQdRqw/hT4kup74JMKCO57wjsJXL8kDwm2r1Jilo4+Lj04cNP9Dp2Y1QUWcK3OkOliGhEvpok 8S8R3l6K6QbpxXJNY2TAIE+HjlqUJQeKg3fVcQ== Cc: Marcel Ziswiler , Gerard Salvatella , Igor Opaniuk , Stefan Agner Subject: [U-Boot] [PATCH v2 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 --- Changes in v2: - Added various reviewed-bys. 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 \