X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/85f9bb93ef9ad3212ac3357476e2ee5742a768d0..cf68954004dfda5c4c49dcb79bda1753135b2a6c:/target/linux/ar71xx/image/Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 044399585..3f44d40ee 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -40,16 +40,22 @@ define Image/Build/AP81
 	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
-	mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
-		0x80060000 \
-		-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-		-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage
-	( \
-		dd if=$(KDIR)/vmlinux-$(2).uImage bs=768k conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=3008k conv=sync; \
-	) > $(call imgname,$(1),$(2)).bin
-	cp $(call imgname,$(1),$(2)).bin $(call imgname,$(1),$(2)).webui
-	echo -n $(4) >> $(call imgname,$(1),$(2)).webui
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 786432 ]; then \
+		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
+	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 3080192 ]; then \
+		echo "Warning: $(KDIR)/root.$(1) is too big"; \
+	else \
+		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
+			0x80060000 \
+			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
+		( \
+			dd if=$(KDIR)/vmlinux-$(2).uImage bs=768k conv=sync; \
+			dd if=$(KDIR)/root.$(1) bs=3008k conv=sync; \
+		) > $(call imgname,$(1),$(2)).bin; \
+		cp $(call imgname,$(1),$(2)).bin $(call imgname,$(1),$(2)).webui; \
+		echo -n $(4) >> $(call imgname,$(1),$(2)).webui; \
+	fi; fi
 endef
 
 define Image/Build/MyLoader
@@ -62,7 +68,8 @@ endef
 define Image/Build/UBNT
 	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
+	$(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 \
 		-k $(KDIR)/vmlinux-$(2).bin.lzma \
@@ -91,7 +98,7 @@ define Image/Build/Template/UBNT
 endef
 
 define Image/Build/Template/UBNT/squashfs
-	$(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3))
+	$(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3),$(4))
 endef
 
 define Image/Build/Profile/WP543
@@ -111,7 +118,7 @@ define Image/Build/Profile/TEW652BRP
 endef
 
 define Image/Build/Profile/UBNTRS
-	$(call Image/Build/Template/UBNT,$(1),rs,board=UBNT-RS,RS,RSx)
+	$(call Image/Build/Template/UBNT/$(1),rs,board=UBNT-RS,RS,RSx)
 endef
 
 define Image/Build/squashfs