KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ramips: cleanup mt7620 Netgear image code

Browse source 
1. Reuse functions defined in `image-commands.mk`
2. Rename fakeroot image

Signed-off-by: Joseph C. Lehner <joseph.c.lehner@gmail.com>
This commit is contained in:
Joseph C. Lehner 2017-01-23 14:41:15 +01:00 committed by Mathias Kresin
parent aeba0fe466
commit f93a121533
3 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
target/linux/ramips/image/Makefile
View file

@ -22,7 +22,7 @@ define Image/Build/Initramfs
$(call Image/Build/Profile/$(PROFILE),initramfs) $(call Image/Build/Profile/$(PROFILE),initramfs)
endef endef
DEVICE_VARS += DTS IMAGE_SIZE DEVICE_VARS += DTS IMAGE_SIZE NETGEAR_BOARD_ID NETGEAR_HW_ID
loadaddr-y := 0x80000000 loadaddr-y := 0x80000000
loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000 loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000

24
target/linux/ramips/image/mt7620.mk
View file

@ -7,18 +7,6 @@ define Build/tplink-header
-o $@.new -k $@ -r $(IMAGE_ROOTFS) && mv $@.new $@ -o $@.new -k $@ -r $(IMAGE_ROOTFS) && mv $@.new $@
endef endef
define Build/pad-kernel-ex2700
cp $@ $@.tmp && dd if=/dev/zero bs=64 count=1 >> $@.tmp \
&& dd if=$@.tmp of=$@.new bs=64k conv=sync && truncate -s -64 $@.new \
&& cat ex2700-fakeroot.uImage >> $@.new && rm $@.tmp && mv $@.new $@
endef
define Build/netgear-header
$(STAGING_DIR_HOST)/bin/mkdniimg \
$(1) -v OpenWrt -i $@ \
-o $@.new && mv $@.new $@
endef
define Build/elecom-header define Build/elecom-header
cp $@ $(KDIR)/v_0.0.0.bin cp $@ $(KDIR)/v_0.0.0.bin
( \ ( \
@ -64,24 +52,28 @@ endef
TARGET_DEVICES += ArcherMR200 TARGET_DEVICES += ArcherMR200
define Device/ex2700 define Device/ex2700
NETGEAR_HW_ID := 29764623+4+0+32+2x2+0
NETGEAR_BOARD_ID := EX2700
DTS := EX2700 DTS := EX2700
BLOCKSIZE := 4k BLOCKSIZE := 4k
IMAGE_SIZE := $(ralink_default_fw_size_4M) IMAGE_SIZE := $(ralink_default_fw_size_4M)
IMAGES += factory.bin IMAGES += factory.bin
KERNEL := $(KERNEL_DTB) | uImage lzma | pad-kernel-ex2700 KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-file netgear-fake-uImage-hdr.bin
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
netgear-header -B EX2700 -H 29764623+4+0+32+2x2+0 netgear-dni
DEVICE_TITLE := Netgear EX2700 DEVICE_TITLE := Netgear EX2700
endef endef
TARGET_DEVICES += ex2700 TARGET_DEVICES += ex2700
define Device/wn3000rpv3 define Device/wn3000rpv3
NETGEAR_HW_ID := 29764836+8+0+32+2x2+0
NETGEAR_BOARD_ID := WN3000RPv3
DTS := WN3000RPV3 DTS := WN3000RPV3
BLOCKSIZE := 4k BLOCKSIZE := 4k
IMAGES += factory.bin IMAGES += factory.bin
KERNEL := $(KERNEL_DTB) | uImage lzma | pad-kernel-ex2700 KERNEL := $(KERNEL_DTB) | uImage lzma | pad-offset 64k 64 | append-file netgear-fake-uImage-hdr.bin
IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \ IMAGE/factory.bin := $$(sysupgrade_bin) | check-size $$$$(IMAGE_SIZE) | \
netgear-header -B WN3000RPv3 -H 29764836+8+0+32+2x2+0 netgear-dni
DEVICE_TITLE := Netgear WN3000RPv3 DEVICE_TITLE := Netgear WN3000RPv3
endef endef
TARGET_DEVICES += wn3000rpv3 TARGET_DEVICES += wn3000rpv3

0
target/linux/ramips/image/ex2700-fakeroot.uImage → target/linux/ramips/image/netgear-fake-uImage-hdr.bin
View file