From patchwork Tue Jun 16 19:19:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310660 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VdPYAtDC; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdNQ4GT9z9sRW for ; Wed, 17 Jun 2020 05:21:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3AA6881F35; Tue, 16 Jun 2020 21:20:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VdPYAtDC"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 64AA881F3E; Tue, 16 Jun 2020 21:20:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C4E3481F32 for ; Tue, 16 Jun 2020 21:20:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x230.google.com with SMTP id q19so24986988lji.2 for ; Tue, 16 Jun 2020 12:20:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cgNQeze91qIl8MvSCPadLjznfZcoM9PWP+ieC7i3bgI=; b=VdPYAtDCqRdgzaGZpp8OLKM0UZGuAfai272HcT22hKFu1Lc88xtGoLigf6e/G/btou Y1OK9RZmlKhHb8Ck12CcxmHFf8WIYcbiy6ML+YByKJttFVugxKGrbj/xQaBknBumLj5y 6HzixDv0Jv49wUCU2TNiKz0UM9AL2Bb52yC3x0MK2P8P/UTNSa8Fiz/o82+X6M3dd1ct qa+axQ7mPIdG80z56wvu+/Dj7Oy5DbkRyJ3FJJL2D1QUo6ukJxVGbYab9m2/US3wIloQ HFJfwH+9dKKr2hy6ZQ8beTTLchMjL8dd7RbsTGM1ax2jIcQUPp1VUE14o3DyQZPYgZ/s wKJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cgNQeze91qIl8MvSCPadLjznfZcoM9PWP+ieC7i3bgI=; b=o/FP5VjGpc2uI9q1ZOxiruNUCJrx8D4g2PADzVVaKTQv1E2tjUTi5MenfxxzeiPvOe 7y7Eyhe9z8USkgwTV/d5QTtoT2kTTp8KIqwzRWhwdDinUZXrwleXQBVyIaM+CrNi7oqX HynVYVpUOSNemdRJjplXPUVhTKzk2DQ88uFfL1SfM3WVMp+AXyOjS28WbHftWHpN/5r0 kttxzI9DNKwKiybgaKPTrj1v/+CJDYCLauKRUTPDp/ZalXXXW/PuKzs6RPerazwovaJJ dzZLhQVjMYaRmB60j5W7ZfHPsJglKR3Z5miCEpi27zRR7Z4Uv00WgbG5XDvr1MKK6sh/ lwhQ== X-Gm-Message-State: AOAM530MbT908phSA7bykRFN+6CJUM4HK4P49gF9aVzCiwExdTw3eyzf 1mD8JXTt0zdG/9V9J836VfwBgg2C X-Google-Smtp-Source: ABdhPJzo/NX7A/oRxyK+UBVqfbtyRQywAKFC59ksYqrptzGmbrvT6yvRfP2kOFi35BAOePzXY8rOiQ== X-Received: by 2002:a05:651c:2d0:: with SMTP id f16mr2059938ljo.387.1592335217815; Tue, 16 Jun 2020 12:20:17 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id e16sm269129lfj.44.2020.06.16.12.20.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:17 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com Subject: [PATCH v1 01/13] apalis-imx8: enable of_system_setup Date: Tue, 16 Jun 2020 22:19:59 +0300 Message-Id: <1592335211-5998-2-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Marcel Ziswiler Enable CONFIG_OF_SYSTEM_DEFAULT for Apalis iMX8. Signed-off-by: Marcel Ziswiler --- configs/apalis-imx8qm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig index 4c27c33..fdc1e4e 100644 --- a/configs/apalis-imx8qm_defconfig +++ b/configs/apalis-imx8qm_defconfig @@ -9,6 +9,7 @@ CONFIG_TARGET_APALIS_IMX8=y CONFIG_NR_DRAM_BANKS=3 CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y +CONFIG_OF_SYSTEM_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis-imx8/apalis-imx8qm-imximage.cfg" CONFIG_LOG=y CONFIG_VERSION_VARIABLE=y From patchwork Tue Jun 16 19:20:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310663 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=aw1h1xQF; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdPc5bqMz9sRW for ; Wed, 17 Jun 2020 05:22:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0591C81F41; Tue, 16 Jun 2020 21:20:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aw1h1xQF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 35D6D81F4E; Tue, 16 Jun 2020 21:20:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4745681F34 for ; Tue, 16 Jun 2020 21:20:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x232.google.com with SMTP id q19so24987207lji.2 for ; Tue, 16 Jun 2020 12:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9fU7KYp/zHUpu/5wyYVRdqEGH+2V297YorpFWiudvk0=; b=aw1h1xQFVSWW4BeNobOzPpc34FHAHFbw+JJ5AypEJCeJEcKslAvdo7mXi+0enwggoS z42TbSXV7X2dt7ZKNygUmmHf76m+079KehQInoVsXPNdBw4uMdzEz8+Mmf5pILPG9mJj 4YrU+aDAmTJkEbi0dMddGQng9rmz9wpi2GbR7K8y0tLzVr6XpJRpDLwkeG1kHtXaimbU 0fud6Y/0sT/zZ3Zo/igozj3J/MqtSHvhp2oAgK0IE6s2H93AzgEa6e/PF9dv3gOgQWvm rkAd6EG4WGvEi6KFwmVeXul1rJnuGWe4/3PMaiLOuGhA4ZSsEnPDClRva9/KFvVi3YQX duLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9fU7KYp/zHUpu/5wyYVRdqEGH+2V297YorpFWiudvk0=; b=YkdDAPAc5KLAExkl2SrYvjYOsqfoANzA9gMPFajem9X8FaY/OsGb1i2yUqw8weQ9pJ /76jyuj6h4e6xr5ZsuYj1tofOKkcj6GCVHeirsKMEULAZ2sYEMUGCLsf/HgyDzEvZH4q Nch6gMo4maSS3D9Y7QVhAv5lA+iU446Cgvrgx4pRipRe3tfcb7MBza8XOz2ZS7dFF6Fo TqGb0EZT+J/s9MYZMIS0a4xmBdVIieh3Sfrr5+0RMB53bI4pHU4vjaXT9X3+cxg+lcVO QwjELl3m4E8FCVDybftDglTiwpP50St0SySyUtEh7MTfAqD9F7OFceTtJRkC7tMi+OUs APwg== X-Gm-Message-State: AOAM532OPpYPa/AJ3x2v46leu7IKUKaEV5TlyfJSlC5nTOle2SDRVGEE tkBCLcL3xeXct9pJrq4vx3Oj5OXK X-Google-Smtp-Source: ABdhPJyN+EK/VSZ4prLXspUVVFP9bySXlZqIvcbA1ArSIgoGPt4cUH1hJVNjhCXN87inpATqMD7kyg== X-Received: by 2002:a2e:2a84:: with SMTP id q126mr2263747ljq.42.1592335219470; Tue, 16 Jun 2020 12:20:19 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id l22sm4583894ljg.41.2020.06.16.12.20.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:18 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com Subject: [PATCH v1 02/13] apalis/colibri-imx8: re-enable CONFIG_IMX_SCU_THERMAL Date: Tue, 16 Jun 2020 22:20:00 +0300 Message-Id: <1592335211-5998-3-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Max Krummenacher This got dropped by a global 'make savedefconfig' resync as required patches are still in flight. Signed-off-by: Max Krummenacher --- configs/apalis-imx8qm_defconfig | 1 + configs/colibri-imx8qxp_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/apalis-imx8qm_defconfig b/configs/apalis-imx8qm_defconfig index fdc1e4e..289d644 100644 --- a/configs/apalis-imx8qm_defconfig +++ b/configs/apalis-imx8qm_defconfig @@ -62,4 +62,5 @@ CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_DM_THERMAL=y +CONFIG_IMX_SCU_THERMAL=y # CONFIG_EFI_LOADER is not set diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig index d86cefa..57b48e3 100644 --- a/configs/colibri-imx8qxp_defconfig +++ b/configs/colibri-imx8qxp_defconfig @@ -59,4 +59,5 @@ CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_DM_THERMAL=y +CONFIG_IMX_SCU_THERMAL=y # CONFIG_EFI_LOADER is not set From patchwork Tue Jun 16 19:20:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310664 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YaqvGIa9; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdQ23kpXz9sRW for ; Wed, 17 Jun 2020 05:22:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1FC5081F59; Tue, 16 Jun 2020 21:21:01 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YaqvGIa9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 699B281F46; Tue, 16 Jun 2020 21:20:37 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B937F81F35 for ; Tue, 16 Jun 2020 21:20:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x243.google.com with SMTP id 9so24993581ljc.8 for ; Tue, 16 Jun 2020 12:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Y6m9gaE5+yburdxVUdv16UWLjW4MPPZ04ioPTa1reHw=; b=YaqvGIa9NN0OPe8u4VFrsZHY0SqoqyjRn1bp6p5ESoxzodzOQV3Xzy43ff8IFr7ZC5 UZPoi1XNQAC4WL/ii4e2pBQRfM/g83viXUKUnPSeu7/p9ur2LRKfUBTuZb4aVhPo1Pwj D145LKJ1AgXkpS/cL2ya3Lpwah+FHnUMMS4YUgJKhBPzEZl6OMt+f1lXTYGShr+0adPf cm3OIR2srp3sXtCO7xlXlkuqO/KKFGcv8Kr86xIs4/jMbKC1zmI8rgblNlgnlvHcOk1+ ZNfbaaAeSiv97IKWoYVpozmyBvX4xE5eoeqnT6vnZ7kYIJ6Dnmxl3VlHMr1/NMPA1hVE a1ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y6m9gaE5+yburdxVUdv16UWLjW4MPPZ04ioPTa1reHw=; b=LSIksswkXRzDBBu92peXfUxDITzz2wtyBxqQZwHY7KJWkFls0WcngLLChNLUAxzcJD +9ZXkX2bydL/Jc4VafpqpwipdwpCmiI+dCratZymB7vxVj2PB6kuxkE6/LnXwnEt0EZu DuSRg51dx7StVlJt9W9IuWKx50m+XxV+gpQHAzqNaGIPGES2lnlrHBoxLFVyxZd626Fs rE6JEIJVqa+FhvPXzQLAzGj/EqxpKjyyfUBK0RfXvXggslQza5MdgWnI1ehBRmKpqTev 0fu2At2Gl4PFcxMrnOzqYcqVvd5trrhyIsln0gzpf+OSTB6V2Snj2dxYYPTkNZ+h2eXb MNEA== X-Gm-Message-State: AOAM531acTqnC3pT+buwwkRplrCMPP0fOUsZUNcyKcMi7+DY3ZmZc42R Q/5MRBJ1dvNi76upLLJcbiwb1qLu X-Google-Smtp-Source: ABdhPJzDxcC+DKcMtdtRVR87Bii2pwAWrcgb0kFH/m/xB/k0kR2KQ3ad9Dyq+iYKiYSZmigKyFLtGA== X-Received: by 2002:a2e:800b:: with SMTP id j11mr2368630ljg.467.1592335221191; Tue, 16 Jun 2020 12:20:21 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id f12sm4555042ljk.44.2020.06.16.12.20.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:20 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com Subject: [PATCH v1 03/13] colibri-imx8x: declare consoleargs Date: Tue, 16 Jun 2020 22:20:01 +0300 Message-Id: <1592335211-5998-4-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Oleksandr Suvorov Store all console-related kernel parameters in dedicated variable. Signed-off-by: Oleksandr Suvorov --- include/configs/colibri-imx8x.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index da9226e..7d00707 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -62,7 +62,7 @@ #define BOOTENV_RUN_NET_USB_START "" #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ + "mfgtool_args=setenv bootargs ${consoleargs} " \ "rdinit=/linuxrc g_mass_storage.stall=0 " \ "g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F " \ "g_mass_storage.idProduct=0x37FF " \ @@ -81,7 +81,7 @@ M4_BOOT_ENV \ MEM_LAYOUT_ENV_SETTINGS \ "boot_file=Image\0" \ - "console=ttyLP3 earlycon\0" \ + "consoleargs=console=ttyLP3,${baudrate} earlycon\0" \ "fdt_addr=0x83000000\0" \ "fdt_file=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ "fdtfile=fsl-imx8qxp-colibri-dsihdmi-eval-v3.dtb\0" \ @@ -89,11 +89,11 @@ "image=Image\0" \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffffffffffff\0" \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "mmcargs=setenv bootargs ${consoleargs} " \ "root=PARTUUID=${uuid} rootwait " \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ - "netargs=setenv bootargs console=${console},${baudrate} " \ + "netargs=setenv bootargs ${consoleargs} " \ "root=/dev/nfs ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp " \ "${vidargs}\0" \ "nfsboot=run netargs; dhcp ${loadaddr} ${image}; tftp ${fdt_addr} " \ From patchwork Tue Jun 16 19:20:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310662 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ha9WhgZW; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdPF3280z9sRW for ; Wed, 17 Jun 2020 05:22:09 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D96A181F4D; Tue, 16 Jun 2020 21:20:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ha9WhgZW"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E30B981F45; Tue, 16 Jun 2020 21:20:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 49D9581F39 for ; Tue, 16 Jun 2020 21:20:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lf1-x141.google.com with SMTP id u25so5960055lfm.1 for ; Tue, 16 Jun 2020 12:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QFPmAejxFlucbFHGnpLaUwfJrkO3qiq1e6Vq2Txpeyk=; b=ha9WhgZWCYNzAmXU0LGQ6MDOIlBBrXvajK6I2LkRW8Lys3Pxvxj7XQj3v+E8bEcakB roqhKyX5jyd5uPIblsLOqHgH8A730yr07PO8tJ4LA5OPA5CAOLcEnhfDIGDKp/xU+NaN xYiEDlzm7B+6/KToxeUbmr2Q408Nzvd9AsajluLEkOAUH4vdLrm5x7AqgRKH2fheA1jR LEwusuXUVoj6PmEz1E2Y4aQK2B5ISPNUj1dTQ2mk+6NF320iTygjdL7U2JC36y97g7oH Ou0FE3DPTYS6rt9zxKp+NDvfGtck/JuOcElZDbrp4VqmWgdXEZyFhrtE5xE7VDMTv75z W5sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QFPmAejxFlucbFHGnpLaUwfJrkO3qiq1e6Vq2Txpeyk=; b=QoXfKt4bIZjb1GPkQxi+s8oPRwfNxkcoqJI8DqwgctDb96dnP8uUNx1deT83aqq5d9 69YhtH09HGA/85xw0SX+bM0jxqerO4xgLuFV0Anx1SZjzVY2b4D7QLcJ4q1q3Ufv6Z4x G2KD9907apfqhooL5ApuAt+4zaUkuw4rO9MLE22U/EidcO6IFEwNWcEvRdgmyK9YYk/q 4DFH7ITKQ090h/PY7AK4xgju7uOXTV1Vy1hN2jiNXqrZ+6jcQ6t0IYibTGRJVGjmAdg2 3t21D+Abs7oOj2HD/dvJkAopa3gTzQcGMSx/HPu2EhAj+/X8qu8SXgG+lSjzVr+Bg2NN ITFQ== X-Gm-Message-State: AOAM532uKFNDYXqYfFJIFYKYlR2MiQKU+zPGMkSGZIJ2MqrDu8Wk9jy4 lWqgTEUr17Gq4Ot0XFPNpSyxyQBA X-Google-Smtp-Source: ABdhPJxZfhHiJN2B3RkNBrx5SWsER1Kr9QCpwYrX7Pb1w7eeNMlLQUWsOMZzox1BqQjRcMhq6bOPzQ== X-Received: by 2002:a19:3f89:: with SMTP id m131mr2583618lfa.202.1592335222745; Tue, 16 Jun 2020 12:20:22 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id g5sm4565309ljk.93.2020.06.16.12.20.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:22 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 04/13] colibri_imx7: add addresses required for distro boot Date: Tue, 16 Jun 2020 22:20:02 +0300 Message-Id: <1592335211-5998-5-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Stefan Agner Define addresses required for full distro boot support. Signed-off-by: Stefan Agner --- include/configs/colibri_imx7.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index 09722f4..b550bc6 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -109,8 +109,9 @@ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82000000\0" \ "kernel_addr_r=0x81000000\0" \ + "pxefile_addr_r=0x87100000\0" \ "ramdisk_addr_r=0x82100000\0" \ - "scriptaddr=0x82500000\0" + "scriptaddr=0x87000000\0" #define NFS_BOOTCMD \ "nfsargs=ip=:::::eth0: root=/dev/nfs\0" \ From patchwork Tue Jun 16 19:20:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310661 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Ah2QcSfe; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdNk49Qdz9sRW for ; Wed, 17 Jun 2020 05:21:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DC18781F3E; Tue, 16 Jun 2020 21:20:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ah2QcSfe"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B95581F44; Tue, 16 Jun 2020 21:20:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0178C81F3A for ; Tue, 16 Jun 2020 21:20:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x244.google.com with SMTP id i3so20423234ljg.3 for ; Tue, 16 Jun 2020 12:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QUzH9hisHigRXcLBZmWjhqnfqiKfbMzDdGpdrJdBkTk=; b=Ah2QcSfeWUgBj/1A1j7/9PbXQhZ+gCWoICIyRNUs/qymr52V4YoLiEO7KeC+Q826QL WNfjIL6k6wzq6QX8XE2XdQc7+ozDG2HSMtTTa43RybInHKtAnFQisB5hc2QrFCa7sSwV NwKcgfRI7VsRQN9m/oGLQfE95GV39lx9c21aN5Lt3XEmgvdJHvl8Ct77856IbZIz+ioA 4kiqW7eayske9ClJnRPNbROLAyTx73gPmpQQLW7Kc1P00IiwBGBywwM37aibAF+AZjru 0pQdmFpbJPPeE1AvStfm+sWGWfN57hdEmMuZBVNsirzQGKZrdAb1TXpKv57kWKJyX3hB ycqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QUzH9hisHigRXcLBZmWjhqnfqiKfbMzDdGpdrJdBkTk=; b=kVXEjAPoaVngkf65unGu1jayxDft480N3FvtJDF0ZyM0Rv/wCO++su+/BSknntCrSr MaqVBN8GyhEKGpBKdoa8yW22jwZce8bKJB5ot08z0qILJ4UPsXpXxIpAHRP/91JOl3rt 9sMah/VnvLBmZm4dnx+mI1IP/LfmPzfHzlm+Pwv5LUnHGWba4PsxAy9FYbkv+y85xGcm Iul6+74Sw3dTmAI3ODlsGcqZWYROjsHcYoQ9xWsCwiXrq2/3EaFu8xH13ffAxEAW7mou zRysQHnnpEAeXDLPxlh/OlbHZXwoicDbmS2Wk8HHhw0+0qZIYXLhswzUiPPxnO936a6k oedQ== X-Gm-Message-State: AOAM533Dq9Ju+r/EATD3pYOuPoNQ+bI95KEQV1UnS7HgIzcvtFvBSKcq rzo4hmbW/6FO+7hPU1jYGhCdI828 X-Google-Smtp-Source: ABdhPJxixtj+9ZyUYKC6i8ftHiNEuRHXLrH7TkMaBtbu9RhEdTLLHXWFoGuJHG31XguuZvSwQFDPGw== X-Received: by 2002:a2e:145e:: with SMTP id 30mr2245096lju.205.1592335224281; Tue, 16 Jun 2020 12:20:24 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id r70sm1793573lff.97.2020.06.16.12.20.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:23 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 05/13] colibri-imx6ull/imx7: define bootubipart for distro boot Date: Tue, 16 Jun 2020 22:20:03 +0300 Message-Id: <1592335211-5998-6-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Stefan Agner When using distro boot to boot from UBI volumes the boot partition has been hardcoded to "UBI" (capital letters). However, our default MTD layout uses "ubi" (lower case letter). Define "ubi" as the default UBI partition for distro boot for Toradex. This allows to use distro boot without having to redefine the MTD partition layout which is useful for TorizonCore. Signed-off-by: Stefan Agner --- include/configs/colibri-imx6ull.h | 1 + include/configs/colibri_imx7.h | 1 + 2 files changed, 2 insertions(+) diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 2d3b4c1..c80fb96 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -88,6 +88,7 @@ NFS_BOOTCMD \ UBI_BOOTCMD \ UBOOT_UPDATE \ + "bootubipart=ubi\0" \ "console=ttymxc0\0" \ "defargs=user_debug=30\0" \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index b550bc6..b3f660b 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -169,6 +169,7 @@ MODULE_EXTRA_ENV_SETTINGS \ UBOOT_UPDATE \ "boot_file=zImage\0" \ + "bootubipart=ubi\0" \ "console=ttymxc0\0" \ "defargs=\0" \ "fdt_board=eval-v3\0" \ From patchwork Tue Jun 16 19:20:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310665 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=VP7zcVa5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdQR0hL6z9sRW for ; Wed, 17 Jun 2020 05:23:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 67F0281F60; Tue, 16 Jun 2020 21:21:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VP7zcVa5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 94B2781F39; Tue, 16 Jun 2020 21:20:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BC8B481F3C for ; Tue, 16 Jun 2020 21:20:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x242.google.com with SMTP id s1so24981830ljo.0 for ; Tue, 16 Jun 2020 12:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UbB6b4XPU9brBICuuA9wAjus00piVxwinNgMCbi13fA=; b=VP7zcVa5ZxdcJXf8ue2i5x7kSkimEexAT7TcFhzlprQM13q/vS3pvbdLp97I5JbANM PtqMByNdC8uoBXmAgphZ44mKGvgYSdIb0ljpGAl5JrCsHEs11Qv0EPyEmjJZR/D64RPT Ft9Gcj0r6U7JOXGjxCpz8nw+coQSt6MvdVk2D2zfLr1J7rDBwFBEeGNCzLELBM5KCFYI y+M5Aoc88oPOqxvBUlQ4HpPXsMsfu0ZH/zd8X4yr4vD4181vqRRhx4K0kk+Jr/1OoDnU bHa6V4A7Dl5mphwdBXFNE4QiT//e+4dDiMImXklMU3EqdYlK5N8hbCPAYvLiMUBhoQZH +2nQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UbB6b4XPU9brBICuuA9wAjus00piVxwinNgMCbi13fA=; b=f2iTOoXpKQv7yL9HvZtKogPrk4TReui86BXPv3BSN912WMfasUkVEkg7HMHy0Nyxy5 kgEfxJjlyrGXq2OeDragkV1YZRW5XHIS2SrTenu5oCRZTUKitsoR5vKDZfhCGEWo0dL1 hk+C2xNGsdTmQm9+GrYM7I1zJV3ywP70c/7uialsMpqi7fFV6CksxQt7nXwXGrRDyjE5 PEJeaIdEw4gwd9qalxH6Lbspa1pa3+TvQKAS/RZo5rLZHb2V1VkrKBh/LZ4o+q/CqsxS 1Lhwje75otgPaPjsoHsY8mV2xXlfZFhuWr0jMs2Txiz0PdGn3ZJFevpVSQbEy76MIjJM rrFg== X-Gm-Message-State: AOAM533YYTQWTcZE0dfv5c92a8rr7yOAEwPGXo3A+u0loTOMWJQWBtEb gcNEJfnQohRsNhpnxB+8z+OtNanW X-Google-Smtp-Source: ABdhPJxE6ayeIiWpBJUikum0Mdgu6Cz9NjTE4RxnvOIk3vOuAPnPfAzc85rmvMghIxvwFhk/UzLjxw== X-Received: by 2002:a2e:8346:: with SMTP id l6mr2016831ljh.209.1592335225939; Tue, 16 Jun 2020 12:20:25 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id a17sm2015807lfo.73.2020.06.16.12.20.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:25 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 06/13] colibri_vf_defconfig: enable part cmd Date: Tue, 16 Jun 2020 22:20:04 +0300 Message-Id: <1592335211-5998-7-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Max Krummenacher This allows to boot from SD/USB with passing the rootfs partition via UUID. Signed-off-by: Max Krummenacher --- configs/colibri_vf_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index c494fb4..ed0acbe 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -18,8 +18,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_ARCH_MISC_INIT=y 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 @@ -39,6 +37,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set From patchwork Tue Jun 16 19:20:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310670 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=CaBSUnZ8; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdS94Gtlz9sRk for ; Wed, 17 Jun 2020 05:24:41 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4603181F7C; Tue, 16 Jun 2020 21:21:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CaBSUnZ8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6651B81F45; Tue, 16 Jun 2020 21:20:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0F60181F3B for ; Tue, 16 Jun 2020 21:20:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lf1-x143.google.com with SMTP id u25so5960186lfm.1 for ; Tue, 16 Jun 2020 12:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bdxfbCJhRYMT2s0Yjm98+iHIiV5gm9vqcj1z1b66Hd4=; b=CaBSUnZ87fT6uoPaphy6q/fUFbmnCIsi/60n6CdDWnGH1tnq3lgGX/TzlVLT24ncAa cKk+gSvMsH6qMDfd4AkyjlgkWeTSoYzxRFmDe7tKsWf4VxcwA9AMK//vo3msny/AmwEE 3Ax6TbnmRu8+Zc3/+1NfLZQAqKfH6OiWXLpo3endu1sTNNyv7V2uTshfO62K43+Huls+ jCCmG5omhVnBPAacHzrTubxj3jG4/oV8e7JaX/PjDeyeckoRn9jHOvFeXuN0Lx6D/a/Q 6D2qXhkOauSmLAnwasfhTo7d3C0lmBCg5xkn0Po3FvXKCjTmtvJo5JrTaLNRHyDjuDiT gCHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bdxfbCJhRYMT2s0Yjm98+iHIiV5gm9vqcj1z1b66Hd4=; b=qzfI4AE4eCRpcaRe056HjGSxTpMqYYjTBkXPwvyQTglEvJoy5x0oRRtLtpXpxT4nph EEXxmW1K/2o9kEwv7sg2Im7PU5Q66/wvgWu5TyiImlVZCzjkM3SqhgHOPiEK1OGJ77Gw orIHTxY3EeoSlwGlZOlFF9xG/8FUmTfqqQawoNgcoKeKMeDezVHIbXe9fpzfryrnX6Wo GUbbZPEWP0br58XCXBAEqHW/ke1SKUn7OI/ojQyGaNQgZNxHWZ/t3Qj9Z2gqB44Na3f+ jxlwkmwI5HZnZpqhmkfe01837K0YbWMaG6Gqpk0mjJLZRy5/cgZDcyhQD3hQuSiQCHjo buWw== X-Gm-Message-State: AOAM530tbLSCnmgGDIk9wA6+CgY6ja07R9FHtOb0vSxHNVqo7VIvobv0 UTVNz9JKENegylAT3GhNI017WxtV X-Google-Smtp-Source: ABdhPJx1KwUaKg4hYK5NZaU8CyHPZuw+nRID9G33F37D9oOW3E3lSolVzRjnsuRMpXLA1RCnYRrkAw== X-Received: by 2002:a19:ed17:: with SMTP id y23mr2518270lfy.162.1592335227543; Tue, 16 Jun 2020 12:20:27 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id r16sm4579332ljn.106.2020.06.16.12.20.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:26 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 07/13] configs/colibri_vf.h: drop sdboot in favour of distro_bootcmd Date: Tue, 16 Jun 2020 22:20:05 +0300 Message-Id: <1592335211-5998-8-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Max Krummenacher The distro bootscript uses kernel_image to get the file name of the kernel, so change that variable name. UBI boot has precedence in the default boot command. If one wants to boot from SD with a working NAND installation stop in U-Boot and enter: setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd Signed-off-by: Max Krummenacher --- include/configs/colibri_vf.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 7d17bd8..012350d 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -69,21 +69,6 @@ "tftp ${fdt_addr_r} ${soc}-colibri-${fdt_board}.dtb && " \ "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ -#define SD_BOOTCMD \ - "set_sdargs=setenv sdargs root=PARTUUID=${uuid} ro rootwait\0" \ - "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ - "setenv bootargs ${defargs} ${sdargs} ${mtdparts} " \ - "${setupargs} ${vidargs}; echo Booting from MMC/SD card...; " \ - "load mmc ${sddev}:${sdbootpart} ${kernel_addr_r} ${kernel_file} && " \ - "load mmc ${sddev}:${sdbootpart} ${fdt_addr_r} " \ - "${soc}-colibri-${fdt_board}.dtb && " \ - "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "sdbootpart=1\0" \ - "sddev=0\0" \ - "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ - "sdrootpart=2\0" - - #define UBI_BOOTCMD \ "ubiargs=ubi.mtd=ubi root=ubi0:rootfs rootfstype=ubifs " \ "ubi.fm_autoconvert=1\0" \ @@ -112,7 +97,6 @@ BOOTENV \ MEM_LAYOUT_ENV_SETTINGS \ NFS_BOOTCMD \ - SD_BOOTCMD \ UBI_BOOTCMD \ UBOOT_UPDATE \ "console=ttyLP0\0" \ @@ -120,7 +104,7 @@ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ "fdt_board=eval-v3\0" \ "fdt_fixup=;\0" \ - "kernel_file=zImage\0" \ + "kernel_image=zImage\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ "setsdupdate=mmc rescan && set interface mmc && " \ "fatload ${interface} 0:1 ${loadaddr} flash_blk.img && " \ From patchwork Tue Jun 16 19:20:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310666 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qkR4SX/i; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdQq32D0z9sRW for ; Wed, 17 Jun 2020 05:23:31 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3F26781F57; Tue, 16 Jun 2020 21:21:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qkR4SX/i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 081CA81F4D; Tue, 16 Jun 2020 21:20:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8D68481F32 for ; Tue, 16 Jun 2020 21:20:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x233.google.com with SMTP id n23so24918334ljh.7 for ; Tue, 16 Jun 2020 12:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MCkcJt5nm/fzfiKfv4FzBUqy1yJWJGwrYqczLaf/FVI=; b=qkR4SX/ip2jUtWgyukWUAs1c20PI6A6Yr91ItkiOC1SnpNHViG1WrWDjBpazcfoJoB ZYRKiKR4LV0yoU4JqPIs3kEpCWcGa51Zl/6wHkjRoI25Um5czdnvXSylCxZGM2Ykdhqh s2Oti5uUvTno/nu/Cv7t5Nsw5UcsC/7Fvde6KyMvsJ7ic2VyCRTOvZ31KitstTHxXZwz 1HsoboYYp9ntXC3DrLXVfCCJlds5ZRrMhmE2co/5Y7WVbUyvlOCPBGdgPHTUbaLbYxQV QrCilVuH+LoJryErXB2S5XI6Mf0SZzgvUcJbDfEQpka32f9+bre4fhwW4meKHquPzWUw 4qhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MCkcJt5nm/fzfiKfv4FzBUqy1yJWJGwrYqczLaf/FVI=; b=qfmgllbiJOWymURvPOHggP8PcGF3dMEsq50fmxwijETupYlE3recq1PShGL5S5PZhv NRescalA+cJ2zpSwGATazjXLnSrYveXxUTaFZSnMdvv65S5PdhRmHcnsfdTMuT0/p3uL wH6SB8qdMRUjfgdRLR3ssX5IdiZ19PbLN6zmWJlTnS4b92LZZ5BhY1WF6wkt1X3rH/kn TWkPUv5ACGEalvRV8GmA9o+IcTwcPnZWACZdgpb8PAMMWNOiEPy6bQL0E30N5O+OxerP 0Ds30jyTq4GV7ECb8nHcXadFAZEuY8fwmpbbZHZ9mQ+9QQFhYUtfi428J8hSVGXmBfhF 7ekw== X-Gm-Message-State: AOAM533HRKHL4g4/d0MQiU7ktjeyXgcio2gIkvF18SyWFx0gKAbMfmhl nz9ctdJT5763RADEo5nxX+6o53ex X-Google-Smtp-Source: ABdhPJz4VXHp/53IqN+TUB8PBgH+QAgl+c3TiHu5TALuOfHDNIB4qujsumijszKXdS8eV0H81AQqKg== X-Received: by 2002:a05:651c:299:: with SMTP id b25mr2358176ljo.13.1592335229126; Tue, 16 Jun 2020 12:20:29 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id n23sm5461869lfq.76.2020.06.16.12.20.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:28 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 08/13] apalis-tk1: enable distroboot Date: Tue, 16 Jun 2020 22:20:06 +0300 Message-Id: <1592335211-5998-9-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Use distro_bootcmd as default boot command instead of legacy emmcboot wrapper. 2. Drop emmcboot and sdboot wrappers. 3. Provide proper boot order for Distro Boot. Signed-off-by: Igor Opaniuk --- configs/apalis-tk1_defconfig | 2 +- include/configs/apalis-tk1.h | 51 ++++++++++++-------------------------------- 2 files changed, 15 insertions(+), 38 deletions(-) diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index 868303a..db66d68 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -11,7 +11,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_FIT=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=1 -CONFIG_BOOTCOMMAND="run emmcboot; setenv fdtfile ${soc}-${fdt-module}-${fdt_board}.dtb && run distro_bootcmd" +CONFIG_BOOTCOMMAND="setenv fdtfile ${soc}-${fdt-module}-${fdt_board}.dtb && run distro_bootcmd" CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_VERSION_VARIABLE=y diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index 965259c..6f73606 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -34,6 +34,20 @@ /* General networking support */ #define CONFIG_TFTP_TSIZE +/* + * Custom Distro Boot configuration: + * 1. 8bit SD port (MMC1) + * 2. 4bit SD port (MMC2) + * 3. eMMC (MMC0) + */ +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + #undef CONFIG_IPADDR #define CONFIG_IPADDR 192.168.10.2 #define CONFIG_NETMASK 255.255.255.0 @@ -54,24 +68,6 @@ "update_uboot=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \ "mmc write ${loadaddr} ${uboot_blk} ${blkcnt}\0" \ -#define EMMC_BOOTCMD \ - "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \ - "ro rootfstype=ext4 rootwait\0" \ - "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ - "setenv bootargs ${defargs} ${emmcargs} " \ - "${setupargs} ${vidargs}; echo Booting from internal eMMC; " \ - "run emmcdtbload; " \ - "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} - ${dtbparam}\0" \ - "emmcbootpart=1\0" \ - "emmcdev=0\0" \ - "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \ - "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb && " \ - "setenv dtbparam ${fdt_addr_r}\0" \ - "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \ - "emmcrootpart=2\0" - #define NFS_BOOTCMD \ "nfsargs=ip=:::::eth0:on root=/dev/nfs rw\0" \ "nfsboot=pci enum; run setup; setenv bootargs ${defargs} ${nfsargs} " \ @@ -82,23 +78,6 @@ "${soc}-${fdt_module}-${fdt_board}.dtb " \ "&& setenv dtbparam ${fdt_addr_r}\0" -#define SD_BOOTCMD \ - "set_sdargs=setenv sdargs ip=off root=PARTUUID=${uuid} ro " \ - "rootfstype=ext4 rootwait\0" \ - "sdboot=run setup; run sdfinduuid; run set_sdargs; " \ - "setenv bootargs ${defargs} ${sdargs} ${setupargs} " \ - "${vidargs}; echo Booting from SD card in 8bit slot...; " \ - "run sddtbload; load mmc ${sddev}:${sdbootpart} " \ - "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} - ${dtbparam}\0" \ - "sdbootpart=1\0" \ - "sddev=1\0" \ - "sddtbload=setenv dtbparam; load mmc ${sddev}:${sdbootpart} " \ - "${fdt_addr_r} ${soc}-${fdt_module}-${fdt_board}.dtb " \ - "&& setenv dtbparam ${fdt_addr_r}\0" \ - "sdfinduuid=part uuid mmc ${sddev}:${sdrootpart} uuid\0" \ - "sdrootpart=2\0" - #define BOARD_EXTRA_ENV_SETTINGS \ "boot_file=zImage\0" \ "console=ttyS0\0" \ @@ -106,12 +85,10 @@ "usb_port_owner_info=2 lane_owner_info=6 emc_max_dvfs=0 " \ "user_debug=30 pcie_aspm=off\0" \ "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ - EMMC_BOOTCMD \ "fdt_board=eval\0" \ "fdt_fixup=;\0" \ "fdt_module=" FDT_MODULE "\0" \ NFS_BOOTCMD \ - SD_BOOTCMD \ UBOOT_UPDATE \ "setethupdate=if env exists ethaddr; then; else setenv ethaddr " \ "00:14:2d:00:00:00; fi; pci enum && tftpboot ${loadaddr} " \ From patchwork Tue Jun 16 19:20:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310668 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=S7OZvOec; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdRQ5CPFz9sRW for ; Wed, 17 Jun 2020 05:24:02 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 28DB681F6B; Tue, 16 Jun 2020 21:21:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="S7OZvOec"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2556081F4E; Tue, 16 Jun 2020 21:20:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x231.google.com (mail-lj1-x231.google.com [IPv6:2a00:1450:4864:20::231]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D6FEB81F42 for ; Tue, 16 Jun 2020 21:20:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x231.google.com with SMTP id e4so24970737ljn.4 for ; Tue, 16 Jun 2020 12:20:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dy5ZX7b2P2JVLC/vJjbwHqtuFKL5UPTbOG2m4tmJJbI=; b=S7OZvOecMfsOmYkhqXDuRfykaCCUyjozFlClDqRRAp7+KD9ffXo4CkzII/7M8rT3CU BBoMUIIDhsJ115FDvZxR0v0sa4PhMg/Awbm4x3camlANlt0vWTEt2KRilaNlYw5OEbHv qwkkM91x9xDANk8BY7nRFZhqpkXGvrAYZa7s1jN3XSpNudOWNXmuOHYc5wfpfzGpeUwk MSytFrowPupJkm8KsVGmWUgBA14MWJml9+6kxlcezr6HARQyPNBYYHq7xILb6FCmqXVv M7Cvj/6hYMJH/+VVpHYSJeoqLnWF4q+eNjvHYrqVix35JsqNKxLMyu9EgH0pPlYAHi1g BUCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dy5ZX7b2P2JVLC/vJjbwHqtuFKL5UPTbOG2m4tmJJbI=; b=IxjdbQ4BNUgvbdgYyG0Cs1vw+OtcJZHuxIsAbfhTcYfz91cJ/bUIbJ1cxktkiU6TAk iEiWT4vhGweGhgfb9U/nF9roIRBCvQx1G9T+z9J/eoTcx1FN723+BPtA36A/OXM9nCGd 4BrA8+K6SnAIMjj3K00LMkPErfJt97BajhPLYXGfp8gQtbLN4wzarJVHCHpvL2oRoVUi vfMJvYYs/XEA4P0aQok5xHTDo3jdU9PgNf1rTeZDkaFIMFtObBHBxYeSLTHH5HGASRuO Pq3pQvWLs/GrQPo50hHGz6HLjrvoCx5aRolr1g+Fok4/tjcxBCuRWT9Mi7vxkxy3JuVD LjgQ== X-Gm-Message-State: AOAM530/inYcmnMAFiItrDwqFFYrnoZqa4LOe0y9u0mHBIX760sjA7I5 Hm/xHgAablRbP18KgVeVLxod6gjR X-Google-Smtp-Source: ABdhPJylcm9PtRynvmdG1NLRUbTSKP381Yn+waitio0166HlHChI1XxPy5EegyGRvO9Ymh8R2m/qkw== X-Received: by 2002:a2e:984b:: with SMTP id e11mr2032242ljj.358.1592335230711; Tue, 16 Jun 2020 12:20:30 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id r8sm5428178ljj.81.2020.06.16.12.20.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:30 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 09/13] apalis-tk1: fix setting fdtfile value Date: Tue, 16 Jun 2020 22:20:07 +0300 Message-Id: <1592335211-5998-10-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk s/fdt-module/fdt_module/g, as we don't use dash in fdt_file anymore. Fixes: 4c63a601("apalis-tk1: support v1.2 hardware revision") Signed-off-by: Igor Opaniuk --- configs/apalis-tk1_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/apalis-tk1_defconfig b/configs/apalis-tk1_defconfig index db66d68..42e320e 100644 --- a/configs/apalis-tk1_defconfig +++ b/configs/apalis-tk1_defconfig @@ -11,7 +11,7 @@ CONFIG_SPL_TEXT_BASE=0x80108000 CONFIG_FIT=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=1 -CONFIG_BOOTCOMMAND="setenv fdtfile ${soc}-${fdt-module}-${fdt_board}.dtb && run distro_bootcmd" +CONFIG_BOOTCOMMAND="setenv fdtfile ${soc}-${fdt_module}-${fdt_board}.dtb && run distro_bootcmd" CONFIG_CONSOLE_MUX=y CONFIG_SYS_STDIO_DEREGISTER=y CONFIG_VERSION_VARIABLE=y From patchwork Tue Jun 16 19:20:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310667 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=BbpJ9viR; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdR81pl8z9sRW for ; Wed, 17 Jun 2020 05:23:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6939081F50; Tue, 16 Jun 2020 21:21:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BbpJ9viR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C769881F47; Tue, 16 Jun 2020 21:20:44 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3211781F3E for ; Tue, 16 Jun 2020 21:20:34 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x242.google.com with SMTP id 9so24925082ljv.5 for ; Tue, 16 Jun 2020 12:20:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=frofmfifVt+6/KXCwxvMKq2xMyABI8vFcDD0CZKr5r0=; b=BbpJ9viR8OVwktDrTW2l0f/M9B3WFuOmdRz80jBCM27VMw8+AhVa/wXEdEtHDVPrZM mCLCDulyQMC/wNVL9goGLr2nmDWFSU2E9NIPg6/bZvS6qrocpFVCQhjv9igGgGsZZhjU ClMAaJtBXIImIO03Wx+eKco0wf/SvNyI/A1mNtMw39NSwuWEAxfjAcqIQURInhYEE7h/ d6F+YYPQJjWOADYnI1pI47KcGbt8/Q6YDVcDMe1BOqPG8YAals9pU45Q17IL5BTr5aUl bbguQA9v0/wW6GhYan/F3rkbBKW2t9DenZr374lFuPbugcsiknz6E7O9AL0xh2UokU7Y OTgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=frofmfifVt+6/KXCwxvMKq2xMyABI8vFcDD0CZKr5r0=; b=QFEZvyuAhKMa7lV0Vat434pdzhUfMQJ8W9L9kIuELblLr5iqsaujEWFMhVo/xCoH4k VT3Cr+v+P2AIRM76LsL9me295Zj77iLLZ15jclij47yDp86x+t2+loQ9OcUHHNivMabF 5iHRFVY2PnG2G6TCau0ZIDmsP8ph9eBdcZLsQwKDeCQytKduawGtIgtMIwzgwiZRwQtB gJQMw+wOx4qjAbfwjGFQU3/KRFcJ5RQgggbORz5l2bJfablzOum5Rbyrym4cNSfRSuxi PlLDEhMSTb50VFoySZTS08MtupJESss9ZAWu0rJtv3Dw6waJJu3w6sbxafWkuPxR3lwQ gnrA== X-Gm-Message-State: AOAM532RSYc3zmZr02hnA1wuGSNnJ7P7lAhb64s2669k4HeNTIhcK2HF MI6L5sFMyIrhPrpaj/UddfuGhdZ8 X-Google-Smtp-Source: ABdhPJxsPk9vQdsuqUAmDQHpyKGIhbmqK9v5vCbzwXO/qUY5Grz3LnfgMDc1bt44Tfp88FqDyIQcJw== X-Received: by 2002:a2e:9d48:: with SMTP id y8mr2152066ljj.419.1592335232281; Tue, 16 Jun 2020 12:20:32 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id o23sm6487102lfg.0.2020.06.16.12.20.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:31 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk , Stefano Babic Subject: [PATCH v1 10/13] toradex: imx: enable BOOTCOUNT feature Date: Tue, 16 Jun 2020 22:20:08 +0300 Message-Id: <1592335211-5998-11-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk This introduces automatic boot counter that increases after every reset.After a power-on reset, it will be initialized with 1, and each reboot will increment the value by 1. By default it's disabled if bootlimit isn't set. To enable this feature you have set bootcount limit ("bootlimit"), alternate boot action ("altbootcmd") that will be performed if the new value of bootcount exceeds the value of bootlimit, and "upgrade_available" to let U-Boot automatically increase and save the counter value after every reset: > setenv bootlimit 5 > setenv upgrade_available 1 > setenv altbootcmd "bootm ..." In case the bootlimit exceeds, the message will be shown and albootcmd executed: Warning: Bootlimit (5) exceeded. Using altbootcmd. To reset bootcount run: > bootcount reset Print current value: > bootcount print Signed-off-by: Igor Opaniuk --- configs/apalis_imx6_defconfig | 3 +++ configs/colibri-imx6ull_defconfig | 3 +++ configs/colibri_imx6_defconfig | 3 +++ configs/colibri_imx7_defconfig | 3 +++ configs/colibri_imx7_emmc_defconfig | 3 +++ 5 files changed, 15 insertions(+) diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig index 6b0f0e4..65162a2 100644 --- a/configs/apalis_imx6_defconfig +++ b/configs/apalis_imx6_defconfig @@ -53,6 +53,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_PMIC=y @@ -65,6 +66,8 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=4096 CONFIG_DWC_AHSATA=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 74a67a0..ce145cd 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_REGULATOR=y CONFIG_CMD_MTDPARTS=y @@ -54,6 +55,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352 +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_DFU_NAND=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_MXC=y diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig index 44a3ff8..ca33327 100644 --- a/configs/colibri_imx6_defconfig +++ b/configs/colibri_imx6_defconfig @@ -52,6 +52,7 @@ CONFIG_CMD_USB_SDP=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_UUID=y @@ -64,6 +65,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352 +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_SUPPORT_EMMC_BOOT=y diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index 7596478..89ee6e5 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -40,6 +40,7 @@ CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_BOOTP_PXE is not set CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y # CONFIG_CMD_HASH is not set CONFIG_CMD_MTDPARTS=y @@ -54,6 +55,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352 +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_FSL_CAAM=y CONFIG_DFU_NAND=y CONFIG_DM_I2C=y diff --git a/configs/colibri_imx7_emmc_defconfig b/configs/colibri_imx7_emmc_defconfig index c23ff97..13a3aae 100644 --- a/configs/colibri_imx7_emmc_defconfig +++ b/configs/colibri_imx7_emmc_defconfig @@ -38,6 +38,7 @@ CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_BMP=y +CONFIG_CMD_BOOTCOUNT=y CONFIG_CMD_CACHE=y # CONFIG_CMD_HASH is not set # CONFIG_ISO_PARTITION is not set @@ -48,6 +49,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=16352 +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_BOOTCOUNT_ENV=y CONFIG_FSL_CAAM=y CONFIG_USB_FUNCTION_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 From patchwork Tue Jun 16 19:20:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310669 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ZiWBwL6d; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdRp2pqQz9sRW for ; Wed, 17 Jun 2020 05:24:22 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F22281F76; Tue, 16 Jun 2020 21:21:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZiWBwL6d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2A80481F4B; Tue, 16 Jun 2020 21:20:45 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x244.google.com (mail-lj1-x244.google.com [IPv6:2a00:1450:4864:20::244]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A675281F3A for ; Tue, 16 Jun 2020 21:20:35 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x244.google.com with SMTP id y11so24998722ljm.9 for ; Tue, 16 Jun 2020 12:20:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fT8BPVr+sRxlaCkPLDGcIS3q2sMh8Z9DYF5/Z5oxWe0=; b=ZiWBwL6doe5gkZLTJwjh6b7Xq28l/h1P+TMptgl/wGgsrsukONjmX29JBka41j6jgj u7wzt1x6jFvMkVR3/KSj5RvfRuSqHRlOQ/Zm5A+xR90QnwHzRz2LC+YW7o27TKa+e+mw trLWbNOey7EjhjnO+ZvEUCnV6UZ3gYsOobuPWkQ5qRcQUqCGH2kjnlw3+5YZO1bj0Bt0 8wnXyCThLd558fDskabGeG0EZ1D5iUtviKvSg4bR/0nZ1Znwi4YQwOtkPxnDsf433ltl 2sCgL8BOVXoy89RJ6gqsbIDGN1ZzhE7p3ccbFRPg/oBSlDjws9gPaVJg1nXE/Zvz4hh8 ITZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fT8BPVr+sRxlaCkPLDGcIS3q2sMh8Z9DYF5/Z5oxWe0=; b=NuNTOAlqUhaN6sMSBDTs7bwgG001nl+RDCWw1flNbV8HjJCGPxW6eBNECPbDE1XpXR ADjocCnhXY5hVsolqs75kur37U49DSeC9TwUJbHtjFyMn2dlCrjZjq11LxjynXuwKGxz zzYZ3JdeLW5dslOMBp5giuvyhwGZ0lOxwRZUBEtbgWnrSN+Tgfu6YGJ2SxphQdCeEFpP O45tmgLuYCYnAWRAVC5886fS8ugA/M5sS4IFFhoYvRya3rXLTXQxHX3uz+r3BHN7l/sO e1wsNSlQbDS2aIrS4Wn+tZA2WZUsf2TmsOLob9jJr1Kkc7Wf8wLYjHZHU+22GoGJKKnV B/WA== X-Gm-Message-State: AOAM530VU3gOP4MM2QqcZ92w4CrlMytJ0oNbhqF/zAUOFrJf5Qibywla LMgWp9bZjGqE/9hes3DAFc0O5b7a X-Google-Smtp-Source: ABdhPJwWbxTjyinzVF5jxc9G3SCmZC68DJh7h1Lh0Z/iAaPx4ycQZeGYnfnRPUjX2fOUh02U0nZK+g== X-Received: by 2002:a2e:974a:: with SMTP id f10mr2264708ljj.283.1592335233956; Tue, 16 Jun 2020 12:20:33 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id k22sm5459313lfg.69.2020.06.16.12.20.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:33 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 11/13] apalis_imx6: boot env configuration updates Date: Tue, 16 Jun 2020 22:20:09 +0300 Message-Id: <1592335211-5998-12-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Drop legacy emmcboot wrapper from env. 2. Change the "boot try" order. Default one is: SD -> eMMC -> USB -> DHCP 3. Drop DFU defines Signed-off-by: Igor Opaniuk --- include/configs/apalis_imx6.h | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index d5a0625..dd99096 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -93,9 +93,9 @@ #ifndef CONFIG_SPL_BUILD #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ func(MMC, mmc, 2) \ + func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include @@ -105,14 +105,6 @@ #define BOOTENV #endif /* CONFIG_SPL_BUILD */ -#define DFU_ALT_EMMC_INFO \ - "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ - "boot part 0 1;" \ - "rootfs part 0 2;" \ - "zImage fat 0 1;" \ - "imx6q-apalis-eval.dtb fat 0 1;" \ - "imx6q-apalis-cam-eval.dtb fat 0 1" - #define UBOOT_UPDATE \ "uboot_hwpart=1\0" \ "uboot_blk=8a\0" \ @@ -124,23 +116,6 @@ "update_spl=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \ "mmc write ${loadaddr} ${uboot_spl_blk} ${blkcnt}\0" -#define EMMC_BOOTCMD \ - "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} " \ - "ro,noatime rootfstype=ext4 rootwait\0" \ - "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ - "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ - "${vidargs}; echo Booting from internal eMMC chip...; " \ - "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} " \ - "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} ${dtbparam}\0" \ - "emmcbootpart=1\0" \ - "emmcdev=0\0" \ - "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \ - "${fdt_addr_r} ${fdt_file} && " \ - "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \ - "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \ - "emmcrootpart=2\0" - #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x20000000\0" \ "fdt_addr_r=0x12100000\0" \ @@ -173,8 +148,6 @@ "boot_file=zImage\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off vmalloc=400M\0" \ - "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ - EMMC_BOOTCMD \ "fdt_file=" FDT_FILE "\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \ From patchwork Tue Jun 16 19:20:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310672 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=DWmW6TnB; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdSt5ZYdz9sRW for ; Wed, 17 Jun 2020 05:25:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC02B81F85; Tue, 16 Jun 2020 21:21:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DWmW6TnB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1464381F34; Tue, 16 Jun 2020 21:20:51 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 81F1481F34 for ; Tue, 16 Jun 2020 21:20:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x241.google.com with SMTP id n24so24896661lji.10 for ; Tue, 16 Jun 2020 12:20:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vMg+5fRUGGjFTK28MJxj9VLecRDlQNZLClvxWlUNmds=; b=DWmW6TnBdiEjMreCix91/m+A1lfxP9UzPN1LxXGCWnU+4xriwr2mNR5pUTVObRsJw1 A2PbkcUrSg7bhfoh/MjFOTTth7l9fCgxOfyIolCHLOwW6E+ymXFeS7M/Scd7O9vHA5Nv 16H9sLLvt2Zapda/Hx28OJwtsEIMgbWopQw75MJjBjNX9mqvUL647lgFTyhc0wXezWEq pzhR2/EIVLtIF7BMyLfxRRR1wFCba1tNX/vRPGpHlwDEjHfnubdWDznnyDjgR/mtS26F 5BaLiPORjZ3TQ4DBQeTpIMAWSlyGE7Uz4/h+Avo/pQ9eMqPQd5uBYwCL5ALBHE2k1DYo mJsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vMg+5fRUGGjFTK28MJxj9VLecRDlQNZLClvxWlUNmds=; b=DQ8RzetcEZK6ORKuMOAWHh/XBsHLwAiRmEAwYkQaA069CTfly4dTVzMYXL1XBFwEnj 8Zei++0mnAuPRzqzUDITik4siuEE2foSkIs1I5X+udMmt5FACZ92nz5fxdMwBR0s9PBj YuTkVQXv9WKG0uAXP9KoBG3i8yQzc07p2jdgRdnhCffoObPBu7DP+gibk0FMXU37Idov tG9sFvsNKLH7fWat5s01MBmv+QFvEeMvQn4IZKRSYH8xvxUMwAYz2y/tx9QYCftoI538 cht3v5QvOCXtRZE4LorGB1xLm07svKh2dO+7vauKWJeiNqnaYxBiwI/T7m+zKbEWvlkn jXvQ== X-Gm-Message-State: AOAM531luce75rtsSZAUBwKuz/x3rC10E17/pkzmxp2fFjCBHqX9oQL1 tZ/M8r9XUoGQF1QsqO19dbgPArrz X-Google-Smtp-Source: ABdhPJz9cBLpagP0uzbMHb9UOKlszrnrTB4yZuu3n2PXzBDU2kYndQog8VR2assnQn03jaCXp+NxmQ== X-Received: by 2002:a2e:918e:: with SMTP id f14mr2250529ljg.229.1592335235522; Tue, 16 Jun 2020 12:20:35 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id k7sm1244475lfm.88.2020.06.16.12.20.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:35 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 12/13] colibri_imx7: boot env configuration updates Date: Tue, 16 Jun 2020 22:20:10 +0300 Message-Id: <1592335211-5998-13-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Drop legacy emmcboot wrapper from env. 2. Change the "boot try" order. Default one is: SD -> eMMC -> USB -> DHCP 3. Drop DFU defines Signed-off-by: Igor Opaniuk --- include/configs/colibri_imx7.h | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h index b3f660b..1afa937 100644 --- a/include/configs/colibri_imx7.h +++ b/include/configs/colibri_imx7.h @@ -88,23 +88,6 @@ "mmc read ${android_fdt_addr} ${env_start} ${env_size}; " \ "bootm ${loadaddr} ${loadaddr} ${android_fdt_addr}\0 " -#define EMMC_BOOTCMD \ - "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} ro " \ - "rootfstype=ext4 rootwait\0" \ - "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ - "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ - "${vidargs}; echo Booting from internal eMMC chip...; " \ - "run m4boot && " \ - "load mmc ${emmcdev}:${emmcbootpart} ${fdt_addr_r} " \ - "${soc}-colibri-emmc-${fdt_board}.dtb && " \ - "load mmc ${emmcdev}:${emmcbootpart} ${kernel_addr_r} " \ - "${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "emmcbootpart=1\0" \ - "emmcdev=0\0" \ - "emmcfinduuid=part uuid mmc ${emmcdev}:${emmcrootpart} uuid\0" \ - "emmcrootpart=2\0" - #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x82000000\0" \ @@ -144,7 +127,6 @@ "setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;" #define MODULE_EXTRA_ENV_SETTINGS \ "variant=-emmc\0" \ - EMMC_BOOTCMD \ EMMC_ANDROID_BOOTCMD #endif @@ -155,8 +137,8 @@ func(DHCP, dhcp, na) #elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC) #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #endif @@ -239,10 +221,6 @@ #define CONFIG_USBD_HS -/* USB Device Firmware Update support */ -#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_16M -#define DFU_DEFAULT_POLL_TIMEOUT 300 - #if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO) #define CONFIG_VIDEO_MXS #define CONFIG_VIDEO_LOGO From patchwork Tue Jun 16 19:20:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Opaniuk X-Patchwork-Id: 1310671 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=WP17bVus; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49mdSV3C6lz9sRk for ; Wed, 17 Jun 2020 05:24:58 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BDDCB81F7B; Tue, 16 Jun 2020 21:21:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WP17bVus"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 59A4A81F4E; Tue, 16 Jun 2020 21:20:50 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x241.google.com (mail-lj1-x241.google.com [IPv6:2a00:1450:4864:20::241]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0887281F44 for ; Tue, 16 Jun 2020 21:20:38 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=igor.opaniuk@gmail.com Received: by mail-lj1-x241.google.com with SMTP id n23so24918756ljh.7 for ; Tue, 16 Jun 2020 12:20:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7b2iUifQ5Y44L5xEiltY2vysdkYMBuG8wYOpbyUaSfo=; b=WP17bVusShalYOLs3nlt5ecfX2b+4ztwJgUoJSfydXrQ5ZMMyg5MGpfTu7BbrH8HSG +2eiMJJ9kS3tVR+VVv8YYYSojtZFdQdz2UXS+koZ/n4hP1F0gXIMUVxfDNI2g2Hg/8/a KjjhFwku25cDQ5nWjYr79SqxXlN6ahY3ECQ2jPJbnOvzEZ8qzURFMrbpyy5WuopNUOIp juWnq7Xd2/l7c7GS7+LVz6s+ANCSIubNyy6hI3oh7kBr8gYox+AS+CdYS58znNSsjM4J Gt9FB8DuyB4HBGLq7doGmo3JLElK7d2M4U0zPghdjYb+3FziacbsakKyRLzm5fol67YC IflA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7b2iUifQ5Y44L5xEiltY2vysdkYMBuG8wYOpbyUaSfo=; b=h/ozYrZBNqbtkAGnvPfhdy1KY0vccm8SiTNLNeIExZ8OjJG57M0KSOdun17pZHvfa0 fS1SLEvaMyQ1mRHOOFAr1pfy0RooZNgR12u4v194QCuTggfl+ULwxEQEPzSGZ7j1duqI f0WIszuqRrxF7a10AU90J8D8Qvr34kz9Zt/or59BGw4CxgX2fAPCmm+MSLmZ3iiYJrbQ oQy98ym6d8Wx8atZAgjTJwxw75H8qlg97xJ3wyiboCQqp7NTgEc3cnmWbWOZBjedd5Cz TYrb8t5KByXREZCl+CXpq8jLBj1aqY+s/CpW0wR6zC2/unraRs/jk7q7I//WqARoHfAw bPpg== X-Gm-Message-State: AOAM530rLZRpLXd4xMPJ6IoDSmeu5nUdYI61nCO7AEYc374nxgyZ4qu9 Suard79y17bQ5usGmEzJ6I74ZpCj X-Google-Smtp-Source: ABdhPJxuspdgs3SRitTtuO3CYaE7y8Ge4k9nOFm0wUPFcaf/fBA6HJC3d7AN96BdcUmRgmoAX0x2zQ== X-Received: by 2002:a2e:8809:: with SMTP id x9mr1943669ljh.442.1592335237076; Tue, 16 Jun 2020 12:20:37 -0700 (PDT) Received: from localhost ([194.44.17.239]) by smtp.gmail.com with ESMTPSA id g22sm4116826lfb.43.2020.06.16.12.20.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jun 2020 12:20:36 -0700 (PDT) From: Igor Opaniuk To: u-boot@lists.denx.de Cc: twarren@nvidia.com, stefan.agner@toradex.com, marcel.ziswiler@toradex.com, max.krummenacher@toradex.com, oleksandr.suvorov@toradex.com, philippe.schenker@toradex.com, Igor Opaniuk Subject: [PATCH v1 13/13] colibri_imx6: boot env configuration updates Date: Tue, 16 Jun 2020 22:20:11 +0300 Message-Id: <1592335211-5998-14-git-send-email-igor.opaniuk@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> References: <1592335211-5998-1-git-send-email-igor.opaniuk@gmail.com> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean From: Igor Opaniuk 1. Drop legacy emmcboot wrapper from env. 2. Change the "boot try" order. Default one is: SD -> eMMC -> USB -> DHCP 3. Drop DFU defines Signed-off-by: Igor Opaniuk --- include/configs/colibri_imx6.h | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index 6beef25..7271f29 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -83,6 +83,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ func(USB, usb, 0) \ func(DHCP, dhcp, na) #include @@ -92,14 +93,6 @@ #define BOOTENV #endif /* CONFIG_SPL_BUILD */ -#define DFU_ALT_EMMC_INFO \ - "u-boot.imx raw 0x2 0x3ff mmcpart 0;" \ - "boot part 0 1;" \ - "rootfs part 0 2;" \ - "zImage fat 0 1;" \ - "imx6dl-colibri-eval-v3.dtb fat 0 1;" \ - "imx6dl-colibri-cam-eval-v3.dtb fat 0 1" - #define UBOOT_UPDATE \ "uboot_hwpart=1\0" \ "uboot_blk=8a\0" \ @@ -111,24 +104,6 @@ "update_spl=run set_blkcnt && mmc dev 0 ${uboot_hwpart} && " \ "mmc write ${loadaddr} ${uboot_spl_blk} ${blkcnt}\0" -#define EMMC_BOOTCMD \ - "set_emmcargs=setenv emmcargs ip=off root=PARTUUID=${uuid} "\ - "rw,noatime rootfstype=ext4 " \ - "rootwait\0" \ - "emmcboot=run setup; run emmcfinduuid; run set_emmcargs; " \ - "setenv bootargs ${defargs} ${emmcargs} ${setupargs} " \ - "${vidargs}; echo Booting from internal eMMC chip...; " \ - "run emmcdtbload; load mmc ${emmcdev}:${emmcbootpart} " \ - "${kernel_addr_r} ${boot_file} && run fdt_fixup && " \ - "bootz ${kernel_addr_r} ${dtbparam}\0" \ - "emmcbootpart=1\0" \ - "emmcdev=0\0" \ - "emmcdtbload=setenv dtbparam; load mmc ${emmcdev}:${emmcbootpart} " \ - "${fdt_addr_r} ${fdt_file} && " \ - "setenv dtbparam \" - ${fdt_addr_r}\" && true\0" \ - "emmcfinduuid=part uuid mmc ${mmcdev}:${emmcrootpart} uuid\0" \ - "emmcrootpart=2\0" - #define MEM_LAYOUT_ENV_SETTINGS \ "bootm_size=0x10000000\0" \ "fdt_addr_r=0x12100000\0" \ @@ -156,8 +131,6 @@ "boot_file=zImage\0" \ "console=ttymxc0\0" \ "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \ - "dfu_alt_info=" DFU_ALT_EMMC_INFO "\0" \ - EMMC_BOOTCMD \ "fdt_file=" FDT_FILE "\0" \ "fdt_fixup=;\0" \ MEM_LAYOUT_ENV_SETTINGS \