X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2FMakefile;h=ebb1257468dfa4b7ec7ab8af5c965132f5c9f807;hp=bbfb5387ffcc6a1003f18b2546a9bc825baa0703;hb=1d3de89f3c93ac82006c933679dd3d4aba775c32;hpb=058998acdb05b859b1a85246fae668132a851756 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index bbfb5387ff..ebb1257468 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -11,6 +11,10 @@ define imgname $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1))) endef +define rootfs_align +$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs-%,0x4,$(1)))) +endef + define sysupname $(call imgname,$(1),$(2))-sysupgrade.bin endef @@ -25,14 +29,14 @@ VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage fs_squash:=squashfs-only fs_all:=all -fs_4k:=4k fs_64k:=64k +fs_64kraw:=64kraw fs_128k:=128k ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) fs_squash:=initramfs fs_all:=initramfs - fs_4k:=initramfs fs_64k:=initramfs + fs_64kraw:=initramfs fs_128k:=initramfs VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs @@ -298,6 +302,24 @@ define Image/Build/Planex fi endef +define Image/Build/ALFA + $(call MkuImageLzma,$(2),$(3) $($(4))) + $(call Sysupgrade/RK,$(1),$(2),$(5),$(6)) + if [ -e "$(call sysupname,$(1),$(2))" ]; then \ + rm -rf $(KDIR)/$(1); \ + mkdir -p $(KDIR)/$(1); \ + cd $(KDIR)/$(1); \ + cp $(KDIR)/vmlinux-$(2).uImage $(KDIR)/$(1)/vmlinux.gz.uImage; \ + cp $(KDIR)/root.$(1) $(KDIR)/$(1)/pb9x-2.6.31-jffs2; \ + $(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) \ + vmlinux.gz.uImage pb9x-2.6.31-jffs2; \ + ( \ + echo $(7) | dd bs=32 count=1 conv=sync; \ + echo -ne '\xfe'; \ + ) >> $(call factoryname,$(1),$(2)); \ + fi +endef + define Image/Build/TPLINKOLD $(call Image/BuildLoaderAlone,$(2),gz,$(3),0x22000,0) $(call MkuImageOKLI,$(2)) @@ -308,12 +330,12 @@ define Image/Build/TPLINKOLD -$(STAGING_DIR_HOST)/bin/mktplinkfw \ -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\ -k $(KDIR)/kernel-$(2).bin \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ + -r $(KDIR)/root.$(1) \ -o $(call factoryname,$(1),$(2)) -$(STAGING_DIR_HOST)/bin/mktplinkfw \ -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\ -k $(KDIR)/kernel-$(2).bin \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ + -r $(KDIR)/root.$(1) \ -o $(call sysupname,$(1),$(2)) endef @@ -335,12 +357,14 @@ define Image/Build/TPLINK -$(STAGING_DIR_HOST)/bin/mktplinkfw \ -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\ -k $(KDIR)/kernel-$(2).bin \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \ + -r $(KDIR)/root.$(1) \ + -a $(call rootfs_align,$(1)) -j \ -o $(call factoryname,$(1),$(2)) -$(STAGING_DIR_HOST)/bin/mktplinkfw \ -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\ -k $(KDIR)/kernel-$(2).bin \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \ + -r $(KDIR)/root.$(1) \ + -a $(call rootfs_align,$(1)) -j \ -o $(call sysupname,$(1),$(2)) endef @@ -357,12 +381,14 @@ define Image/Build/TPLINK-LZMA -$(STAGING_DIR_HOST)/bin/mktplinkfw \ -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\ -k $(KDIR)/vmlinux-$(2).bin.lzma \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \ + -r $(KDIR)/root.$(1) \ + -a $(call rootfs_align,$(1)) -j \ -o $(call factoryname,$(1),$(2)) -$(STAGING_DIR_HOST)/bin/mktplinkfw \ -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s \ -k $(KDIR)/vmlinux-$(2).bin.lzma \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \ + -r $(KDIR)/root.$(1) \ + -a $(call rootfs_align,$(1)) -j \ -o $(call sysupname,$(1),$(2)) endef @@ -532,10 +558,6 @@ define Image/Build/Template/squashfs-only/squashfs $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) endef -define Image/Build/Template/4k/squashfs - $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) -endef - define Image/Build/Template/64k/squashfs $(call Image/Build/$(1),squashfs-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) endef @@ -544,6 +566,14 @@ define Image/Build/Template/64k/jffs2-64k $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) endef +define Image/Build/Template/64kraw/squashfs + $(call Image/Build/$(1),squashfs-raw,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) +endef + +define Image/Build/Template/64kraw/jffs2-64k + $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) +endef + define Image/Build/Template/128k/squashfs $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) endef @@ -552,13 +582,18 @@ define Image/Build/Template/128k/jffs2-128k $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) endef +alfa_nx_cmdline=board=ALFA-NX console=ttyS0,115200 +alfa_nx_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware) +define Image/Build/Profile/ALFANX + $(call Image/Build/Template/$(fs_64k)/$(1),ALFA,alfa-nx,$(alfa_nx_cmdline),alfa_nx_mtdlayout,1638400,6291456,WRM7222C) +endef ap121_mtdlayout_2M=mtdparts=spi0.0:64k(u-boot)ro,1216k(rootfs),704k(kernel),64k(art)ro,1920k@0x10000(firmware) ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x50000(firmware) ap121_cmdline=board=AP121 console=ttyATH0,115200 define Image/Build/Profile/AP121 - $(call Image/Build/Template/$(fs_4k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),ap121_mtdlayout_2M,720896,1245184,RK) + $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),ap121_mtdlayout_2M,720896,1245184,RK) $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-4M,$(ap121_cmdline),ap121_mtdlayout_4M,917504,2818048,RK) endef @@ -620,6 +655,12 @@ define Image/Build/Profile/EAP7660D $(call Image/Build/Template/$(fs_128k)/$(1),PB4X,eap7660d,$(eap7660d_cmdline)) endef +hornetub_cmdline=board=HORNET-UB console=ttyATH0,115200 +hornetub_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware) +define Image/Build/Profile/HORNETUB + $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,hornet-ub,$(hornetub_cmdline),hornetub_mtdlayout,1638400,6291456,RK) +endef + ja76pf_cmdline=board=JA76PF console=ttyS0,115200 define Image/Build/Profile/JA76PF $(call Image/Build/Template/$(fs_64k)/$(1),PB4X,ja76pf,$(ja76pf_cmdline)) @@ -728,43 +769,44 @@ endef tlmr3220_cmdline=board=TL-MR3220 console=ttyS0,115200 define Image/Build/Profile/TLMR3220 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3220-v1,$(tlmr3220_cmdline),0x32200001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-mr3220-v1,$(tlmr3220_cmdline),0x32200001,1,4M) endef tlmr3420_cmdline=board=TL-MR3420 console=ttyS0,115200 define Image/Build/Profile/TLMR3420 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),0x34200001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),0x34200001,1,4M) endef tlwa901_cmdline=board=TL-WA901ND console=ttyS0,115200 tlwa901v2_cmdline=board=TL-WA901ND-v2 console=ttyS0,115200 define Image/Build/Profile/TLWA901 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wa901nd-v1,$(tlwa901_cmdline),0x09010001,1,4M) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wa901nd-v2,$(tlwa901v2_cmdline),0x09010002,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wa901nd-v1,$(tlwa901_cmdline),0x09010001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wa901nd-v2,$(tlwa901v2_cmdline),0x09010002,1,4M) endef tlwr703_cmdline=board=TL-WR703N console=ttyATH0,115200 define Image/Build/Profile/TLWR703 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr703n-v1,$(tlwr703_cmdline),0x07030101,1,4Mlzma) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-wr703n-v1,$(tlwr703_cmdline),0x07030101,1,4Mlzma) endef tlwr740_cmdline=board=TL-WR741ND console=ttyS0,115200 tlwr740v4_cmdline=board=TL-WR741ND-v4 console=ttyATH0,115200 define Image/Build/Profile/TLWR740 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v1,$(tlwr740_cmdline),0x07400001,1,4M) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v3,$(tlwr740_cmdline),0x07400003,1,4M) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr740n-v4,$(tlwr740v4_cmdline),0x07400004,1,4Mlzma) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr740n-v1,$(tlwr740_cmdline),0x07400001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr740n-v3,$(tlwr740_cmdline),0x07400003,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-wr740n-v4,$(tlwr740v4_cmdline),0x07400004,1,4Mlzma) endef tlwr741_cmdline=board=TL-WR741ND console=ttyS0,115200 tlwr741v4_cmdline=board=TL-WR741ND-v4 console=ttyATH0,115200 define Image/Build/Profile/TLWR741 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr741nd-v1,$(tlwr741_cmdline),0x07410001,1,4M) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr741nd-v4,$(tlwr741v4_cmdline),0x07410004,1,4Mlzma) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr741nd-v1,$(tlwr741_cmdline),0x07410001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr741nd-v2,$(tlwr741_cmdline),0x07410001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-wr741nd-v4,$(tlwr741v4_cmdline),0x07410004,1,4Mlzma) endef define Image/Build/Profile/TLWR743 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr743nd-v1,$(tlwr741_cmdline),0x07430001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr743nd-v1,$(tlwr741_cmdline),0x07430001,1,4M) endef tlwr841v15_cmdline=board=TL-WR841N-v1.5 console=ttyS0,115200 @@ -772,22 +814,22 @@ tlwr841v3_cmdline=board=TL-WR941ND console=ttyS0,115200 tlwr841v5_cmdline=board=TL-WR741ND console=ttyS0,115200 define Image/Build/Profile/TLWR841 $(call Image/Build/Template/$(fs_squash)/$(1),TPLINKOLD,tl-wr841n-v1.5,$(tlwr841v15_cmdline),0x08410002,2,4M) - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841nd-v3,$(tlwr841v3_cmdline),0x08410003,3,4M) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v5,$(tlwr841v5_cmdline),0x08410005,1,4M) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841v5_cmdline),0x08410007,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v3,$(tlwr841v3_cmdline),0x08410003,3,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v5,$(tlwr841v5_cmdline),0x08410005,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841v5_cmdline),0x08410007,1,4M) endef tlwr941v2_cmdline=board=TL-WR941ND console=ttyS0,115200 tlwr941v4_cmdline=board=TL-WR741ND console=ttyS0,115200 define Image/Build/Profile/TLWR941 - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v2,$(tlwr941v2_cmdline),0x09410002,2,4M) - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v3,$(tlwr941v2_cmdline),0x09410002,2,4M) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr941nd-v4,$(tlwr941v4_cmdline),0x09410004,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr941nd-v2,$(tlwr941v2_cmdline),0x09410002,2,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr941nd-v3,$(tlwr941v2_cmdline),0x09410002,2,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr941nd-v4,$(tlwr941v4_cmdline),0x09410004,1,4M) endef tlwr1043_cmdline=board=TL-WR1043ND console=ttyS0,115200 define Image/Build/Profile/TLWR1043 - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043_cmdline),0x10430001,1,8M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043_cmdline),0x10430001,1,8M) endef wndr3700_cmdline=board=WNDR3700 console=ttyS0,115200 @@ -837,6 +879,11 @@ define Image/Build/Profile/WZRHPG300NH $(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-g300nh,$(wzrhpg300nh_cmdline),WZR-HP-G300NH) endef +wzrhpg300nh2_cmdline=board=WZR-HP-G300NH2 console=ttyS0,115200 +define Image/Build/Profile/WZRHPG300NH2 + $(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-g300nh2,$(wzrhpg300nh2_cmdline),WZR-HP-G300NH2) +endef + wzrhpag300h_cmdline=board=WZR-HP-AG300H console=ttyS0,115200 define Image/Build/Profile/WZRHPAG300H $(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-ag300h,$(wzrhpag300h_cmdline),WZR-HP-AG300H) @@ -863,6 +910,7 @@ define Image/Build/Profile/ALL0258N endef define Image/Build/Profile/Default + $(call Image/Build/Profile/ALFANX,$(1)) $(call Image/Build/Profile/ALL0258N,$(1)) $(call Image/Build/Profile/AP121,$(1)) $(call Image/Build/Profile/AP121MINI,$(1)) @@ -875,6 +923,7 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/DIR825B1,$(1)) $(call Image/Build/Profile/EAP7660D,$(1)) $(call Image/Build/Profile/FR54RTR,$(1)) + $(call Image/Build/Profile/HORNETUB,$(1)) $(call Image/Build/Profile/JA76PF,$(1)) $(call Image/Build/Profile/JWAP003,$(1)) $(call Image/Build/Profile/MZKW04NU,$(1)) @@ -906,6 +955,7 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/WHRHPG300N,$(1)) $(call Image/Build/Profile/WHRHPGN,$(1)) $(call Image/Build/Profile/WZRHPG300NH,$(1)) + $(call Image/Build/Profile/WZRHPG300NH2,$(1)) $(call Image/Build/Profile/WZRHPAG300H,$(1)) $(call Image/Build/Profile/WZRHPG450H,$(1)) $(call Image/Build/Profile/ZCN1523H28,$(1)) @@ -925,11 +975,9 @@ define Image/Build/Profile/Madwifi endef define Image/Build/squashfs - cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-4k - $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-4k 4 - cp $(KDIR)/root.squashfs-4k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-4k + cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-raw cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-64k - $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-64k 4 8 64 + $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-64k 64 cp $(KDIR)/root.squashfs-64k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-64k $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) endef