diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-11-06 10:16:39 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-11-06 10:16:39 +0000 |
| commit | a94e4655b518037da6183c74c4bea3a7da1abcdb (patch) | |
| tree | 4827e53363a160979df2ff54e8a45c987c93d8d6 /target/linux/ar71xx/image | |
| parent | 3e7eecf2887f648ddfb69b4a6756392568809f6c (diff) | |
| download | upstream-a94e4655b518037da6183c74c4bea3a7da1abcdb.tar.gz upstream-a94e4655b518037da6183c74c4bea3a7da1abcdb.tar.bz2 upstream-a94e4655b518037da6183c74c4bea3a7da1abcdb.zip | |
ar71x: image: don't use the wndr3700 utility
Pass the uImage magic value directly to mkimage instead.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38662 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/image')
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 42 |
1 files changed, 14 insertions, 28 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 20bbafba3e..7f2ca28d7a 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -87,7 +87,7 @@ endef define MkuImageLzma $(call PatchKernelLzma,$(1),$(2),$(3),$(4)) - $(call MkuImage,lzma,,$(KDIR_TMP)/vmlinux$(4)-$(1).bin.lzma,$(KDIR_TMP)/vmlinux$(4)-$(1).uImage) + $(call MkuImage,lzma,$(5),$(KDIR_TMP)/vmlinux$(4)-$(1).bin.lzma,$(KDIR_TMP)/vmlinux$(4)-$(1).uImage) endef define MkuImageLzma/initramfs @@ -677,15 +677,13 @@ define Image/Build/CyberTAN rm $(KDIR)/image.tmp endef +Image/Build/Netgear/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4),,-M $(5)) define Image/Build/Netgear/buildkernel - $(call MkuImageLzma,$(2),$(3) $(4),-d20) + $(call MkuImageLzma,$(2),$(3) $(4),-d20,,-M $(5)) -rm -rf $(KDIR_TMP)/$(2) mkdir -p $(KDIR_TMP)/$(2)/image - $(STAGING_DIR_HOST)/bin/wndr3700 \ - $(KDIR_TMP)/vmlinux-$(2).uImage \ - $(KDIR_TMP)/$(2)/image/uImage \ - $(5) + cat $(KDIR_TMP)/vmlinux-$(2).uImage > $(KDIR_TMP)/$(2)/image/uImage $(STAGING_DIR_HOST)/bin/mksquashfs-lzma \ $(KDIR_TMP)/$(2) $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp1 \ -noappend -root-owned -be -b 65536 @@ -693,15 +691,11 @@ define Image/Build/Netgear/buildkernel cat $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp1; \ dd if=/dev/zero bs=1k count=1 \ ) > $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp2 - mkimage -A mips -O linux -T filesystem -C none \ + mkimage -A mips -O linux -T filesystem -C none -M $(5) \ -a 0xbf070000 -e 0xbf070000 \ -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \ -d $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp2 \ - $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp3 - $(STAGING_DIR_HOST)/bin/wndr3700 \ - $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs.tmp3 \ - $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs \ - $(5) + $(KDIR_TMP)/vmlinux-$(2).uImage.squashfs endef define Image/Build/Netgear @@ -718,14 +712,6 @@ define Image/Build/Netgear fi endef -define Image/Build/Netgear/initramfs - $(call MkuImageLzma,$(2),$(3) $(4),,-initramfs) - $(STAGING_DIR_HOST)/bin/wndr3700 \ - $(KDIR_TMP)/vmlinux-initramfs-$(2).uImage \ - $(call imgname,$(1),$(2))-uImage.bin \ - $(5) -endef - Image/Build/NetgearNAND/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4),,-M $(5)) # $(1): (empty) @@ -933,14 +919,14 @@ $(eval $(call SingleProfile,MyLoader,64k,WPE72_16M,wpe72,,ttyS0,115200,0x1000000 # This is used with AthGzip profile for now $(eval $(call SingleProfile,AthGzip,64k,WNDAP360,wndap360,WNDAP360,ttyS0,9600,$$(wndap360_mtdlayout),1769472,6160384,KRuImage)) -$(eval $(call SingleProfile,Netgear,64kraw,WNR2000V3,wnr2000v3,WNR2000V3,ttyS0,115200,$$(wnr2000v3_mtdlayout),2003,WNR2000V3,"" NA,)) -$(eval $(call SingleProfile,Netgear,64kraw,WNR2200,wnr2200,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout),2200,WNR2200,"" NA,)) -$(eval $(call SingleProfile,Netgear,64kraw,WNR612V2,wnr612v2,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),2061,WNR612V2,"",)) -$(eval $(call SingleProfile,Netgear,64kraw,WNDR3700V1,wndr3700,WNDR3700,ttyS0,115200,$$(wndr3700_mtdlayout),3700,WNDR3700,"" NA,,7 864 320)) -$(eval $(call SingleProfile,Netgear,64kraw,WNDR3700V2,wndr3700v2,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),3701,WNDR3700v2,"",-H 29763654+16+64)) -$(eval $(call SingleProfile,Netgear,64kraw,WNDR3800,wndr3800,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),3701,WNDR3800,"",-H 29763654+16+128)) -$(eval $(call SingleProfile,Netgear,64kraw,WNDRMAC,wndrmac,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),3701,WNDRMAC,"",-H 29763654+16+64)) -$(eval $(call SingleProfile,Netgear,64kraw,WNDRMACV2,wndrmacv2,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),3701,WNDRMACv2,"",-H 29763654+16+128)) +$(eval $(call SingleProfile,Netgear,64kraw,WNR2000V3,wnr2000v3,WNR2000V3,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303033,WNR2000V3,"" NA,)) +$(eval $(call SingleProfile,Netgear,64kraw,WNR2200,wnr2200,WNR2200,ttyS0,115200,$$(wnr2200_mtdlayout),0x32323030,WNR2200,"" NA,)) +$(eval $(call SingleProfile,Netgear,64kraw,WNR612V2,wnr612v2,WNR612V2,ttyS0,115200,$$(wnr2000v3_mtdlayout),0x32303631,WNR612V2,"",)) +$(eval $(call SingleProfile,Netgear,64kraw,WNDR3700V1,wndr3700,WNDR3700,ttyS0,115200,$$(wndr3700_mtdlayout),0x33373030,WNDR3700,"" NA,,7 864 320)) +$(eval $(call SingleProfile,Netgear,64kraw,WNDR3700V2,wndr3700v2,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDR3700v2,"",-H 29763654+16+64)) +$(eval $(call SingleProfile,Netgear,64kraw,WNDR3800,wndr3800,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDR3800,"",-H 29763654+16+128)) +$(eval $(call SingleProfile,Netgear,64kraw,WNDRMAC,wndrmac,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDRMAC,"",-H 29763654+16+64)) +$(eval $(call SingleProfile,Netgear,64kraw,WNDRMACV2,wndrmacv2,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),0x33373031,WNDRMACv2,"",-H 29763654+16+128)) $(eval $(call SingleProfile,OpenMesh,squashfs-only,OM2P,om2p,,,,OM2P)) $(eval $(call SingleProfile,OpenMesh,squashfs-only,MR600,mr600,,,,MR600)) |