From patchwork Fri Apr 1 13:11:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Piotr Dymacz X-Patchwork-Id: 1612202 X-Patchwork-Delegate: pepe2k@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Wj/++MNl; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=GS2A6vas; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) 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=) 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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KVLHj4G8Qz9sXM for ; Sat, 2 Apr 2022 00:14:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=q3IjfdXERSD3om2RSOkftym+l/h9AbxDF7/YTbwmgFU=; b=Wj/++MNlfPEO+g B5UbEqLPoAVjjWVqGJg4KjsOg2WqUNGDIUl/Fqav4e2SeFnCZOEJsEHL621XSvvyIGWZ7g3TfqFLA 0875PPZ6UVkZLayqt+ldaElQDIhxEOEFtUhfpuw1NJpFXDZIi5leFDL16GW3B9E3148vpPxX+LBUK AMm0h7qWQdr3X3kGeYB7JnMVKhi4aruk7D6MjzRbRGjENVp8j6N7O3OsMUmCH9jFk9ULZP8OHWR2Q 2+k6RR5xcOASpDUcvQfr8aI/t9cQfo6pncga/sE6qMQxha5LOPZADhGnnbsNnDj7dhIIfRAUxDynu 2Zcmm5NS39cyrFd6tjpA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1naH4d-005jm7-VD; Fri, 01 Apr 2022 13:12:20 +0000 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1naH4a-005jl6-Lg for openwrt-devel@lists.openwrt.org; Fri, 01 Apr 2022 13:12:17 +0000 Received: by mail-lf1-x135.google.com with SMTP id bq24so4856782lfb.5 for ; Fri, 01 Apr 2022 06:12:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xNh+Q7xhUzp2LmzHeHu4OBwO8kRp9ePOYBS68/wnwuE=; b=GS2A6vas2NnwgXxZDoG87zNkyiG5ElzlJKYhufOGW7EKkQZ8M3uMQ4e628w2+OU4a5 2WiCIS64IDF7QCo2xA+MwBzY3LSbVeTsvWExpjG7jauogSzKn3Ct9Qaz1aIFONN4kFwr ujO/jnQ159QX6lruS7Ho6XEMnQeoXCjJflZpyT4+wnH7NmeRZPi6Z44Y2NasoQyjWsNZ Drk3vLK0r2qTLBgK7i+Z5iVOmzmvPf/tOHiVjBFkKeEFudRehe6gQ2ZQ7TPwo8Y2Qolh 4vDBDojb6ViOh5s8ruRwIPWbQ8GcL+QtxuaZk20uVouWn/t9vwtccB16k+q8yI5ceqHD oN6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xNh+Q7xhUzp2LmzHeHu4OBwO8kRp9ePOYBS68/wnwuE=; b=s9rySWlzoeUMbRLxk5wwxocGyG2ENDGKeydU+QKYC9iIwG3Oo6qOatfwiogkfk7vrw jvQiRkAGI7TtXki5lWGXeaHcFRYydx8wjr7ZlMtUOG3F6l64SsQVF3+Hwbosy2jPZQ20 /OuFm6BlmBp9NERlCxOEFh5UFqTEXZayOeqk/lbzZzyEEMlZUgohvD4KP2j8K/BUhMa6 J4Vv9+Vln5tbYiQ/YTT3KAh6epyxfGwH2J01N5J93G4q2642BJ24Gtq7HGpXl84Y7Kfo vIns/G+ejdFzaWhTHD4sJOVe8dZKEA7OA2kzOtYdfExYtiMgjrjPxojC7gaU7WTwCTJo EfVA== X-Gm-Message-State: AOAM5313lelEoO9IgH0D5Osa+2tg9fZAmW29EOvNzRiycyKrVca2bFO0 mxdWltD2242LbY7S9SvBKQKiVRdnCrc= X-Google-Smtp-Source: ABdhPJwlk6FGbPI0FLf/WA6ZeGLk5ZZXkG4q9nUDSheSS9skjzwHSp6LanZL4wmBzQkJTCO4S4RaKw== X-Received: by 2002:a05:6512:3095:b0:44a:6dcc:42df with SMTP id z21-20020a056512309500b0044a6dcc42dfmr13857597lfd.535.1648818733166; Fri, 01 Apr 2022 06:12:13 -0700 (PDT) Received: from desktop-mint.lan ([45.142.163.102]) by smtp.gmail.com with ESMTPSA id i25-20020a0565123e1900b0044a2908b040sm238402lfv.115.2022.04.01.06.12.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 06:12:12 -0700 (PDT) From: Piotr Dymacz To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Subject: [PATCH 2/4] imx: bootscript-apalis: make it working with U-Boot 2022.01 Date: Fri, 1 Apr 2022 15:11:35 +0200 Message-Id: <20220401131137.697545-2-pepe2k@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401131137.697545-1-pepe2k@gmail.com> References: <20220401131137.697545-1-pepe2k@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220401_061216_749555_6F0FFFC6 X-CRM114-Status: UNSURE ( 9.00 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__From=3A_Petr_=C5=A0tetiar_Upstream_in_?= =?unknown-8bit?q?commit_8b9c0cb46471_=28=22apalis=5Fimx6=3A?= =?unknown-8bit?q?_boot_env_configuration_updates=22=29_removed_emmc_legacy_w?= =?unknown-8bit?q?rappers=2C_but_so_far?= =?unknown-8bit?q?_didn=27t_included_any_replacements=2E_Fix_it_by_simply_def?= =?unknown-8bit?q?ining_the_missing_variabl?= =?unknown-8bit?b?IFsuLi5dIA==?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-0=2E2_points=2C_5=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_no_trust?= =?unknown-8bit?b?IFsyYTAwOjE0NTA6NDg2NDoyMDowOjA6MDoxMzUgbGlzdGVkIGluXQ==?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?= =?unknown-8bit?q?ish_an_SPF_Record?= =?unknown-8bit?q?_0=2E0_FREEMAIL=5FFROM__________Sender_email_is_commonly_ab?= =?unknown-8bit?q?used_enduser_mail?= =?unknown-8bit?q?_provider?= =?unknown-8bit?q?_=5Bpepe2k=5Bat=5Dgmail=2Ecom=5D?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Petr Štetiar Upstream in commit 8b9c0cb46471 ("apalis_imx6: boot env configuration updates") removed emmc legacy wrappers, but so far didn't included any replacements. Fix it by simply defining the missing variables and UUID gathering directly into the boot script. Signed-off-by: Petr Štetiar [pepe2k@gmail.com: updated commit title for 2022.01] Signed-off-by: Piotr Dymacz --- target/linux/imx/image/bootscript-toradex_apalis | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/imx/image/bootscript-toradex_apalis b/target/linux/imx/image/bootscript-toradex_apalis index 3a3a6dadb1..f163b92ed0 100644 --- a/target/linux/imx/image/bootscript-toradex_apalis +++ b/target/linux/imx/image/bootscript-toradex_apalis @@ -1,13 +1,15 @@ echo "Toradex Apalis OpenWrt Boot script v1.1" -run emmcfinduuid +setenv mmcdev 0 +setenv mmcrootpart 2 +part uuid mmc ${mmcdev}:${mmcrootpart} uuid 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 ${emmcdev}:${emmcbootpart} +setenv fsload ext4load mmc ${mmcdev}:${mmcbootpart} if ${fsload} ${kernel_addr_r} ${boot_file}; then if ${fsload} ${fdt_addr_r} ${fdt_file}; then