KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: clean up SEAMA image build code

Browse source 
Split seama-factory and seama-sysupgrade into smaller pieces (similar to
the ramips code) to make the image generation more flexible.

Also use standard pad-offset instead of adding a block of zeros at the
beginning of the image that is later cut off again. Standard pad-rootfs can
be used as the seal header doesn't contain an image size or checksum.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2016-10-11 20:32:24 +02:00
parent b81fc29123
commit fce0b5d893
No known key found for this signature in database
GPG key ID: 16EF3F64CB201D9C
1 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
target/linux/ar71xx/image/generic.mk
View file

@ -472,51 +472,35 @@ endef
TARGET_DEVICES += hiwifi-hc6361 TARGET_DEVICES += hiwifi-hc6361
# The pre-filled 64 bytes consist of define Build/seama
# - 28 bytes seama_header $(STAGING_DIR_HOST)/bin/seama -i $@ $(if $(1),$(1),-m "dev=/dev/mtdblock/1" -m "type=firmware")
# - 36 bytes of META data (4-bytes aligned)
define Build/seama-factory
( dd if=/dev/zero bs=64 count=1; cat $(IMAGE_KERNEL) ) >$@.loader.tmp
( dd if=$@.loader.tmp bs=64k conv=sync; dd if=$(IMAGE_ROOTFS) ) >$@.tmp.0
tail -c +65 $@.tmp.0 >$@.tmp.1
$(STAGING_DIR_HOST)/bin/seama \
-i $@.tmp.1 \
-m "dev=/dev/mtdblock/1" -m "type=firmware"
$(STAGING_DIR_HOST)/bin/seama \
-s $@ \
-m "signature=$(1)" \
-i $@.tmp.1.seama
rm -f $@.loader.tmp $@.tmp.*
endef
define Build/seama-sysupgrade
$(STAGING_DIR_HOST)/bin/seama \
-i $(IMAGE_KERNEL) \
-m "dev=/dev/mtdblock/1" -m "type=firmware"
( dd if=$(IMAGE_KERNEL).seama bs=64k conv=sync; dd if=$(IMAGE_ROOTFS) ) >$@
rm -f $(IMAGE_KERNEL).seama
endef
define Build/seama-initramfs
$(STAGING_DIR_HOST)/bin/seama \
-i $@ \
-m "dev=/dev/mtdblock/1" -m "type=firmware"
mv $@.seama $@ mv $@.seama $@
endef endef
define Build/seama-pad-rootfs define Build/seama-seal
$(STAGING_DIR_HOST)/bin/padjffs2 $(IMAGE_ROOTFS) -c 64 >>$@ $(call Build/seama,-s $@.seama $(1))
endef endef
define Device/seama define Device/seama
CONSOLE := ttyS0,115200 CONSOLE := ttyS0,115200
LOADER_TYPE := bin LOADER_TYPE := bin
BLOCKSIZE := 64k
KERNEL := kernel-bin | lzma | loader-kernel-cmdline | lzma KERNEL := kernel-bin | lzma | loader-kernel-cmdline | lzma
KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | seama-initramfs KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | seama
KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX).seama KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX).seama
IMAGES := sysupgrade.bin factory.bin IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := seama-sysupgrade $$$$(SEAMA_SIGNATURE) | seama-pad-rootfs | check-size $$$$(IMAGE_SIZE)
IMAGE/factory.bin := seama-factory $$$$(SEAMA_SIGNATURE) | seama-pad-rootfs | check-size $$$$(IMAGE_SIZE) # 64 bytes offset:
# - 28 bytes seama_header
# - 36 bytes of META data (4-bytes aligned)
IMAGE/default := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-rootfs
IMAGE/sysupgrade.bin := \
$$(IMAGE/default) | seama | pad-rootfs | \
check-size $$$$(IMAGE_SIZE)
IMAGE/factory.bin := \
$$(IMAGE/default) | seama | pad-rootfs | \
seama-seal -m "signature=$$$$(SEAMA_SIGNATURE)" | \
check-size $$$$(IMAGE_SIZE)
SEAMA_SIGNATURE := SEAMA_SIGNATURE :=
DEVICE_VARS += SEAMA_SIGNATURE DEVICE_VARS += SEAMA_SIGNATURE
endef endef