projects
/
openwrt
/
staging
/
dedeckeh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
image: add support for k unit suffix to pad-offset
[openwrt/staging/dedeckeh.git]
/
include
/
image-commands.mk
diff --git
a/include/image-commands.mk
b/include/image-commands.mk
index 160b5d883395d3ef53f4c61426ea27a5dbd3a063..3b9ea3ccba887fe7cc32ed657ec2543c25feec7f 100644
(file)
--- a/
include/image-commands.mk
+++ b/
include/image-commands.mk
@@
-7,7
+7,7
@@
define Build/uImage
mkimage -A $(LINUX_KARCH) \
-O linux -T kernel \
-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
mkimage -A $(LINUX_KARCH) \
-O linux -T kernel \
-C $(1) -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
- -n '$(
call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION
)' -d $@ $@.new
+ -n '$(
if $(UIMAGE_NAME),$(UIMAGE_NAME),$(call toupper,$(LINUX_KARCH)) LEDE Linux-$(LINUX_VERSION)
)' -d $@ $@.new
@mv $@.new $@
endef
@mv $@.new $@
endef
@@
-114,6
+114,7
@@
define Build/append-ubi
sh $(TOPDIR)/scripts/ubinize-image.sh \
$(if $(UBOOTENV_IN_UBI),--uboot-env) \
$(if $(KERNEL_IN_UBI),--kernel $(IMAGE_KERNEL)) \
sh $(TOPDIR)/scripts/ubinize-image.sh \
$(if $(UBOOTENV_IN_UBI),--uboot-env) \
$(if $(KERNEL_IN_UBI),--kernel $(IMAGE_KERNEL)) \
+ $(foreach part,$(UBINIZE_PARTS),--part $(part)) \
$(IMAGE_ROOTFS) \
$@.tmp \
-p $(BLOCKSIZE) -m $(PAGESIZE) \
$(IMAGE_ROOTFS) \
$@.tmp \
-p $(BLOCKSIZE) -m $(PAGESIZE) \
@@
-136,8
+137,8
@@
endef
define Build/pad-offset
let \
size="$$(stat -c%s $@)" \
define Build/pad-offset
let \
size="$$(stat -c%s $@)" \
- pad="$(
word 1, $(1
))" \
- offset="$(
word 2, $(1
))" \
+ pad="$(
subst k,* 1024,$(word 1, $(1)
))" \
+ offset="$(
subst k,* 1024,$(word 2, $(1)
))" \
pad="(pad - ((size + offset) % pad)) % pad" \
newsize='size + pad'; \
dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync
pad="(pad - ((size + offset) % pad)) % pad" \
newsize='size + pad'; \
dd if=$@ of=$@.new bs=$$newsize count=1 conv=sync