Skip to content

Commit

Permalink
apm821xx: remove unnecessary kernel padding
Browse files Browse the repository at this point in the history
The allocation of LEBs to ubi volumes is handled by the sysupgrade script:

  package/base-files/files/lib/upgrade/nand.sh

and the ubimkvol and or ubirsvol command. Therefore, padding of the
kernel blob is not needed at all, so use cat instead of dd. The
BLOCKSIZE variable was only used in the dd command.  In any case, 63k
made no sense for the way BLOCKSIZE was being used.

63k (64512) does make sense for DTB_SIZE because of the offsets expected
by u-boot given extant u-boot-env variables.

Tested on Meraki MR24.

Signed-off-by: Russell Senior <russell@personaltelco.net>
  • Loading branch information
RussellSenior authored and chunkeey committed Sep 21, 2019
1 parent 00ed75f commit a03219b
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions target/linux/apm821xx/image/Makefile
Expand Up @@ -58,7 +58,7 @@ define Build/MerakiAdd-dtb
$(call Image/BuildDTB,../dts/$(DEVICE_DTS).dts,$@.dtb)
( \
dd if=$@.dtb bs=$(DTB_SIZE) conv=sync; \
dd if=$@ bs=$(BLOCKSIZE) conv=sync; \
cat $@ ; \
) > $@.new
@mv $@.new $@
endef
Expand Down Expand Up @@ -127,7 +127,6 @@ define Device/meraki_mr24
DEVICE_PACKAGES := kmod-spi-gpio -swconfig
BOARD_NAME := mr24
DEVICE_DTS := meraki-mr24
BLOCKSIZE := 63k
IMAGES := sysupgrade.bin
DTB_SIZE := 64512
IMAGE_SIZE := 8191k
Expand Down

0 comments on commit a03219b

Please sign in to comment.