X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/938bc99f585c67cbd38edc274cc2baca6cf852e2..0bc848a5da9a8b1cbb5e2760eaec0dedaa70c713:/target/linux/atheros/image/Makefile

diff --git a/target/linux/atheros/image/Makefile b/target/linux/atheros/image/Makefile
index 6df21c773..fb9afae5c 100644
--- a/target/linux/atheros/image/Makefile
+++ b/target/linux/atheros/image/Makefile
@@ -23,25 +23,40 @@ define Image/Build
 	$(call Image/Build/$(1))
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) bs=128k conv=sync
 
-	-$(STAGING_DIR_HOST)/bin/mkfwimage -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
+	-$(STAGING_DIR_HOST)/bin/mkfwimage \
+		-B XS2 -v XS2.ar2316.OpenWrt.$(REVISION) \
+		-k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
 		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
-		-v XS2.ar2316.OpenWRT \
 		-o $(BIN_DIR)/openwrt-$(BOARD)-ubnt2-$(1).bin
-	-$(STAGING_DIR_HOST)/bin/mkfwimage -k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
+
+	-$(STAGING_DIR_HOST)/bin/mkfwimage \
+		-B XS5 -v XS5.ar2313.OpenWrt.$(REVISION) \
+		-k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
+		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+		-o $(BIN_DIR)/openwrt-$(BOARD)-ubnt5-$(1).bin
+
+	-$(STAGING_DIR_HOST)/bin/mkfwimage \
+		-B XS2-8 -v XS2.ar2316.OpenWrt.$(REVISION) \
+		-k $(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma \
 		-r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
-		-v XS5.ar2313.OpenWRT \
-		-o $(BIN_DIR)/openwrt-$(BOARD)-ubnt5-$(1).bin \
-		-s 0xBE030000
+		-o $(BIN_DIR)/openwrt-$(BOARD)-ubnt2-pico2-$(1).bin
 
 	-$(STAGING_DIR_HOST)/bin/mkmylofw -B np25g \
 		-p0x020000:0x130000:ah:0x80041000:linux:$(KDIR)/vmlinux.bin.gz  \
 		-p0x150000:0x2a0000:::rootfs:$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
 		$(BIN_DIR)/openwrt-$(BOARD)-np25g-$(1).bin
+
 	-$(STAGING_DIR_HOST)/bin/mkmylofw -B wpe53g \
 		-p0x020000:0x130000:ah:0x80041000:linux:$(KDIR)/vmlinux.bin.gz  \
 		-p0x150000:0x2a0000:::rootfs:$(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
 		$(BIN_DIR)/openwrt-$(BOARD)-wpe53g-$(1).bin
 
+  ifeq ($(BOARD),atheros)
+	-sh $(TOPDIR)/scripts/combined-image.sh \
+		"$(BIN_DIR)/openwrt-$(BOARD)-vmlinux.lzma" \
+		"$(BIN_DIR)/openwrt-$(BOARD)-root.$(1)" \
+		"$(BIN_DIR)/openwrt-$(BOARD)-combined.$(1).img"
+  endif
 endef
 
 $(eval $(call BuildImage))