X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bf7689f4a57840cb39ef0b47063d5c0523eb1e2b..afd995e1f52110b8765f25a4aa9b2efb7e535dff:/target/linux/ar71xx/image/Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 164ac573d..e1b36c209 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -78,6 +78,31 @@ define Image/Build/AP81
 	fi; fi
 endef
 
+define Image/Build/AP83
+	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
+	gzip -9 -c $(KDIR)/vmlinux-$(2) > $(KDIR)/vmlinux-$(2).bin.gz
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.gz"` -gt 1310720 ]; then \
+		echo "Warning: $(KDIR)/vmlinux-$(2).bin.gz is too big"; \
+	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 6619136 ]; then \
+		echo "Warning: $(KDIR)/root.$(1) is too big"; \
+	else \
+		mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
+			0x80060000 \
+			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+			-d $(KDIR)/vmlinux-$(2).bin.gz \
+			$(KDIR)/vmlinux-$(2).uImage; \
+		dd if=$(KDIR)/vmlinux-$(2).uImage \
+			of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
+		dd if=$(KDIR)/root.$(1) \
+			of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
+		( \
+			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1280k conv=sync; \
+			dd if=$(KDIR)/root.$(1); \
+		) > $(call imgname,$(1),$(2)-firmware).bin; \
+	fi; fi
+endef
+
 define Image/Build/MyLoader
 	-$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) \
 		-p0x30000:0xc0000:ahl:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma  \
@@ -91,10 +116,10 @@ define Image/Build/UBNT
 	$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).lzma
 	dd if=$(KDIR)/vmlinux-$(2).lzma of=$(KDIR)/vmlinux-$(2).bin.lzma bs=64k conv=sync
 	-$(STAGING_DIR_HOST)/bin/mkfwimage \
-		-B $(4) -v $(5).ar7100.OpenWrt.$(REVISION) \
+		-B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
 		-k $(KDIR)/vmlinux-$(2).bin.lzma \
 		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
-		-o $(BIN_DIR)/openwrt-$(BOARD)-$(2)-$(1).bin
+		-o $(call imgname,$(1),$(2)).bin
 endef
 
 define Image/Build/Planex
@@ -114,7 +139,9 @@ define Image/Build/Planex
 			dd if=$(KDIR)/vmlinux-$(2).uImage bs=1408k conv=sync; \
 			dd if=$(KDIR)/root.$(1) bs=6208k conv=sync; \
 		) > $(call imgname,$(1),$(2)).bin; \
-		$(STAGING_DIR_HOST)/bin/mkplanexfw -v 2.00.00 \
+		$(STAGING_DIR_HOST)/bin/mkplanexfw \
+			-B $(2) \
+			-v 2.00.00 \
 			-i $(call imgname,$(1),$(2)).bin \
 			-o $(call imgname,$(1),$(2)).webui; \
 	fi; fi
@@ -147,6 +174,10 @@ define Image/Build/Template/Linksys8M/squashfs
 	$(call Image/Build/Template/Linksys8M,squashfs,$(1),$(2),$(3))
 endef
 
+define Image/Build/Template/Linksys8M/jffs2-64k
+	$(call Image/Build/Template/Linksys8M,jffs2-64k,$(1),$(2),$(3))
+endef
+
 define Image/Build/Template/AP81
 	$(call Image/Build/AP81,$(1),$(2),$(3),$(4))
 endef
@@ -155,6 +186,18 @@ define Image/Build/Template/AP81/squashfs
 	$(call Image/Build/Template/AP81,squashfs,$(1),$(2),$(3))
 endef
 
+define Image/Build/Template/AP83
+	$(call Image/Build/AP83,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/AP83/squashfs
+	$(call Image/Build/Template/AP83,squashfs,$(1),$(2))
+endef
+
+define Image/Build/Template/AP83/jffs2-64k
+	$(call Image/Build/Template/AP83,jffs2-64k,$(1),$(2))
+endef
+
 define Image/Build/Template/TPLINK
 	$(call Image/Build/TPLINK,$(1),$(2),$(3),$(4))
 endef
@@ -164,11 +207,15 @@ define Image/Build/Template/TPLINK/squashfs
 endef
 
 define Image/Build/Template/UBNT
-	$(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5))
+	$(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
 
 define Image/Build/Template/UBNT/squashfs
-	$(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3),$(4))
+	$(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3),$(4),$(5))
+endef
+
+define Image/Build/Template/UBNT/jffs2-64k
+	$(call Image/Build/Template/UBNT,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
 endef
 
 define Image/Build/Template/Planex
@@ -179,6 +226,14 @@ define Image/Build/Template/Planex/squashfs
 	$(call Image/Build/Template/Planex,squashfs,$(1),$(2))
 endef
 
+define Image/Build/Template/Planex/jffs2-64k
+	$(call Image/Build/Template/Planex,jffs2-64k,$(1),$(2))
+endef
+
+define Image/Build/Profile/AP83
+	$(call Image/Build/Template/AP83/$(1),ap83,board=AP83)
+endef
+
 define Image/Build/Profile/WP543
 	$(call Image/Build/Template/Compex/$(1),wp543)
 endef
@@ -200,17 +255,31 @@ define Image/Build/Profile/A02RBW300N
 endef
 
 define Image/Build/Profile/UBNTRS
-	$(call Image/Build/Template/UBNT/$(1),ubnt-rs,board=UBNT-RS,RS,RSx)
+	$(call Image/Build/Template/UBNT/$(1),ubnt-rs,board=UBNT-RS,RS,RSx,ar7100)
+endef
+
+define Image/Build/Profile/UBNTRSPRO
+	$(call Image/Build/Template/UBNT/$(1),ubnt-rspro,board=UBNT-RSPRO,RSPRO,RSPRO,ar7100pro)
 endef
 
 define Image/Build/Profile/UBNTLSSR71
-	$(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71)
+	$(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71,ar7100)
+endef
+
+define Image/Build/Profile/UBNT
+	$(call Image/Build/Profile/UBNTRS,$(1))
+	$(call Image/Build/Profile/UBNTRSPRO,$(1))
+	$(call Image/Build/Profile/UBNTLSSR71,$(1))
 endef
 
 define Image/Build/Profile/MZKW04NU
 	$(call Image/Build/Template/Planex/$(1),mzk-w04nu,board=MZK-W04NU)
 endef
 
+define Image/Build/Profile/MZKW300NH
+	$(call Image/Build/Template/Planex/$(1),mzk-w300nh,board=MZK-W300NH)
+endef
+
 define Image/Build/Profile/TLWR841NDV3
 	$(call Image/Build/Template/TPLINK/$(1),tl-wr841ndv3,board=TL-WR941ND,TL-WR841NDv3)
 endef
@@ -224,21 +293,22 @@ define Image/Build/Profile/WRT400N
 endef
 
 define Image/Build/Profile/Default
+	$(call Image/Build/Profile/AP83,$(1))
 	$(call Image/Build/Profile/A02RBW300N,$(1))
 	$(call Image/Build/Profile/DIR615C1,$(1))
 	$(call Image/Build/Profile/MZKW04NU,$(1))
+	$(call Image/Build/Profile/MZKW300NH,$(1))
 	$(call Image/Build/Profile/TEW632BRP,$(1))
 	$(call Image/Build/Profile/TEW652BRP,$(1))
 	$(call Image/Build/Profile/TLWR841NDV3,$(1))
 	$(call Image/Build/Profile/TLWR941NDV2,$(1))
-	$(call Image/Build/Profile/UBNTRS,$(1))
-	$(call Image/Build/Profile/UBNTLSSR71,$(1))
+	$(call Image/Build/Profile/UBNT,$(1))
 	$(call Image/Build/Profile/WP543,$(1))
 	$(call Image/Build/Profile/WRT400N,$(1))
 endef
 
 define Image/Build/Profile/Madwifi
-	$(call Image/Build/Profile/UBNTRS,$(1))
+	$(call Image/Build/Profile/UBNT,$(1))
 	$(call Image/Build/Profile/WP543,$(1))
 endef