X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Framips%2Fimage%2FMakefile;h=22eaaa088284d758f2748e917d02ab8d660ebb93;hb=f6fb408f307f31861bdf5ce26bb74afe347a4e82;hp=361588efcf68a7e30fc44e8fa9dc632a25be7453;hpb=0d21fe82314865bdc4258bea390736f074bfdd86;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 361588efcf..22eaaa0882 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -18,13 +18,13 @@ ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
 	UIMAGE:=$(IMG_PREFIX)-uImage-initramfs
 endif
 
-ifeq ($(CONFIG_RALINK_RT305X),y)
+ifeq ($(CONFIG_RALINK_RT288X),y)
 define kernel_entry
--a 0x80000000 -e 0x80000000
+-a 0x88000000 -e 0x88000000
 endef
 else
 define kernel_entry
--a 0x88000000 -e 0x88000000
+-a 0x80000000 -e 0x80000000
 endef
 endif
 
@@ -54,15 +54,12 @@ endef
 
 define BuildFirmware/Generic
 	$(call PatchKernelLzma,$(2),$(3) $($(4)))
-	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).bin.lzma"` -gt $(5) ]; then \
-		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
+	$(call MkImage,lzma,"$(KDIR)/vmlinux-$(2).bin.lzma","$(KDIR)/vmlinux-$(2).uImage")
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).uImage"` -gt $(5) ]; then \
+		echo "Warning: $(KDIR)/vmlinux-$(2).uImage is too big"; \
 	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt $(6) ]; then \
 		echo "Warning: $(KDIR)/root.$(1) is too big"; \
 	else \
-		mkimage -A mips -O linux -T kernel -C lzma \
-			$(call kernel_entry) \
-			-n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-			-d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
 		( \
 			dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
 			dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
@@ -70,6 +67,28 @@ define BuildFirmware/Generic
 	fi; fi
 endef
 
+define BuildFirmware/Buffalo
+	$(call PatchKernelLzma,$(2),board=$(3) $($(4)))
+	$(call MkImage,lzma,"$(KDIR)/vmlinux-$(2).bin.lzma","$(KDIR)/vmlinux-$(2).uImage")
+	if [ `stat -c%s "$(KDIR)/vmlinux-$(2).uImage"` -gt $(5) ]; then \
+		echo "Warning: $(KDIR)/vmlinux-$(2).uImage is too big"; \
+	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt $(6) ]; then \
+		echo "Warning: $(KDIR)/root.$(1) is too big"; \
+	else \
+		buffalo-enc -p $(3) -v 1.76 \
+			-i $(KDIR)/vmlinux-$(2).uImage \
+			-o $(KDIR)/vmlinux-$(2).uImage.enc; \
+		buffalo-enc -p $(3) -v 1.76 \
+			-i $(KDIR)/root.$(1) \
+			-o $(KDIR)/root.$(2).enc; \
+		buffalo-tag -b $(3) -p $(3) -a ram -v 1.76 -m 1.01 \
+			-l mlang8 -f 1 -r EU \
+			-i $(KDIR)/vmlinux-$(2).uImage.enc \
+			-i $(KDIR)/root.$(2).enc \
+			-o $(call imgname,$(1),$(2))-factory-EU.bin; \
+	fi; fi
+endef
+
 mtdlayout_4M=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
 define Image/Build/Template/GENERIC_4M
 	$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_4M,851968,3014656)
@@ -80,15 +99,38 @@ define Image/Build/Template/GENERIC_8M
 	$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_8M,851968,7208960)
 endef
 
+mtdlayout_dir300b1=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(devdata)ro,64k(devconf)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
+mtd_dir300b1_kernel_part_size=851968
+mtd_dir300b1_rootfs_part_size=3014656
+define Image/Build/Template/DIR300B1
+	$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_dir300b1,$(mtd_dir300b1_kernel_part_size),$(mtd_dir300b1_rootfs_part_size))
+	mkwrgimg -s $(4) -d /dev/mtdblock/2 \
+		-i $(call imgname,$(1),$(2))-sysupgrade.bin \
+		-o $(call imgname,$(1),$(2))-factory.bin
+endef
+
 define Image/Build/Profile/DIR300B1
-	$(call Image/Build/Template/GENERIC_4M,$(1),dir-300-b1,DIR-300-revB)
+	$(call Image/Build/Template/DIR300B1,$(1),dir-300-b1,DIR-300-B1,wrgn23_dlwbr_dir300b)
+	$(call Image/Build/Template/DIR300B1,$(1),dir-600-b1,DIR-600-B1,wrgn23_dlwbr_dir600b)
+	$(call Image/Build/Template/DIR300B1,$(1),dir-600-b2,DIR-600-B2,wrgn23_dlwbr_dir600b)
+endef
+
+mtdlayout_rtg32b1=mtdparts=spi0.0:192k(u-boot)ro,64k(devdata)ro,64k(devconf)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
+mtd_rtg32b1_kernel_part_size=851968
+mtd_rtg32b1_rootfs_part_size=3014656
+define Image/Build/Template/RTG32B1
+	$(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_rtg32b1,$(mtd_rtg32b1_kernel_part_size),$(mtd_rtg32b1_rootfs_part_size))
+endef
+
+define Image/Build/Profile/RTG32B1
+	$(call Image/Build/Template/RTG32B1,$(1),rt-g32-b1,RT-G32-B1)
 endef
 
 define Image/Build/Profile/FONERA20N
 	$(call Image/Build/Template/GENERIC_8M,$(1),fonera20n,FONERA20N)
 endef
 
-define Image/Build/Template/PWH2004
+define Image/Build/Profile/PWH2004
 	$(call Image/Build/Template/GENERIC_8M,$(1),pwh2004,PWH2004)
 endef
 
@@ -96,16 +138,28 @@ define Image/Build/Profile/V22RW2X2
 	$(call Image/Build/Template/GENERIC_4M,$(1),v22rw-2x2,V22RW-2X2)
 endef
 
+mtdlayout_whrg300n=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,960k(kernel),2752k(rootfs),64k(user)ro,3712k@0x50000(firmware)
 define Image/Build/Profile/WHRG300N
 	$(call Image/Build/Template/GENERIC_4M,$(1),whr-g300n,WHR-G300N)
+	$(call BuildFirmware/Buffalo,$(1),whr-g300n,WHR-G300N,mtdlayout_whrg300n,983040,3801088)
+	( \
+		echo -n -e "# Airstation FirmWare\nrun u_fw\nreset\n\n" | \
+			dd bs=512 count=1 conv=sync; \
+		dd if=$(call imgname,$(1),whr-g300n)-sysupgrade.bin; \
+	) > $(KDIR)/whr-g300n-tftp.tmp
+	buffalo-tftp -i $(KDIR)/whr-g300n-tftp.tmp \
+		-o $(call imgname,$(1),whr-g300n)-tftp.bin
 endef
 
 define Image/Build/Profile/HW5503G
 	$(call Image/Build/Template/GENERIC_8M,$(1),hw550-3g,HW550-3G)
 endef
 
+define Image/Build/Profile/MOFI35003GN
+	$(call Image/Build/Template/GENERIC_8M,$(1),mofi3500-3gn,MOFI3500-3GN)
+endef
 
-mtdlayout_wcr150gn=mtdparts=physmap-flash.0:192k(Bootloader)ro,64k(Config),64k(Factory),832k(Kernel),2944k(rootfs),3776k@0x50000(firmware)
+mtdlayout_wcr150gn=mtdparts=physmap-flash.0:192k(bootloader)ro,64k(config),64k(factory),832k(kernel),2944k(rootfs),3776k@0x50000(firmware)
 mtd_wcr150gn_kernel_part_size=851968
 mtd_wcr150gn_rootfs_part_size=3014656
 define Image/Build/Template/WCR150GN
@@ -132,6 +186,7 @@ endef
 ifeq ($(CONFIG_RALINK_RT305X),y)
 define Image/Build/Profile/Default
 	$(call Image/Build/Profile/DIR300B1,$(1))
+	$(call Image/Build/Profile/RTG32B1,$(1))
 	$(call Image/Build/Profile/FONERA20N,$(1))
 	$(call Image/Build/Profile/V22RW2X2,$(1))
 	$(call Image/Build/Profile/PWH2004,$(1))
@@ -139,6 +194,7 @@ define Image/Build/Profile/Default
 	$(call Image/Build/Profile/WCR150GN,$(1))
 	$(call Image/Build/Profile/F5D8235V2,$(1))
 	$(call Image/Build/Profile/HW5503G,$(1))
+	$(call Image/Build/Profile/MOFI35003GN,$(1))
 endef
 endif