ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-03-02 20:28:53 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

mediatek: merge trx helpers in image/mt7622.mk

Browse Source 
Merge similar helpers of trx image generation, "buffalo-kernel-trx" and
"trx-nand".

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
This commit is contained in:
INAGAKI Hiroshi 2023-08-27 17:29:12 +09:00 committed by Hauke Mehrtens
parent 4d9113017b
commit d0929006f2
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
target/linux/mediatek/image/mt7622.mk
View File

@ -6,19 +6,24 @@ define Image/Prepare
echo -ne '\xde\xad\xc0\xde' > $(KDIR)/ubi_mark echo -ne '\xde\xad\xc0\xde' > $(KDIR)/ubi_mark
endef endef
define Build/buffalo-kernel-trx define Build/buffalo-trx
$(eval magic=$(word 1,$(1))) $(eval magic=$(word 1,$(1)))
$(eval dummy=$(word 2,$(1))) $(eval kern_bin=$(if $(1),$(IMAGE_KERNEL),$@))
$(eval rtfs_bin=$(word 2,$(1)))
$(eval apnd_bin=$(word 3,$(1)))
$(eval kern_size=$(if $(KERNEL_SIZE),$(KERNEL_SIZE),0x400000)) $(eval kern_size=$(if $(KERNEL_SIZE),$(KERNEL_SIZE),0x400000))
$(if $(dummy),touch $(dummy)) $(if $(rtfs_bin),touch $(rtfs_bin))
$(STAGING_DIR_HOST)/bin/otrx create $@.new \ $(STAGING_DIR_HOST)/bin/otrx create $@.new \
$(if $(magic),-M $(magic),) \ $(if $(magic),-M $(magic),) \
-f $@ \ -f $(kern_bin) \
$(if $(dummy),\ $(if $(rtfs_bin),\
-a 0x20000 \ -a 0x20000 \
-b $$(( $(subst k, * 1024,$(kern_size)) )) \ -b $$(( $(subst k, * 1024,$(kern_size)) )) \
-f $(dummy),) -f $(rtfs_bin),) \
$(if $(apnd_bin),\
-A $(apnd_bin) \
-a 0x20000)
mv $@.new $@ mv $@.new $@
endef endef
@ -51,19 +56,6 @@ define Build/mt7622-gpt
rm $@.tmp rm $@.tmp
endef endef
define Build/trx-nand
# kernel: always use 4 MiB (-28 B or TRX header) to allow upgrades even
# if it grows up between releases
# root: UBI with one extra block containing UBI mark to trigger erasing
# rest of partition
$(STAGING_DIR_HOST)/bin/otrx create $@.new \
-M 0x32504844 \
-f $(IMAGE_KERNEL) -a 0x20000 -b 0x400000 \
-f $@ \
-A $(KDIR)/ubi_mark -a 0x20000
mv $@.new $@
endef
define Device/bananapi_bpi-r64 define Device/bananapi_bpi-r64
DEVICE_VENDOR := Bananapi DEVICE_VENDOR := Bananapi
DEVICE_MODEL := BPi-R64 DEVICE_MODEL := BPi-R64
@ -120,13 +112,15 @@ define Device/buffalo_wsr-2533dhp2
IMAGES += factory.bin factory-uboot.bin IMAGES += factory.bin factory-uboot.bin
KERNEL_INITRAMFS := kernel-bin | lzma | \ KERNEL_INITRAMFS := kernel-bin | lzma | \
fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | \ fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | \
buffalo-kernel-trx buffalo-trx
IMAGE/factory.bin := append-ubi | trx-nand | \ IMAGE/factory.bin := append-ubi | \
buffalo-trx 0x32504844 $$$$@ $(KDIR)/ubi_mark | \
buffalo-enc WSR-2533DHP2 $$(BUFFALO_TAG_VERSION) -l | \ buffalo-enc WSR-2533DHP2 $$(BUFFALO_TAG_VERSION) -l | \
buffalo-tag-dhp WSR-2533DHP2 JP JP | buffalo-enc-tag -l | buffalo-dhp-image buffalo-tag-dhp WSR-2533DHP2 JP JP | buffalo-enc-tag -l | buffalo-dhp-image
IMAGE/factory-uboot.bin := append-ubi | trx-nand IMAGE/factory-uboot.bin := append-ubi | \
IMAGE/sysupgrade.bin := append-kernel | \ buffalo-trx 0x32504844 $$$$@ $(KDIR)/ubi_mark
buffalo-kernel-trx 0x32504844 $(KDIR)/tmp/$$(DEVICE_NAME).null | \ IMAGE/sysupgrade.bin := \
buffalo-trx 0x32504844 $(KDIR)/tmp/$$(DEVICE_NAME).null | \
sysupgrade-tar kernel=$$$$@ | append-metadata sysupgrade-tar kernel=$$$$@ | append-metadata
DEVICE_PACKAGES := kmod-mt7615-firmware swconfig DEVICE_PACKAGES := kmod-mt7615-firmware swconfig
endef endef