X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/eea7fc66c5ce2a361d2682c07f9169ba52d20d91..1e2c27694dab78068aaad3a980d835ca3884c8df:/target/linux/ar71xx/image/Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index b4e433e9c..816f27e63 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk
 IMGNAME:=$(BIN_DIR)/openwrt-$(BOARD)
 
 define imgname
-$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(1))
+$(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
 endef
 
 VMLINUX:=$(IMGNAME)-vmlinux
@@ -36,7 +36,7 @@ define Image/BuildKernel
 		-d $(KDIR)/vmlinux.bin.lzma $(IMGNAME)-uImage-lzma.bin
 endef
 
-define Image/Build/Linksys8M
+define Image/Build/WRT400N
 	cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
 	$(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
 	$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.lzma
@@ -54,6 +54,7 @@ define Image/Build/Linksys8M
 			dd if=$(KDIR)/root.$(1) bs=6336k conv=sync; \
 			echo -n $(4); \
 		) > $(call imgname,$(1),$(2)).bin; \
+		wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call imgname,$(1),$(2)).webui; \
 	fi; fi
 endef
 
@@ -155,7 +156,27 @@ define Image/Build/TPLINK
 		-B $(4) -N OpenWrt -V $(REVISION)\
 		-k $(KDIR)/vmlinux-$(2).bin.gzip \
 		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
-		-o $(BIN_DIR)/openwrt-$(BOARD)-$(2)-$(1).uni
+		-o $(call imgname,$(1),$(2)).uni
+endef
+
+define Image/Build/CyberTAN
+	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.gzip
+	mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
+		0x80060000 \
+		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+		-d $(KDIR)/vmlinux-$(2).bin.gzip $(KDIR)/vmlinux-$(2).uImage
+	( \
+		dd if=$(KDIR)/vmlinux-$(2).uImage bs=64k conv=sync; \
+		dd if=/dev/zero bs=1 count=65476; \
+		dd if=$(KDIR)/root.$(1) bs=64k; \
+	) > $(KDIR)/vmlinux-$(2).image
+	$(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/vmlinux-$(2).trx \
+		-f $(KDIR)/vmlinux-$(2).image
+	-$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) -g \
+		-i $(KDIR)/vmlinux-$(2).trx \
+		-o $(call imgname,$(1),$(2)).bin
 endef
 
 define Image/Build/Template/Compex
@@ -166,16 +187,28 @@ define Image/Build/Template/Compex/squashfs
 	$(call Image/Build/Template/Compex,squashfs,$(1))
 endef
 
-define Image/Build/Template/Linksys8M
-	$(call Image/Build/Linksys8M,$(1),$(2),$(3),$(4))
+define Image/Build/Template/WRT400N
+	$(call Image/Build/WRT400N,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/WRT400N/squashfs
+	$(call Image/Build/Template/WRT400N,squashfs,$(1),$(2),$(3))
 endef
 
-define Image/Build/Template/Linksys8M/squashfs
-	$(call Image/Build/Template/Linksys8M,squashfs,$(1),$(2),$(3))
+define Image/Build/Template/WRT400N/jffs2-64k
+	$(call Image/Build/Template/WRT400N,jffs2-64k,$(1),$(2),$(3))
 endef
 
-define Image/Build/Template/Linksys8M/jffs2-64k
-	$(call Image/Build/Template/Linksys8M,jffs2-64k,$(1),$(2),$(3))
+define Image/Build/Template/CyberTAN
+	$(call Image/Build/CyberTAN,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/CyberTAN/squashfs
+	$(call Image/Build/Template/CyberTAN,squashfs,$(1),$(2),$(3))
+endef
+
+define Image/Build/Template/CyberTAN/jffs2-64k
+	$(call Image/Build/Template/CyberTAN,jffs2-64k,$(1),$(2),$(3))
 endef
 
 define Image/Build/Template/AP81
@@ -206,6 +239,14 @@ define Image/Build/Template/TPLINK/squashfs
 	$(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3))
 endef
 
+define Image/Build/Template/TPLINK4K
+	$(call Image/Build/TPLINK,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/TPLINK4K/squashfs
+	$(call Image/Build/Template/TPLINK,squashfs-4k,$(1),$(2),$(3))
+endef
+
 define Image/Build/Template/UBNT
 	$(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5),$(6))
 endef
@@ -281,7 +322,7 @@ define Image/Build/Profile/MZKW300NH
 endef
 
 define Image/Build/Profile/TLWR741NDV1
-	$(call Image/Build/Template/TPLINK/$(1),tl-wr741ndv1,board=TL-WR741ND,TL-WR741NDv1)
+	$(call Image/Build/Template/TPLINK4K/$(1),tl-wr741ndv1,board=TL-WR741ND,TL-WR741NDv1)
 endef
 
 define Image/Build/Profile/TLWR841NDV3
@@ -293,7 +334,11 @@ define Image/Build/Profile/TLWR941NDV2
 endef
 
 define Image/Build/Profile/WRT400N
-	$(call Image/Build/Template/Linksys8M/$(1),wrt400n,board=WRT400N)
+	$(call Image/Build/Template/WRT400N/$(1),wrt400n,board=WRT400N)
+endef
+
+define Image/Build/Profile/WRT160NL
+	$(call Image/Build/Template/CyberTAN/$(1),wrt160nl,board=WRT160NL,1.00.01)
 endef
 
 define Image/Build/Profile/Default
@@ -310,6 +355,7 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/UBNT,$(1))
 	$(call Image/Build/Profile/WP543,$(1))
 	$(call Image/Build/Profile/WRT400N,$(1))
+	$(call Image/Build/Profile/WRT160NL,$(1))
 endef
 
 define Image/Build/Profile/Madwifi
@@ -318,6 +364,8 @@ define Image/Build/Profile/Madwifi
 endef
 
 define Image/Build/squashfs
+	dd if=$(KDIR)/root.squashfs of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync
+	$(call add_jffs2_mark,$(IMGNAME)-root.squashfs-4k)
 	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef