X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/971ba9bfa2fed5c73324d0da67728e3ec7b7bf21..ecf915ebc8afa9f94239905041f1a2721be6ab4c:/target/linux/ar7/image/Makefile

diff --git a/target/linux/ar7/image/Makefile b/target/linux/ar7/image/Makefile
index ef30431c0..90f0d847b 100644
--- a/target/linux/ar7/image/Makefile
+++ b/target/linux/ar7/image/Makefile
@@ -52,9 +52,13 @@ define align/jffs2-128k
 bs=131072 conv=sync
 endef
 
+define align/squashfs
+bs=65536 conv=sync
+endef
+
 define Image/Build/CyberTAN
 	(dd if=/dev/zero bs=16 count=1; cat $(BIN_DIR)/openwrt-$(BOARD)-$(1).bin) | \
-		$(STAGING_DIR_HOST)/bin/addpattern -p $(3) -o $(BIN_DIR)/openwrt-$(2)-$(4).bin
+		$(STAGING_DIR_HOST)/bin/addpattern -p $(3) -o $(BIN_DIR)/openwrt-$(2)-$(4)-code.bin
 endef
 
 #define Image/Build/sErCoMm
@@ -65,9 +69,10 @@ endef
 #endef
 
 define Image/Build/EVA
-	$(STAGING_DIR_HOST)/bin/lzma2eva $(KERNEL_ENTRY) $(KERNEL_ENTRY) $(KDIR)/vmlinux.lzma $(BIN_DIR)/openwrt-$(2)-$(1).bin
-	cat $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(2)-$(1).bin
-	$(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(1).bin)
+	$(STAGING_DIR_HOST)/bin/lzma2eva $(EVA_LOADADDR) 0x$${shell $(TARGET_CROSS)nm $(KDIR)/linux-*/vmlinux | grep kernel_entry | cut -d' ' -f1} $(KDIR)/vmlinux.lzma $(KDIR)/loader.eva 
+	dd if=$(KDIR)/loader.eva $(call align/$(1)) > $(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(1).bin
+	cat $(KDIR)/root.$(1) >> $(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(1).bin 
+	$(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(1).bin)
 endef
 
 define Image/Build
@@ -78,9 +83,12 @@ define Image/Build
 	$(call Image/Build/CyberTAN,$(1),WA21,WA21,$(1))
 	$(call Image/Build/CyberTAN,$(1),WA22,WA22,$(1))
 	$(call Image/Build/CyberTAN,$(1),WAG2,WAG2,$(1))
+	$(call Image/Build/CyberTAN,$(1),AG310,AV2A -b -r 1.0,$(1))
 	$(call Image/Build/CyberTAN,$(1),AG241v2,AG3A -b -r 2.0,$(1))
 	$(call Image/Build/CyberTAN,$(1),AG241v2b,AG3B -b -r 2.0,$(1))
 	$(call Image/Build/CyberTAN,$(1),AG241v1,AG3A -b,$(1))
+	$(call Image/Build/CyberTAN,$(1),WAG54GP2v1,ATWL -b,$(1))
+	$(call Image/Build/CyberTAN,$(1),WAG54GP2v2,CTWL -b,$(1))
 	$(call Image/Build/CyberTAN,$(1),WA31,WA31 -b,$(1))
 	$(call Image/Build/CyberTAN,$(1),WA32,WA32 -b,$(1))
 	$(call Image/Build/CyberTAN,$(1),WA7A,WA7A -b,$(1))