mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

ar71xx: image: use a common macro for UBNTXM/UBNTDEV

Browse Source 
The firmware generation part is the same for both
macros. Move that into a separate macro and use the
new macro for Image/Build/UB{NTXM,DEV}.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 38146
This commit is contained in:
Gabor Juhos 2013-09-24 05:58:31 +00:00
parent 99d13b09b9
commit 4fc427e211
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/ar71xx/image/Makefile
View File

@ -487,9 +487,7 @@ define Image/Build/UAPPRO
endef
Image/Build/UBNTXM/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubntxm_mtdlayout))
define Image/Build/UBNTXM
define Image/Build/UBNT2
$(call Sysupgrade/KRuImage,$(1),$(2),65536,6684672)
dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/vmlinux-$(2).uImage.bin bs=64k conv=sync
-$(STAGING_DIR_HOST)/bin/mkfwimage \
@ -499,18 +497,11 @@ define Image/Build/UBNTXM
-o $(call factoryname,$(1),$(2))
endef
Image/Build/UBNTXM/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubntxm_mtdlayout))
Image/Build/UBNTXM=$(call Image/Build/UBNT2,$(1),$(2),$(ubntxm_mtdlayout),$(4),$(5),$(6),$(7))
Image/Build/UBDEV/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubdev_mtdlayout))
define Image/Build/UBDEV
$(call Sysupgrade/KRuImage,$(1),$(2),65536,6684672)
dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/vmlinux-$(2).uImage.bin bs=64k conv=sync
-$(STAGING_DIR_HOST)/bin/mkfwimage \
-B $(4) -v $(5).$(6).v6.0.0-OpenWrt-$(REVISION) \
-k $(KDIR_TMP)/vmlinux-$(2).uImage.bin \
-r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-o $(call factoryname,$(1),$(2))
endef
Image/Build/UBDEV=$(call Image/Build/UBNT2,$(1),$(2),$(ubdev_mtdlayout),$(4),$(5),$(6),$(7))
Image/Build/UBNT/buildkernel=$(call PatchKernelLzma,$(2),$(3))