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 && " \