projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mvebu: fix OpenBlocks AX3 image
[openwrt/openwrt.git]
/
include
/
image-commands.mk
diff --git
a/include/image-commands.mk
b/include/image-commands.mk
index 3b9ea3ccba887fe7cc32ed657ec2543c25feec7f..7ff4c217a345e10a2a399e56fa45bc4ff3644209 100644
(file)
--- a/
include/image-commands.mk
+++ b/
include/image-commands.mk
@@
-117,7
+117,7
@@
define Build/append-ubi
$(foreach part,$(UBINIZE_PARTS),--part $(part)) \
$(IMAGE_ROOTFS) \
$@.tmp \
$(foreach part,$(UBINIZE_PARTS),--part $(part)) \
$(IMAGE_ROOTFS) \
$@.tmp \
- -p $(BLOCKSIZE) -m $(PAGESIZE) \
+ -p $(BLOCKSIZE
:%k=%KiB
) -m $(PAGESIZE) \
$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
$(if $(VID_HDR_OFFSET),-O $(VID_HDR_OFFSET)) \
$(UBINIZE_OPTS)
$(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \
$(if $(VID_HDR_OFFSET),-O $(VID_HDR_OFFSET)) \
$(UBINIZE_OPTS)
@@
-130,8
+130,13
@@
define Build/pad-to
mv $@.new $@
endef
mv $@.new $@
endef
+define Build/pad-extra
+ dd if=/dev/zero bs=$(1) count=1 >> $@
+endef
+
define Build/pad-rootfs
define Build/pad-rootfs
- $(STAGING_DIR_HOST)/bin/padjffs2 $@ $(1) 4 8 16 64 128 256
+ $(STAGING_DIR_HOST)/bin/padjffs2 $@ $(1) \
+ $(if $(BLOCKSIZE),$(BLOCKSIZE:%k=%),4 8 16 64 128 256)
endef
define Build/pad-offset
endef
define Build/pad-offset