X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4bcc767170867495a170f365d58d98d7bf075618..6da3163ec75863d4d7345d1cfada517ddacacd34:/target/linux/ar71xx/image/Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 04629ffd5..653a8af69 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -77,11 +77,12 @@ define Image/Build/WRT400N
 	fi; fi
 endef
 
+cameo_mtdlayout=mtdparts=spi0.0:128k(u-boot)ro,64k(config)ro,896k(kernel),2880k(rootfs),64k(art)ro,3776k@0x30000(firmware)
 define Image/Build/Cameo
-	$(call PatchKernelLzma,$(2),$(3))
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 851968 ]; then \
+	$(call PatchKernelLzma,$(2),$(3) $(cameo_mtdlayout))
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt 917504 ]; then \
 		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
-	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 3014656 ]; then \
+	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2949120 ]; then \
 		echo "Warning: $(KDIR)/root.$(1) is too big"; \
 	else \
 		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
@@ -89,8 +90,8 @@ define Image/Build/Cameo
 			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
 			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
 		( \
-			dd if=$(KDIR)/vmlinux-$(2).uImage bs=832k conv=sync; \
-			dd if=$(KDIR)/root.$(1) bs=2944k conv=sync; \
+			dd if=$(KDIR)/vmlinux-$(2).uImage bs=896k conv=sync; \
+			dd if=$(KDIR)/root.$(1) bs=2880k conv=sync; \
 			echo -n $(4); \
 		) > $(call imgname,$(1),$(2)).uni; \
 	fi; fi
@@ -244,7 +245,7 @@ define Image/Build/WNDR3700
 	$(STAGING_DIR_HOST)/bin/mkdniimg \
 		-B WNDR3700 -v OpenWrt.$(REVISION) \
 		-i $(call imgname,$(1),$(2))-sysupgrade.bin \
-		-o $(call imgname,$(1),$(2))-factory.bin
+		-o $(call imgname,$(1),$(2))-factory.img
 endef
 
 define Image/Build/Template/Compex