Amend patch handling in ps3

[openwrt.git] / target / linux / ar71xx / image / Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index c37dc67..fe04106 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -23,22 +23,39 @@ define Image/BuildKernel
        cp $(KDIR)/vmlinux $(VMLINUX).bin
        gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
        $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7
        cp $(KDIR)/vmlinux $(VMLINUX).bin
        gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
        $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7

+       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux -lc1 -lp2 -pb2 $(KDIR)/vmlinux.bin.lzma

        dd if=$(KDIR)/vmlinux.bin.l7 of=$(VMLINUX).lzma bs=65536 conv=sync
        dd if=$(KDIR)/vmlinux.bin.gz of=$(VMLINUX).gz bs=65536 conv=sync
        dd if=$(KDIR)/vmlinux.bin.l7 of=$(VMLINUX).lzma bs=65536 conv=sync
        dd if=$(KDIR)/vmlinux.bin.gz of=$(VMLINUX).gz bs=65536 conv=sync

-       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux -lc1 -lp2 -pb2 $(KDIR)/vmlinux.lzma

        mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
                0x80060000 \
                -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
        mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
                0x80060000 \
                -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \

-               -d $(KDIR)/vmlinux.bin.gz $(IMGNAME)-uImage.gz
+               -d $(KDIR)/vmlinux.bin.gz $(IMGNAME)-uImage-gzip.bin
+       mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
+               0x80060000 \
+               -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+               -d $(KDIR)/vmlinux.bin.lzma $(IMGNAME)-uImage-lzma.bin
+endef

 
 

+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

 endef
 
 define Image/Build/MyLoader
        -$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) \
 endef
 
 define Image/Build/MyLoader
        -$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) \

-               -p0x30000:0xd0000:ahl:0x80060000 \
-               -p0x100000:0 \
-               -b0x30000:0xd0000:h:$(KDIR)/vmlinux.lzma \
-               -b0x100000:0::$(KDIR)/root.$(1) \
+               -p0x30000:0xc0000:ahl:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma  \
+               -p0xf0000:0:::rootfs:$(KDIR)/root.$(1) \

                $(call imgname,$(1),$(2)).img
 endef
 
                $(call imgname,$(1),$(2)).img
 endef
 


@@ -50,12 +67,28 @@ define Image/Build/Template/Compex/squashfs
        $(call Image/Build/Template/Compex,squashfs,$(1))
 endef
 
        $(call Image/Build/Template/Compex,squashfs,$(1))
 endef
 

+define Image/Build/Template/AP81
+       $(call Image/Build/AP81,$(1),$(2),$(3),$(4))
+endef
+
+define Image/Build/Template/AP81/squashfs
+       $(call Image/Build/Template/AP81,squashfs,$(1),$(2),$(3))
+endef
+

 define Image/Build/Profile/WP543
        $(call Image/Build/Template/Compex/$(1),wp543)
 endef
 
 define Image/Build/Profile/WP543
        $(call Image/Build/Template/Compex/$(1),wp543)
 endef
 

+define Image/Build/Profile/TEW632BRP
+       $(call Image/Build/Template/AP81/$(1),tew-632brp,board=TEW-632BRP,"AP81-AR9130-RT-070614-00")
+endef
+
+define Image/Build/Profile/TEW652BRP
+       $(call Image/Build/Template/AP81/$(1),tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
+endef
+

 define Image/Build/squashfs
 define Image/Build/squashfs

-    $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+       $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)

 endef
 
 define Image/Build
 endef
 
 define Image/Build


@@ -63,7 +96,8 @@ define Image/Build
        dd if=$(KDIR)/root.$(1) of=$(IMGNAME)-root.$(1) bs=128k conv=sync
 
        $(call Image/Build/Profile/WP543,$(1))
        dd if=$(KDIR)/root.$(1) of=$(IMGNAME)-root.$(1) bs=128k conv=sync
 
        $(call Image/Build/Profile/WP543,$(1))

+       $(call Image/Build/Profile/TEW632BRP,$(1))
+       $(call Image/Build/Profile/TEW652BRP,$(1))

 endef
 
 endef
 

-

 $(eval $(call BuildImage))
 $(eval $(call BuildImage))