[openwrt/openwrt] ramips: sercomm.mk: preparation for Sercomm s1500 devices support

LEDE Commits lede-commits at lists.infradead.org
Sat Jul 1 07:06:56 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f560be583a858bc3099f2b1f0aa0ddec62cfd91c

commit f560be583a858bc3099f2b1f0aa0ddec62cfd91c
Author: Mikhail Zhilkin <csharper2005 at gmail.com>
AuthorDate: Sun Jun 11 20:48:49 2023 +0000

    ramips: sercomm.mk: preparation for Sercomm s1500 devices support
    
    This commit moves a part of the code from the "sercomm-factory-cqr" recipe
    to the separate "sercomm-mkhash" recipe. This simplifies recipes and
    allows insert additional recipes between these code blocks (required for
    the future support for Beeline SmartBox PRO router).
    
    dd automatically fills the file by 0x00 if the filesize is less than
    offset where we start writing. We drop such dd command so we need to add
    --extra-padding-size 0x190 to the sercomm-pid.py call.
    
    Signed-off-by: Mikhail Zhilkin <csharper2005 at gmail.com>
---
 target/linux/ramips/image/common-sercomm.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/target/linux/ramips/image/common-sercomm.mk b/target/linux/ramips/image/common-sercomm.mk
index fbe29d7017..b743df4408 100644
--- a/target/linux/ramips/image/common-sercomm.mk
+++ b/target/linux/ramips/image/common-sercomm.mk
@@ -22,14 +22,12 @@ define Build/sercomm-factory-cqr
 		--hw-version $(SERCOMM_HWVER) \
 		--hw-id $(SERCOMM_HWID) \
 		--sw-version $(SERCOMM_SWVER) \
-		--pid-file $@.fhdr
+		--pid-file $@.fhdr \
+		--extra-padding-size 0x190
 	printf $$(stat -c%s $(IMAGE_KERNEL)) | \
 		dd seek=$$((0x70)) of=$@.fhdr bs=1 conv=notrunc 2>/dev/null
 	printf $$(($$(stat -c%s $@)-$$(stat -c%s $(IMAGE_KERNEL))-$$((0x200)))) | \
 		dd seek=$$((0x80)) of=$@.fhdr bs=1 conv=notrunc 2>/dev/null
-	dd bs=$$((0x200)) skip=1 if=$@ conv=notrunc 2>/dev/null | \
-		$(MKHASH) md5 | awk '{print $$1}' | tr -d '\n' | \
-		dd seek=$$((0x1e0)) of=$@.fhdr bs=1 conv=notrunc 2>/dev/null
 	dd if=$@ >> $@.fhdr 2>/dev/null
 	mv $@.fhdr $@
 endef
@@ -60,6 +58,12 @@ define Build/sercomm-kernel-factory
 	mv $@.khdr $@
 endef
 
+define Build/sercomm-mkhash
+	dd bs=$$((0x400)) skip=1 if=$@ conv=notrunc 2>/dev/null | \
+		$(MKHASH) md5 | awk '{print $$1}' | tr -d '\n' | \
+		dd seek=$$((0x1e0)) of=$@ bs=1 conv=notrunc 2>/dev/null
+endef
+
 define Build/sercomm-part-tag
 	$(call Build/sercomm-part-tag-common,$(word 1,$(1)) $@)
 endef
@@ -118,7 +122,7 @@ define Device/sercomm_cxx
   IMAGE/sysupgrade.bin := append-kernel | sercomm-kernel | \
 	sysupgrade-tar kernel=$$$$@ | append-metadata
   IMAGE/factory.img := append-kernel | sercomm-kernel-factory | \
-	append-ubi | sercomm-factory-cqr
+	append-ubi | sercomm-factory-cqr | sercomm-mkhash
 endef
 
 define Device/sercomm_dxx




More information about the lede-commits mailing list