From patchwork Sun Feb 14 09:16:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Fertser X-Patchwork-Id: 1440266 X-Patchwork-Delegate: freifunk@adrianschmutzler.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.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; 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=wIGL2jMG; 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=MmiIGMDc; 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 4DdhW90l2cz9s1l for ; Sun, 14 Feb 2021 20:19:01 +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:Cc: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:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RQhK9utGKp1pcY9PDtvqIRqe1aRxCbdHxmmlAVmW3i4=; b=wIGL2jMGdj+AHHoS/aHL+U+bQ 90C2kXU7K+wrxcSvRvIVMz89fxOeVxYWOgUX8678EsGXwNlAxewAwZw64bKsMOQFp5CcARil/6A2X 0XL0Km4MAYjmEl5TgvqHOOer+BYHizhReu+RVdQ0o7paDy17mHcfBMAsfb2EFjisxYPc3cIAivoMb Ai3OgFtFBmfNq51Wne7D2Wy6bwkrDPHeWrgVGbKF8I2EbhCrpmRUYLJHFTvDzCn0XzXGO1/CVyCka cHdCpjURZZEnv64yBMWsZN/mOal3yhHqcc1q9m9QLTV78uj4aaA7Fza8IutpbrmDn8ZrNg9jl5ify tuEaUiXBQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lBDWV-0007lG-IQ; Sun, 14 Feb 2021 09:16:59 +0000 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lBDWS-0007kw-NR for openwrt-devel@lists.openwrt.org; Sun, 14 Feb 2021 09:16:58 +0000 Received: by mail-lj1-x229.google.com with SMTP id k22so3571552ljg.3 for ; Sun, 14 Feb 2021 01:16:55 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=GL2MKyycu8I5DooMGdm41pYUAd4oGlt5ag6WxUMXk1w=; b=MmiIGMDcR+GZAFY0DRPL/vFDTMEArU4vI+/A9QPfnlw8s88u0Nis/5YCV0opNNCfhq CmLXoSxDNZUigKS5dDHkIFEdlI2DtxJcNReTgcDIwJAIwHo4S7FRLEF7ZNbK4sXCmz+b H+XTIVO6Eo86XRpxu82fJY95uCERdGr+/3gszoOQUk8bTZEgi+UUcuUmU28Ku6TMFtjn N27WQiIExM9ZRkANRetEgb9+XYqgSOLBNaNDPSlB/h1L2Vba7I+dM3/UhEDYif5AP+SH RvYXxj0e/qyC/KiV3QplZxtWqfTL3GagyBb1s/sH5CbGSWCr+Tt2hvdoSt1q1Gdrawy5 GjQQ== 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:mime-version:content-transfer-encoding; bh=GL2MKyycu8I5DooMGdm41pYUAd4oGlt5ag6WxUMXk1w=; b=td0C/DgVbdP1+3dUKeEWnmN7LKtHPoo1tW40nUlwy5fMLrwuxNtZ22RS6886C5gYKk zbwke7SJAH/mJMytY5iWbJLBXZZ3zzC6ylGR03UAacNUdtm1j75SkqhFATz4rzGeiJ81 1bJ4Syz8H+uXfOy6ircwMoEBDMoo0nC9/siiUVRV/9YajPlrnrkV40+awiqfe1MpotMB n86jhn3s9Dwbitv4WS1tM+EC2lkOB+FbeAobOIZpZAMVdk17S6Lf1pba79opBf27SfbC jlmYF07SkgyDSXHLNtoW+ajtgq3iAm7xwepiRtkLzRdPK9OcYrf4DpsVLUqPI8O12VqK Zl+g== X-Gm-Message-State: AOAM530LKp7SC01YE3ybxyn3ZwDb6STDzfEzUqnMyQF6pTh6VRNkLK8j KZBPzlw2DcWDtr/QfRSF4RSs4KMV2Ls= X-Google-Smtp-Source: ABdhPJzheyJIIvhTPLl2ayKj+t7BwX7RN0+kzYt9s3xWd7+J+lFi2YNN7RdEntASyi3kusYv+0Lh/w== X-Received: by 2002:a05:651c:512:: with SMTP id o18mr6500223ljp.388.1613294214212; Sun, 14 Feb 2021 01:16:54 -0800 (PST) Received: from home.paul.comp (paulfertser.info. [2001:470:26:54b:226:9eff:fe70:80c2]) by smtp.gmail.com with ESMTPSA id m13sm2343338lfr.226.2021.02.14.01.16.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Feb 2021 01:16:53 -0800 (PST) Received: from home.paul.comp (home.paul.comp [IPv6:0:0:0:0:0:0:0:1]) by home.paul.comp (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 11E9Gorf017454; Sun, 14 Feb 2021 12:16:51 +0300 Received: (from paul@localhost) by home.paul.comp (8.15.2/8.15.2/Submit) id 11E9GoOO017453; Sun, 14 Feb 2021 12:16:50 +0300 From: Paul Fertser To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2] ath79/nand: fix factory image generation for Netgear and Zyxel boards Date: Sun, 14 Feb 2021 12:16:33 +0300 Message-Id: <20210214091633.17414-1-fercerpav@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <012901d700c9$0ca6e650$25f4b2f0$@adrianschmutzler.de> References: <012901d700c9$0ca6e650$25f4b2f0$@adrianschmutzler.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210214_041656_793445_92702831 X-CRM114-Status: GOOD ( 11.33 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [fercerpav[at]gmail.com] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:229 listed in] [list.dnswl.org] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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: , Cc: Paul Fertser , Adrian Schmutzler , Marcin Juszkiewicz Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The factory images need to embed specific IDs to pass verification with the OEM firmware (including TFTP recovery), so they need to be per-device variables. Fixes: ab1584a797 ("ath79: netgear: trim down uImage customisations") Reported-by: Marcin Juszkiewicz Signed-off-by: Paul Fertser --- v2: move device variables common to generic and NAND targets to Makefile (Adrian Schmutzler) target/linux/ath79/image/Makefile | 2 ++ target/linux/ath79/image/common-netgear.mk | 2 -- target/linux/ath79/image/nand.mk | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/target/linux/ath79/image/Makefile b/target/linux/ath79/image/Makefile index 4a51cf1fbf..6583ae46d4 100644 --- a/target/linux/ath79/image/Makefile +++ b/target/linux/ath79/image/Makefile @@ -4,6 +4,8 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR = 0x80060000 DEVICE_VARS += LOADER_FLASH_OFFS LOADER_TYPE +DEVICE_VARS += RAS_ROOTFS_SIZE RAS_BOARD RAS_VERSION +DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID define Build/combined-image sh $(TOPDIR)/scripts/combined-image.sh \ diff --git a/target/linux/ath79/image/common-netgear.mk b/target/linux/ath79/image/common-netgear.mk index d4f43bbaca..8a74fdc0c9 100644 --- a/target/linux/ath79/image/common-netgear.mk +++ b/target/linux/ath79/image/common-netgear.mk @@ -1,5 +1,3 @@ -DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID - define Build/netgear-rootfs mkimage \ -A mips -O linux -T filesystem -C none \ diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk index 37fcb36937..abf269a8ce 100644 --- a/target/linux/ath79/image/nand.mk +++ b/target/linux/ath79/image/nand.mk @@ -1,5 +1,3 @@ -DEVICE_VARS += RAS_ROOTFS_SIZE RAS_BOARD RAS_VERSION - # attention: only zlib compression is allowed for the boot fs define Build/zyxel-buildkerneljffs rm -rf $(KDIR_TMP)/zyxelnbg6716