From patchwork Mon Mar 2 17:42:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1247781 X-Patchwork-Delegate: ynezz@true.cz 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.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=r35rH1u6; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 48WShN5r7bz9sSJ for ; Tue, 3 Mar 2020 05:04:20 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SBlNDsUjAqlBK5tStxc9R5SZKcKOaQnjzsK/yiabPAs=; b=r35rH1u6DlaJjn ke2KQxaku6Pc3V2433WxLQ7v4BfrNrOgzXvouJVLmcASNn4ZkRJ84g8vJJ4d5rWdZxbkq0f4hG7M6 QEFvRIW2qUwe9OIJ7cfSwt3mfEAqrhP20u48zfjmlLNqsVltUix8erez4+vk1gWMNvfG+ffLpKXPw BYAjCDXZ1nAW/v3aJUYo7BDZA2g74SRQM9u9szkXfc6fgnBN9SXACNCohNikGOzHIicrwQPMgEKtD shm5peyJwIk5aRF4OD2YUHL7G6AR2S5kE9Sud1YfQW+ty3FsegUXMlwilh2KYW+cb8v6ZIG1cciHp 9MVggDZWH1mUktgo4Q5Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j8pQP-0000a9-Jw; Mon, 02 Mar 2020 18:04:17 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j8pQH-0000Sc-39 for openwrt-devel@lists.openwrt.org; Mon, 02 Mar 2020 18:04:10 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 24AC84170; Mon, 2 Mar 2020 19:04:06 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id b05bd899; Mon, 2 Mar 2020 19:03:52 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Mon, 2 Mar 2020 18:42:55 +0100 Message-Id: <20200302174256.3238-2-ynezz@true.cz> In-Reply-To: <20200302174256.3238-1-ynezz@true.cz> References: <20200302174256.3238-1-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200302_100409_292781_B36BDDB3 X-CRM114-Status: UNSURE ( 6.77 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record Subject: [OpenWrt-Devel] [PATCH 2/3] imx6: apalis: fix variables in bootscript X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org U-Boot 2020.01 has changed names for same variables, adjust the bootscript accordingly. Added boot_file variable as the default value is zImage. Signed-off-by: Petr Štetiar --- target/linux/imx6/image/bootscript-apalis | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/target/linux/imx6/image/bootscript-apalis b/target/linux/imx6/image/bootscript-apalis index 81a501cc63d6..3a3a6dadb145 100644 --- a/target/linux/imx6/image/bootscript-apalis +++ b/target/linux/imx6/image/bootscript-apalis @@ -1,12 +1,13 @@ -echo "Toradex Apalis OpenWrt Boot script v1.0" +echo "Toradex Apalis OpenWrt Boot script v1.1" -run finduuid +run emmcfinduuid setenv nextcon 0 +setenv boot_file uImage setenv fdt_file imx6q-apalis-ixora.dtb setenv root root=PARTUUID=${uuid} rootfstype=squashfs rootwait setenv bootargs earlyprintk console=${console},${baudrate}n8 ${root} -setenv fsload ext4load mmc ${mmcbootdev}:${bootpart} +setenv fsload ext4load mmc ${emmcdev}:${emmcbootpart} if ${fsload} ${kernel_addr_r} ${boot_file}; then if ${fsload} ${fdt_addr_r} ${fdt_file}; then