From patchwork Wed Sep 2 06:22:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuanhong Guo X-Patchwork-Id: 1355539 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=FLnkT8TT; 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=CtzyNobn; 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 4BhDSs35pvz9sV8 for ; Wed, 2 Sep 2020 16:25:17 +1000 (AEST) 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=wthI2HmcODrav2NLnx3hh2+pV8kk5g7DMy8WKFYQZCo=; b=FLnkT8TTMhzzhCUJKj0yqxdbo E+P0WE9uEep5mxvePPifN1qHNkj4WvRAi5/PLaZQjeNdG1FEM2j5XNe2PQeOMALy7aitRvjbGv3Jq 5bucH+wNHL0NzPQk8pJE0mk/ZhLxZta8d0VJvc6Hmy0HN7SySDhFEZeEhQ7m95XBE2WJ60ZgY+E6Z 8uo0m95/s7/Y5JNZZ/EO8zDd4KVF9i8jFC4GBuValDHbped0bTqW9MBHGg2DYC8T3kK5kRncWphFt pZFgbDugn7dK7m47hXOcew9leuNwjX2itah5frecZH3faYazK2o5YXQ83zXo+HgLcoPaD1KE01Iaz s4F4Nrg5w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDMAy-0008Rv-Ku; Wed, 02 Sep 2020 06:23:20 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDMAw-0008Qm-8O for openwrt-devel@lists.openwrt.org; Wed, 02 Sep 2020 06:23:19 +0000 Received: by mail-pf1-x441.google.com with SMTP id d22so2265750pfn.5 for ; Tue, 01 Sep 2020 23:23:16 -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 :mime-version:content-transfer-encoding; bh=c9a4QTqOlQCldtYDgQk1/UMC0zzqyhVOo6lkIu5bIjA=; b=CtzyNobng3bgLmkAFYRlNbmxrX1kkJloIrGQ1S9O23flIVO/oMD7qiRNAhKLDwWYQT Q4rp4E8dyjfnNgTCkM8MwHzgvgSNfnih+/MgsrltDH6naX1OFxvnfLye5+KHGUpYxz8h no+CZ5IgNGkRzoW5OfikACHqeXXa1l4L9ruTn/T0UM07qAJUDURcuD/5VTAZpWaqypYS 66ZRCYxTShkhVPJxy5tKTs+BfFFBPp+KEsyktT18S7EL6idNBtVignG7huFniu28gtny 5EMWrZqOWcvtdOKci7gxGRbJMS1ffk1KJf9FKBBgfc9s/819AWJcwf1CtJA5wS6dlGhe tqng== 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=c9a4QTqOlQCldtYDgQk1/UMC0zzqyhVOo6lkIu5bIjA=; b=dLQLDjMiGHglSzX1fWEeodMJ02kdTbmP7d26RtWojEGRPJmAlLFWc9Yq4ZIyXTTmOC s6hLIxR99VyYM8Vk8cVZ74br0dnKIwlkYNW4bv3JzCDEWEHbzUd/fYB1rUf+9wGdcdo0 bbP5mL0xyH4Mc7RzeE8anlI208nj7AAS8dj8cxiq5GUmTI/Hyz/stIM6FuflkkS3Vvl1 p4tDVF9u5Pe4Cxwlelkggfa89mxZERM0Lv2Uy6pzgMe4fVR+nAs9Dokh8ozUQq8aEYVd 94KgUrD5twB2DQzJ2m6/Q/C6xLVKMP5qvtI26txofBNoRnVA9Wru3bqER/5VJIU/rGlg Id9w== X-Gm-Message-State: AOAM5311FD+SrZf1wr3+cKbMA6/89smLAg2mcqYARk/idrKr5t6cj4X9 /F2uV+hqfIv+jHDoZPHA2WHEBOKCJvVKSw== X-Google-Smtp-Source: ABdhPJxXllDP8XkKqhUNDsxTybyHdAqMY+H5rfq1Ipu/iVD271pgr85zXWbzdeHrO7LeRAaxOrZoTw== X-Received: by 2002:a62:38ce:: with SMTP id f197mr1801251pfa.145.1599027794963; Tue, 01 Sep 2020 23:23:14 -0700 (PDT) Received: from guoguo-omen.lan ([240e:379:969:6c74:93bb:530c:823:a456]) by smtp.gmail.com with ESMTPSA id u62sm4150929pfb.4.2020.09.01.23.23.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 23:23:14 -0700 (PDT) From: Chuanhong Guo To: openwrt-devel@lists.openwrt.org Subject: [PATCH 3/3] ramips: image: example usage of OKLI loader Date: Wed, 2 Sep 2020 14:22:31 +0800 Message-Id: <20200902062231.2238353-4-gch981213@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200902062231.2238353-1-gch981213@gmail.com> References: <20200902062231.2238353-1-gch981213@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200902_022318_404616_04C263EF X-CRM114-Status: GOOD ( 12.03 ) 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 [2607:f8b0:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [gch981213[at]gmail.com] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [gch981213[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -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 -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 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: Chuanhong Guo Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This is an example of using OKLI loader and will not be part of final commits. First uImage header covers loader + kernel so that the original firmware mtdsplit can be used. --- target/linux/ramips/image/Makefile | 10 ++++++++++ target/linux/ramips/image/mt7620.mk | 1 + target/linux/ramips/image/mt7621.mk | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index 10e9edd3bb..b985882897 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -224,6 +224,16 @@ define Device/uimage-lzma-loader KERNEL := kernel-bin | append-dtb | lzma | loader-kernel | uImage none endef +define Device/uimage-okli-loader + LOADER_TYPE := bin + LOADER_FLASH_OFFS := 0x51000 + COMPILE := loader-$(1).bin + COMPILE/loader-$(1).bin := loader-okli-compile + KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49 + KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | uImage lzma + IMAGE/sysupgrade.bin := append-loader-okli $(1) | pad-to 16k | lzma | pad-to 4032 | append-kernel | uImage lzma | append-rootfs | pad-rootfs | append-metadata | check-size +endef + include $(SUBTARGET).mk $(eval $(call BuildImage)) diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index 0cfaa95cf0..fa8c303903 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -599,6 +599,7 @@ endef TARGET_DEVICES += lb-link_bl-w1200 define Device/lenovo_newifi-y1 + $(Device/uimage-okli-loader) SOC := mt7620a IMAGE_SIZE := 16064k DEVICE_VENDOR := Lenovo diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index d2d41be269..a15d7e25af 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -614,7 +614,7 @@ TARGET_DEVICES += jcg_jhr-ac876m define Device/lenovo_newifi-d1 $(Device/dsa-migration) - $(Device/uimage-lzma-loader) + $(Device/uimage-okli-loader) IMAGE_SIZE := 32448k DEVICE_VENDOR := Newifi DEVICE_MODEL := D1