hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ar71xx: Ignore firmware building errors of UBNT and CyberTAN devices

Browse Source 
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
master
Chuanhong Guo 8 years ago committed by John Crispin
parent 9275964e1d
commit c5a7e2c2fb
2 changed files with 14 additions and 13 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      target/linux/ar71xx/image/legacy.mk
  2. 13
      target/linux/ar71xx/image/ubnt.mk

14
target/linux/ar71xx/image/legacy.mk
Unescape View File

@ -659,18 +659,18 @@ endef
define Image/Build/CyberTAN define Image/Build/CyberTAN
echo -n '' > $(KDIR_TMP)/empty.bin echo -n '' > $(KDIR_TMP)/empty.bin
$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp \ -$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp \
-f $(KDIR_TMP)/vmlinux-$(2).uImage -F $(KDIR_TMP)/empty.bin \ -f $(KDIR_TMP)/vmlinux-$(2).uImage -F $(KDIR_TMP)/empty.bin \
-x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1) -x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1) && \
-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) \ $(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) \
-i $(KDIR)/image.tmp \ -i $(KDIR)/image.tmp \
-o $(call sysupname,$(1),$(2)) -o $(call sysupname,$(1),$(2))
$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR_TMP)/vmlinux-$(2).uImage \ -$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR_TMP)/vmlinux-$(2).uImage \
-x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1) -x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1) && \
-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) -g \ $(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) -g \
-i $(KDIR)/image.tmp \ -i $(KDIR)/image.tmp \
-o $(call factoryname,$(1),$(2)) -o $(call factoryname,$(1),$(2))
rm $(KDIR)/image.tmp -rm $(KDIR)/image.tmp
endef endef
Image/Build/CyberTANGZIP/loader=$(call Image/BuildLoader,$(1),gz,$(2),0x80060000) Image/Build/CyberTANGZIP/loader=$(call Image/BuildLoader,$(1),gz,$(2),0x80060000)

13
target/linux/ar71xx/image/ubnt.mk
Unescape View File

@ -5,7 +5,7 @@
# mkubntimage is using the kernel image direct # mkubntimage is using the kernel image direct
# routerboard creates partitions out of the ubnt header # routerboard creates partitions out of the ubnt header
define Build/mkubntimage define Build/mkubntimage
$(STAGING_DIR_HOST)/bin/mkfwimage \ -$(STAGING_DIR_HOST)/bin/mkfwimage \
-B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \
-k $(IMAGE_KERNEL) \ -k $(IMAGE_KERNEL) \
-r $@ \ -r $@ \
@ -15,18 +15,19 @@ endef
# all UBNT XM device expect the kernel image to have 1024k while flash, when # all UBNT XM device expect the kernel image to have 1024k while flash, when
# booting the image, the size doesn't matter. # booting the image, the size doesn't matter.
define Build/mkubntimage-split define Build/mkubntimage-split
dd if=$@ of=$@.old1 bs=1024k count=1 -[ -f $@ ] && ( \
dd if=$@ of=$@.old2 bs=1024k skip=1 dd if=$@ of=$@.old1 bs=1024k count=1; \
dd if=$@ of=$@.old2 bs=1024k skip=1; \
$(STAGING_DIR_HOST)/bin/mkfwimage \ $(STAGING_DIR_HOST)/bin/mkfwimage \
-B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \
-k $@.old1 \ -k $@.old1 \
-r $@.old2 \ -r $@.old2 \
-o $@ -o $@; \
rm $@.old1 $@.old2 rm $@.old1 $@.old2 )
endef endef
define Build/mkubntimage2 define Build/mkubntimage2
$(STAGING_DIR_HOST)/bin/mkfwimage2 -f 0x9f000000 \ -$(STAGING_DIR_HOST)/bin/mkfwimage2 -f 0x9f000000 \
-v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \
-p jffs2:0x50000:0xf60000:0:0:$@ \ -p jffs2:0x50000:0xf60000:0:0:$@ \
-o $@.new -o $@.new

Write Preview
Loading…
Cancel
Save