From patchwork Wed Nov 25 16:10:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1406127 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=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=mC4K69t5; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=KGeX9u8e; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4Ch5W15q99z9sSf for ; Thu, 26 Nov 2020 03:11:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=EO12/mXvmd60IRpazvnn91Z5TOrS8RnPSVFpO+FuqVk=; b=mC4K69t50X96h2nLet3VMiuyL7 56/XkAe9mXmCdS1PZLyxyWL/5I1W8SOTSMFzthLGljLalS08XSyvDuCdYLBpf559XuWaTFjjmv/7D la8nI2z7T7pAwk8yG8xtnm09m0+SpaLGHEQRzoZbN/JJsRioVckvA05slGg+T2Y+G5fU2xO+0UbXn rVmV37QwXQzR6JU5zqOd1q23lC3o1bn3kVnDydVCI4bv4sa8QrJiTD8gKcxeY/Ol62zsEV93uDnyJ ScjH8RFMzR+oC4LrU08gxigGhx6x2MTUD+pH5Wr009cG9pViUkxFWY6XQnQBRfynyXbfFoQJEprl4 5pk2uoUg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxNE-00077s-J4; Wed, 25 Nov 2020 16:10:28 +0000 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxN8-000764-F7 for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:10:24 +0000 Received: by mail-lj1-x22e.google.com with SMTP id b17so2832406ljf.12 for ; Wed, 25 Nov 2020 08:10:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=iHymKk0lFOI+9IWQc+6eascoM+SnzQ7iXnlCGA7zQjU=; b=KGeX9u8edfUdnu/WVKT9ABy6d9aQ1PPh4wHP5hK3X3lg8Dpm5OEZLGny6vh3fbaBkA dCGXwmp6AVBfhqXmPoyoo3B732GQzvsF3w+iYCF8w9/RIGdNbD1yBzRBSMYGepzYvUO2 AsIP5C7luauWEf9dRkzcP7FpieJoXd6UgN8uXJn/TsBiYZ02RscJA/eh8BxaeKra+uwT wCMXY4VQfyDZSqGlTADvPbb7fyP6CxzQ8D2iZ8FfsMqwZ4g8C2oJhJDX2IFJc6jTo5nF T+7k/edykqCIwt0NPhRNjljO+TqNwqWnF1AcbKF9I4h6bqptiXEQcwfrilBs6kNKUB1L F+Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=iHymKk0lFOI+9IWQc+6eascoM+SnzQ7iXnlCGA7zQjU=; b=qrX/C4Uqwuw8+kVsWObWWA7EyU3+zQ4UApxr0rkW6sGmw/bEFAIZ3GN6Wijt8d9RNX 5VysV8JM04pT/dt+kpo0S0tgN3eUvNqh44FeDoCoTDkdhUxmqaHBVBYYbVX6M2sXJvK3 dOhCRWnBifJLZ+2+cIS/AquSu6B2aAZS52Xx1jF/Aime9enxoCD4HJA5QkuxP6ge525b zWCckrhZa0YE99JoqMmXydHlMxWtWZsYc7ytY/AMOvnu2SwfUdIzplSTU8BV2XEnvf+g /jcBBA52qlk0m1b5CekyN6ez85dup7Zepaer6Wp3ql8o60t6o2TRLYhhoJk9DoiFrIRq AX/g== X-Gm-Message-State: AOAM530u9mBQvMYdF5eudx96lS+cpmnj1URrUisfX6kL/gKgDdVhqEGe dfABMj0Ko4Hy5cOIui0c1H+ovrm7ldmOgg== X-Google-Smtp-Source: ABdhPJxwy0EJGvEgWrQtmUPmD3OAtlXLNmrUhxm6M0TiF+a50Xb3s3OoUaZ+LfbELa/h6tfwXrcYGA== X-Received: by 2002:a2e:b055:: with SMTP id d21mr1718036ljl.131.1606320619327; Wed, 25 Nov 2020 08:10:19 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id o7sm287669ljg.41.2020.11.25.08.10.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:10:18 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/3] uboot-tegra: bump to 2020.04 Date: Wed, 25 Nov 2020 17:10:03 +0100 Message-Id: <20201125161005.2307-1-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_111022_661272_97AFFDF8 X-CRM114-Status: GOOD ( 11.81 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:22e listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [tmn505[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [tmn505[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 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 This fixes error when host GCC >= 10. /usr/bin/ld: scripts/dtc/dtc-parser.tab.o:(.bss+0x10): multiple definition of `yylloc'; scripts/dtc/dtc-lexer.lex.o:(.bss+0x0): first defined here collect2: error: ld returned 1 exit status Signed-off-by: Tomasz Maciej Nowak --- package/boot/uboot-tegra/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/uboot-tegra/Makefile b/package/boot/uboot-tegra/Makefile index 778019257da0..a3d66900db7f 100644 --- a/package/boot/uboot-tegra/Makefile +++ b/package/boot/uboot-tegra/Makefile @@ -6,10 +6,10 @@ # include $(TOPDIR)/rules.mk -PKG_VERSION := 2019.04 +PKG_VERSION := 2020.04 PKG_RELEASE := 1 -PKG_HASH := 76b7772d156b3ddd7644c8a1736081e55b78828537ff714065d21dbade229bef +PKG_HASH := fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 PKG_MAINTAINER := Tomasz Maciej Nowak From patchwork Wed Nov 25 16:10:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1406125 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=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=1FsxgCxi; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=jZOc737w; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4Ch5Vz4GtMz9sSf for ; Thu, 26 Nov 2020 03:11:55 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; 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:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gqgW+Qm+tnj4kdltEA3qD64chnWfH/mOcfcLJzQbM3Q=; b=1FsxgCxisUZSpzaxT5xCZCTTo4 dFiTI+eNbdezHrYdoVRdWz6fZB0Q/a9IHmPkhMTfUi0C7Ka5lSDZDIipu4hku3+NEIrcq8CHVCSe6 Rkg77m8w/wjAyR5PkXfaWRQFk9gUMZAD9utiswkTj4hfs7L7VS1C91f4mkvIJ0cZpRFsz8U/95EYE hkP8gMRrPy8rcxc58HQW8FO4+PkCD1DJ4ikwTIJDc0gjyZ8K6rFDtFPAr4Avv7bhPgY5b1lSn4Lkt 9OjFa13yngP+fIHiRaplrCry9u5x+J5yyGOWQnEqmGHSUsn0jgWWskD+CaHtO35a/LLYy4JxYqzoj S8j4fi+g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxNB-00077J-CR; Wed, 25 Nov 2020 16:10:25 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxN8-000768-41 for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:10:23 +0000 Received: by mail-lf1-x144.google.com with SMTP id t6so3831442lfl.13 for ; Wed, 25 Nov 2020 08:10:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QLy4c3S5gHtauKwpAe3xcF3E4GA+YHSrnwMiVeu1Hdk=; b=jZOc737w0rdmYsreeluJ8WtESdLSRqrOPIZ23SrjwBYcc+rn+LtpvCShg+GtIY/Auf DLHoEnlWTfqKDbAkizRMMbwCOlFEPHw7b/idbSGt2h6hzj32UW0yXHfixSy9WtZFZj5B kLd7D8fErXx8AnjJPXr+VWT7NFnOArJit0LouqxDpK9KuoaVgdyjtEPalo8mj1lAPzkr q0cYiT2Sw+gyEdhUU/wp4UWojMEk2O8i6ua6hm8zguZSul50lGn6PgGvrRXzqWScUMrJ fL/uS1q9Ix0V7KOoWCNGW+hhPOaS1eACndSMkEuggTj89Z9BqpT+VTaWNkxnqd6nXQ7D PbTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QLy4c3S5gHtauKwpAe3xcF3E4GA+YHSrnwMiVeu1Hdk=; b=RNxmbZPnDozOYH0ifUymQwu+P22Bslbg4Od/XX5mJIdTmsOUZoQSHFceqxHA7mXy19 sKoxnkESppaAUoHarA8hVniykfhB2wHrLJqvEVEFaGM1Xj+PDJG6ZBVghXU8g5AAVpGE HvnZrAe6B6VfLakpqlZ/d6eRBipbjKEPjS9+vpZbMc6xgk8ACwmnygAhAGRaf8FQtrhL WfAaMbvvFO7sg4wtG4OSARs0KP1lPSfdpnYiKhYbi8xsGzGrqa5OucsVlC9fmiDcV7Hu sTjyEEtC90pbYxUoMVrTfNpHM7xPrFHPpAHPYdT3bBiBO48efShM6UkC5dCTy81bwjlh 8Haw== X-Gm-Message-State: AOAM530vuqeWD419FVGIMweOAU/7CxL1bes7VjnzLPL0nZISDHtBdG0T UEHW0X2Op5varLziGhyIIgWHVy6NPG0woQ== X-Google-Smtp-Source: ABdhPJwveEaA2TrXas2AYonUhNOcwycJXk72ROwvq75YZKWr/zGSF9qeaHo+vjKHM/7S1NrvCuBriw== X-Received: by 2002:ac2:46e1:: with SMTP id q1mr1869251lfo.212.1606320620255; Wed, 25 Nov 2020 08:10:20 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id o7sm287669ljg.41.2020.11.25.08.10.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:10:19 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/3] tegra: image: make bootscript standalone Date: Wed, 25 Nov 2020 17:10:04 +0100 Message-Id: <20201125161005.2307-2-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125161005.2307-1-tmn505@gmail.com> References: <20201125161005.2307-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_111022_607159_23EEA142 X-CRM114-Status: GOOD ( 11.15 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:144 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [tmn505[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [tmn505[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 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 Don't hard-code the PTUUID, use U-Boot commands to determine it, as some partitioning tools could rewrite PTUUID when modifying partitions. Signed-off-by: Tomasz Maciej Nowak --- target/linux/tegra/image/Makefile | 5 +---- target/linux/tegra/image/generic-bootscript | 4 +++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index aa0083f9ae47..fbff1cf6e874 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -14,10 +14,7 @@ define Build/tegra-sdcard $(if $(DEVICE_DTS),\ $(foreach dtb,$(DEVICE_DTS),$(CP) $(DTS_DIR)/$(dtb).dtb $@.boot), \ $(CP) $(DTS_DIR)/*.dtb $@.boot) - sed \ - -e 's#@ROOT@#$(IMG_PART_SIGNATURE)#g' \ - -e 's#@KERNEL@#$(KERNEL_NAME)#g' \ - $(BOOT_SCRIPT) > $@-boot.scr + sed -e 's#@KERNEL@#$(KERNEL_NAME)#g' $(BOOT_SCRIPT) > $@-boot.scr mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n '$(DEVICE_TITLE) OpenWrt bootscript' \ -d $@-boot.scr \ diff --git a/target/linux/tegra/image/generic-bootscript b/target/linux/tegra/image/generic-bootscript index 7e86afdf5fb5..0908025d5d59 100644 --- a/target/linux/tegra/image/generic-bootscript +++ b/target/linux/tegra/image/generic-bootscript @@ -1,4 +1,6 @@ -setenv bootargs "root=PARTUUID=@ROOT@-02 rw rootwait console=ttyS0,115200 console=tty0" +part uuid ${devtype} ${devnum}:2 ptuuid + +setenv bootargs "root=PARTUUID=${ptuuid} rw rootwait console=ttyS0,115200 console=tty0" load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /@KERNEL@ load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /${soc}-${board}.dtb From patchwork Wed Nov 25 16:10:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Maciej Nowak X-Patchwork-Id: 1406126 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=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=oW/E37oZ; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qLE0qKpP; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (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 4Ch5W05VTZz9sSn for ; Thu, 26 Nov 2020 03:11:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; 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:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=DnrGWqoC27+BGG9C8pc3X1VTc+4eee8MtmEgEXCdoyE=; b=oW/E37oZIw960SqoCcm5pmCF+H kHhBndzO0B+o2r5oQ7qVmfhvbOtb21J8HzQ/c7Jw8LxuAseNEaYx9+qpbF9d2Cc1pwluYHJpxjJyH XgSDd/PIkiuWQj98O6wXCuC++ld/+3WLADrZxkf1Zans3M4iplGQpR2tsYS4qG7cozATBAObpO7NF woT7kkY+iaQHIn4RGxfDCpUyOCUo4Bimv6slEDT2t1tHVbJ/Gw5a5EcaltqPSt2n5au4LLojTKvh/ z6usFB4ByOOiTP7C2OtDI7AYV/L98sQ6a9maFE2c/j5ekN0Nrrynnv/TLrZ6rTAF+Zt5g1bAjRCtP 3bEhDxDg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxNC-00077Z-Nf; Wed, 25 Nov 2020 16:10:26 +0000 Received: from mail-lf1-x142.google.com ([2a00:1450:4864:20::142]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khxN8-00076A-Fg for openwrt-devel@lists.openwrt.org; Wed, 25 Nov 2020 16:10:24 +0000 Received: by mail-lf1-x142.google.com with SMTP id v14so3904793lfo.3 for ; Wed, 25 Nov 2020 08:10:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=DCliPJxf+cH6K1npoKZEKhVh80vXFOcCckFd65EESf8=; b=qLE0qKpP2dN086IEC7Fcm0oN18aFLw3uiy751OPj3W5vLLJ68gFIpf4hPyl92T4+tA B/vpHf6V0Usnuo0FcUM0Y59dLZt1lCz8klQ8GurIaoSERD89JEc3IHgEM1Wq6NBnAyvG Vh0lkftsKWIBdyEWye25rbB1D+3MlCudJsPepgkKweOEgYeKC6THIFhev2adyGS+Nc0q I7r2dblzd9P6Wo92Cqf8UhKF0pWs/yJQmeGBB0G4gyA+LoVyG6bKmbiKCl4kkZQuameD jJzQXtGMVHFM987jXCgwNVNY/AEDFyI8h3PbE8BIsRaPmsvI7eMM/8LHT9cwvwYT7r9P dPQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DCliPJxf+cH6K1npoKZEKhVh80vXFOcCckFd65EESf8=; b=ldyc4PcuYJrllV9dn/JPDmxo1S24ir9G21aMZ4YYmAnd9rntQErM2+XxGtCx0LmVxd EwHXsEwHo7S7fgF0BTn3BkxdQJ6azUxdGF26BZMF1CPpHjhODcs7btdI9PVW+00QZX6I Q6WhTs5U5l0iKnyowDFonYgf8VQtnYEFpnZ/DaAnXFNXwRDwdgOV/V4/5JY6ksOBOqoL raT5wGt2+twedxo6y0PdRbmCvc9mFNT9b9KVEmo5boejcgWUsZPU74pSzbjXvkQ5pOBr ahy109MXvDLhCXGbKlNttYQlI/LlfIuz1k5uqTF459d/nrBTB/yUui9aSXkP6yWj6qwv BFlQ== X-Gm-Message-State: AOAM532U3g9MkxCaZT1pdy5W9wU22ePzyzVUTrZAXqDJjZ+U4QesUD3p TajNtoccvIDaCshv0TN4cp3bqYqxJkz7uQ== X-Google-Smtp-Source: ABdhPJz2fEy2NEUmA8orBumBnEIx1b6sighiiEEeK2DgjXCbHjF9xJKjTuen/HwOB/ayRsQYJg1Sww== X-Received: by 2002:a05:6512:3250:: with SMTP id c16mr1576732lfr.404.1606320621065; Wed, 25 Nov 2020 08:10:21 -0800 (PST) Received: from localhost.localdomain ([194.29.183.4]) by smtp.googlemail.com with ESMTPSA id o7sm287669ljg.41.2020.11.25.08.10.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 08:10:20 -0800 (PST) From: Tomasz Maciej Nowak To: openwrt-devel@lists.openwrt.org Subject: [PATCH 3/3] tegra: image: remove unnecessary assumptions from bootscript Date: Wed, 25 Nov 2020 17:10:05 +0100 Message-Id: <20201125161005.2307-3-tmn505@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201125161005.2307-1-tmn505@gmail.com> References: <20201125161005.2307-1-tmn505@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201125_111022_676232_C90B9DBD X-CRM114-Status: GOOD ( 12.20 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:142 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [tmn505[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [tmn505[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 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 'bootz' expects gziped kernel image anyway, so hard-code it to zImage, and remove root path from 'load' commands, by default the files are searched in root directory. This will make the bootscript static, so the command which modified it when image was created can now be removed. Signed-off-by: Tomasz Maciej Nowak --- target/linux/tegra/image/Makefile | 3 +-- target/linux/tegra/image/generic-bootscript | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index fbff1cf6e874..71a5fc581d83 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -14,10 +14,9 @@ define Build/tegra-sdcard $(if $(DEVICE_DTS),\ $(foreach dtb,$(DEVICE_DTS),$(CP) $(DTS_DIR)/$(dtb).dtb $@.boot), \ $(CP) $(DTS_DIR)/*.dtb $@.boot) - sed -e 's#@KERNEL@#$(KERNEL_NAME)#g' $(BOOT_SCRIPT) > $@-boot.scr mkimage -A arm -O linux -T script -C none -a 0 -e 0 \ -n '$(DEVICE_TITLE) OpenWrt bootscript' \ - -d $@-boot.scr \ + -d $(BOOT_SCRIPT) \ $@.boot/boot.scr SIGNATURE="$(IMG_PART_SIGNATURE)" \ diff --git a/target/linux/tegra/image/generic-bootscript b/target/linux/tegra/image/generic-bootscript index 0908025d5d59..0e7816490d9e 100644 --- a/target/linux/tegra/image/generic-bootscript +++ b/target/linux/tegra/image/generic-bootscript @@ -2,7 +2,7 @@ part uuid ${devtype} ${devnum}:2 ptuuid setenv bootargs "root=PARTUUID=${ptuuid} rw rootwait console=ttyS0,115200 console=tty0" -load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /@KERNEL@ -load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /${soc}-${board}.dtb +load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} zImage +load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} ${soc}-${board}.dtb bootz ${kernel_addr_r} - ${fdt_addr_r}