X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fimage%2FMakefile;h=ae95b686555b42dae74137f5a53e20395e049caf;hb=b56bef28d79c2cb3ffdc86d9b84b5aa16c649547;hp=a6db8136ae0370c7f8112a09849ece4d14c23ccd;hpb=379b50936271595a902b9972cbcaaba379151537;p=openwrt%2Fopenwrt.git diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index a6db8136ae..ae95b68655 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -29,10 +29,16 @@ define kernel_entry -a 0x88000000 -e 0x88000000 endef else +ifeq ($(CONFIG_SOC_MT7621),y) +define kernel_entry +-a 0x80001000 -e 0x80001000 +endef +else define kernel_entry -a 0x80000000 -e 0x80000000 endef endif +endif define MkCombineduImage $(call PatchKernelLzma,$(2),$(3)) @@ -102,8 +108,8 @@ endef # $(2) = lowercase board name # $(3) = dts file ralink_default_fw_size_4M=3866624 -BuildFirmware/Default4M/squashfs=$(call BuildFirmware/OF,$(1),$(2),$(3),$(ralink_default_fw_size_4M)) -BuildFirmware/Default4M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3)) +BuildFirmware/Default4M/squashfs=$(call BuildFirmware/OF,$(1),$(2),$(3),$(ralink_default_fw_size_4M),$(4)) +BuildFirmware/Default4M/initramfs=$(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4)) # Build images for default ralink layout for 8MB flash # kernel + roots = 0x7b0000 @@ -368,7 +374,7 @@ define BuildFirmware/DCS930/squashfs else \ dd if=$(KDIR)/image.$(2) of=$(KDIR)/dcs.tmp bs=64K count=5 conv=sync ;\ cat $(KDIR)/image.$(2) >> $(KDIR)/dcs.tmp ; \ - dd if=$(KDIR)/dcs.tmp of=$(call imgname,$(1),$(2))-factory.bin bs=4M count=1 conv=sync ;\ + dd if=$(KDIR)/dcs.tmp of=$(call imgname,$(1),$(2))-factory.bin bs=4096k count=1 conv=sync ;\ $(STAGING_DIR_HOST)/bin/mkdcs932 $(call imgname,$(1),$(2))-factory.bin ; \ fi endef @@ -396,6 +402,13 @@ Image/Build/Profile/FREESTATION5=$(call BuildFirmware/Default8M/$(1),$(1),freest Image/Build/Profile/IP2202=$(call BuildFirmware/Default8M/$(1),$(1),ip2202,IP2202) +BuildFirmware/HLKRM04/squashfs=$(call BuildFirmware/Default4M/squashfs,$(1),$(2),$(3),$(4)) +define BuildFirmware/HLKRM04/initramfs + $(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4)) + #mkhilinkfw -e -i$(call imgname,$(1),$(2))-uImage.bin -o $(call imgname,$(1),$(2))-factory.bin; +endef +Image/Build/Profile/HLKRM04=$(call BuildFirmware/HLKRM04/$(1),$(1),hlk-rm04,HLKRM04,HLK-RM02) + Image/Build/Profile/M3=$(call BuildFirmware/Poray4M/$(1),$(1),m3,M3) Image/Build/Profile/M4=$(call BuildFirmware/PorayDualSize/$(1),$(1),m4,M4) @@ -544,6 +557,7 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/FONERA20N,$(1)) $(call Image/Build/Profile/FREESTATION5,$(1)) # $(call Image/Build/Profile/HG255D,$(1)) + $(call Image/Build/Profile/HLKRM04,$(1)) $(call Image/Build/Profile/HW550-3G,$(1)) $(call Image/Build/Profile/IP2202,$(1)) $(call Image/Build/Profile/M3,$(1)) @@ -585,6 +599,33 @@ endif # # RT3662/RT3883 Profiles # + +# $(1) = squashfs/initramfs +# $(2) = lowercase board name +# $(3) = dts file +# $(4) = kernel size +# $(5) = rootfs size +# $(6) = signature +# $(7) = model +# $(8) = flash address +# $(9) = start address +define BuildFirmware/EdimaxCombined/squashfs + $(call PatchKernelLzmaDtb,$(2),$(3)) + $(call MkImage,lzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).bin.uImage) + if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.uImage"` -gt `expr $(4) - 20` ]; then \ + echo "Warning: $(KDIR)/vmlinux-$(2).bin.uImage is too big" >&2; \ + exit 1; \ + else if [ `stat -c%s "$(KDIR)/root.$(1)"` -gt $(5) ]; then \ + echo "Warning: $(KDIR)/root.$(1) is too big" >&2; \ + exit 1; \ + else \ + ( dd if=$(KDIR)/vmlinux-$(2).bin.uImage bs=`expr $(4) - 20` conv=sync ; dd if=$(KDIR)/root.$(1) ) > $(KDIR)/vmlinux-$(2).bin.uImage.combined ; \ + fi ; fi + mkedimaximg -i "$(KDIR)/vmlinux-$(2).bin.uImage.combined" \ + -o $(call imgname,$(1),$(2)).bin \ + -s $(6) -m $(7) -f $(8) -S $(9) +endef + Image/Build/Profile/DIR645=$(call BuildFirmware/Seama/$(1),$(1),dir-645,DIR-645,wrgn39_dlob.hans_dir645,$(ralink_default_fw_size_8M)) omniembhpm_mtd_size=16449536 @@ -596,11 +637,16 @@ Image/Build/Profile/TEW691GR=$(call BuildFirmware/UMedia/$(1),$(1),tew-691gr,TEW Image/Build/Profile/TEW692GR=$(call BuildFirmware/UMedia/$(1),$(1),tew-692gr,TEW-692GR,0x026920) +kernel_size_BR6475ND:=2097152 +rootfs_size_BR6475ND:=5832704 +Image/Build/Profile/BR6475ND=$(call BuildFirmware/EdimaxCombined/$(1),$(1),br-6475nd,BR-6475ND,$(kernel_size_BR6475ND),$(rootfs_size_BR6475ND),CSYS,RN54,0x70000,0x01100000) + ifeq ($(SUBTARGET),rt3883) define Image/Build/Profile/Default $(call Image/Build/Profile/DIR645,$(1)) $(call Image/Build/Profile/OMNIEMBHPM,$(1)) $(call Image/Build/Profile/RTN56U,$(1)) + $(call Image/Build/Profile/BR6475ND,$(1)) $(call Image/Build/Profile/TEW691GR,$(1)) $(call Image/Build/Profile/TEW692GR,$(1)) endef @@ -613,22 +659,55 @@ endif Image/Build/Profile/MT7620a=$(call BuildFirmware/Default8M/$(1),$(1),mt7620a,MT7620a) Image/Build/Profile/MT7620a_MT7610e=$(call BuildFirmware/Default8M/$(1),$(1),mt7620a_mt7610e,MT7620a_MT7610e) Image/Build/Profile/MT7620a_MT7530=$(call BuildFirmware/Default8M/$(1),$(1),mt7620a_mt7530,MT7620a_MT7530) +Image/Build/Profile/MT7620a_V22SG=$(call BuildFirmware/Default8M/$(1),$(1),mt7620a_v22sg,MT7620a_V22SG) Image/Build/Profile/RP-N53=$(call BuildFirmware/Default8M/$(1),$(1),rp_n53,RP-N53) whr_300hp2_mtd_size=7012352 -Image/Build/Profile/WHR-300HP2=$(call BuildFirmware/CustomFlash/$(1),$(1),whr-300hp2,WHR-300HP2,$(whr_300hp2_mtd_size)) -Image/Build/Profile/WHR-600D=$(call BuildFirmware/CustomFlash/$(1),$(1),whr-600d,WHR-600D,$(whr_300hp2_mtd_size)) +Image/Build/Profile/WHR300HP2=$(call BuildFirmware/CustomFlash/$(1),$(1),whr-300hp2,WHR-300HP2,$(whr_300hp2_mtd_size)) +Image/Build/Profile/WHR600D=$(call BuildFirmware/CustomFlash/$(1),$(1),whr-600d,WHR-600D,$(whr_300hp2_mtd_size)) dlink810l_mtd_size=6881280 Image/Build/Profile/DIR-810L=$(call BuildFirmware/CustomFlash/$(1),$(1),dir-810l,DIR-810L,$(dlink810l_mtd_size)) +na930_mtd_size=20971520 +Image/Build/Profile/NA930=$(call BuildFirmware/CustomFlash/$(1),$(1),na930,NA930,$(na930_mtd_size)) ifeq ($(SUBTARGET),mt7620a) define Image/Build/Profile/Default $(call Image/Build/Profile/MT7620a,$(1)) $(call Image/Build/Profile/MT7620a_MT7610e,$(1)) $(call Image/Build/Profile/MT7620a_MT7530,$(1)) + $(call Image/Build/Profile/MT7620a_V22SG,$(1)) $(call Image/Build/Profile/RP-N53,$(1)) $(call Image/Build/Profile/DIR-810L,$(1)) - $(call Image/Build/Profile/WHR-300HP2,$(1)) - $(call Image/Build/Profile/WHR-600D,$(1)) + $(call Image/Build/Profile/WHR300HP2,$(1)) + $(call Image/Build/Profile/WHR600D,$(1)) + $(call Image/Build/Profile/NA930,$(1)) +endef +endif + + +# +# MT7620N Profiles +# + +Image/Build/Profile/WMR300=$(call BuildFirmware/Default8M/$(1),$(1),wmr-300,WMR300) +Image/Build/Profile/RT-N14U=$(call BuildFirmware/Default8M/$(1),$(1),rt-n14u,RT-N14U) + +ifeq ($(SUBTARGET),mt7620n) +define Image/Build/Profile/Default + $(call Image/Build/Profile/WMR300,$(1)) + $(call Image/Build/Profile/RT-N14U,$(1)) +endef +endif + + +# +# MT7621 Profiles +# + +Image/Build/Profile/MT7621=$(call BuildFirmware/Default4M/$(1),$(1),mt7621,MT7621) + +ifeq ($(SUBTARGET),mt7621) +define Image/Build/Profile/Default + $(call Image/Build/Profile/MT7621,$(1)) endef endif