projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uboot-sunxi: fix build of HAOYU Electronics Marsboard A10
[openwrt/openwrt.git]
/
include
/
image-commands.mk
diff --git
a/include/image-commands.mk
b/include/image-commands.mk
index 2aac8fb15d2e125de10ef5179952173b01b63b00..1ec5252972c3a012c9bef782133fedb41af78b58 100644
(file)
--- a/
include/image-commands.mk
+++ b/
include/image-commands.mk
@@
-102,8
+102,7
@@
define Build/tplink-safeloader
endef
define Build/append-dtb
endef
define Build/append-dtb
- $(call Image/BuildDTB,$(if $(DEVICE_DTS_DIR),$(DEVICE_DTS_DIR),$(DTS_DIR))/$(DEVICE_DTS).dts,$@.dtb)
- cat $@.dtb >> $@
+ cat $(KDIR)/image-$(firstword $(DEVICE_DTS)).dtb >> $@
endef
define Build/install-dtb
endef
define Build/install-dtb
@@
-114,6
+113,11
@@
define Build/install-dtb
)
endef
)
endef
+define Build/install-zImage
+ $(CP) $(KDIR)/zImage \
+ $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE_SANITIZED)-zImage
+endef
+
define Build/fit
$(TOPDIR)/scripts/mkits.sh \
-D $(DEVICE_NAME) -o $@.its -k $@ \
define Build/fit
$(TOPDIR)/scripts/mkits.sh \
-D $(DEVICE_NAME) -o $@.its -k $@ \
@@
-244,14
+248,20
@@
endef
define Build/tplink-v2-header
$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
define Build/tplink-v2-header
$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
- -c -V "ver. 2.0" -B $(TPLINK_BOARD_ID) $(1) -k $@ -o $@.new
+ -c -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -L $(KERNEL_LOADADDR) \
+ -E $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
+ -w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \
+ -T $(TPLINK_HVERSION) -V "ver. 2.0" \
+ -k $@ -o $@.new $(1)
@mv $@.new $@
endef
define Build/tplink-v2-image
$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
@mv $@.new $@
endef
define Build/tplink-v2-image
$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
- -a 0x4 -j -V "ver. 2.0" -B $(TPLINK_BOARD_ID) $(1) \
- -k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new
+ -H $(TPLINK_HWID) -W $(TPLINK_HWREV) \
+ -w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \
+ -T $(TPLINK_HVERSION) -V "ver. 2.0" -a 0x4 -j \
+ -k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new $(1)
cat $@.new >> $@
rm -rf $@.new
endef
cat $@.new >> $@
rm -rf $@.new
endef