ar71xx: reclaim the 'user_property' partition on WHR-* boards

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

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index f7df102..cfffb89 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -178,7 +178,7 @@ endef
 
 define Image/Build/WHRHPG300N
        $(call MkuImageLzma,$(2),$(3) $($(4)))
 
 define Image/Build/WHRHPG300N
        $(call MkuImageLzma,$(2),$(3) $($(4)))

-       $(call Sysupgrade/KRuImage,$(1),$(2),917504,2883584)
+       $(call Sysupgrade/KRuImage,$(1),$(2),983040,2883584)

        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                ( \
                        echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                ( \
                        echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \


@@ -299,6 +299,7 @@ define Image/Build/Planex/loader
 endef
 
 define Image/Build/Planex
 endef
 
 define Image/Build/Planex

+       [ -e "$(KDIR)/loader-$(2).gz" ]

        $(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
        $(call MkuImageOKLI,$(2))
        ( \
        $(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
        $(call MkuImageOKLI,$(2))
        ( \


@@ -338,6 +339,7 @@ define Image/Build/TPLINKOLD/loader
 endef
 
 define Image/Build/TPLINKOLD
 endef
 
 define Image/Build/TPLINKOLD

+       [ -e "$(KDIR)/loader-$(2).gz" ]

        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \


@@ -368,6 +370,7 @@ define Image/Build/TPLINK/loader
 endef
 
 define Image/Build/TPLINK
 endef
 
 define Image/Build/TPLINK

+       [ -e "$(KDIR)/loader-$(2).gz" ]

        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \


@@ -723,6 +726,11 @@ define Image/Build/Profile/JA76PF
        $(call Image/Build/Template/$(fs_64k)/$(1),PB4X,ja76pf,$(ja76pf_cmdline))
 endef
 
        $(call Image/Build/Template/$(fs_64k)/$(1),PB4X,ja76pf,$(ja76pf_cmdline))
 endef
 

+ja76pf2_cmdline=board=JA76PF2 console=ttyS0,115200
+define Image/Build/Profile/JA76PF2
+       $(call Image/Build/Template/$(fs_64k)/$(1),PB4X,ja76pf2,$(ja76pf2_cmdline))
+endef
+

 jwap003_cmdline=board=JWAP003 console=ttyS0,115200
 define Image/Build/Profile/JWAP003
        $(call Image/Build/Template/$(fs_64k)/$(1),PB4X,jwap003,$(jwap003_cmdline))
 jwap003_cmdline=board=JWAP003 console=ttyS0,115200
 define Image/Build/Profile/JWAP003
        $(call Image/Build/Template/$(fs_64k)/$(1),PB4X,jwap003,$(jwap003_cmdline))


@@ -957,7 +965,7 @@ define Image/Build/Profile/WHRG301N
 endef
 
 whrhpg300n_cmdline=board=WHR-HP-G300N console=ttyS0,115200
 endef
 
 whrhpg300n_cmdline=board=WHR-HP-G300N console=ttyS0,115200

-whrhpg300n_mtdlayout=mtdparts=spi0.0:248k(u-boot)ro,8k(u-boot-env)ro,896k(kernel),2816k(rootfs),64k(user_property),64k(art)ro,3712k@0x40000(firmware)
+whrhpg300n_mtdlayout=mtdparts=spi0.0:248k(u-boot)ro,8k(u-boot-env)ro,960k(kernel),2816k(rootfs),64k(art)ro,3712k@0x40000(firmware)

 define Image/Build/Profile/WHRHPG300N
        $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-g300n,$(whrhpg300n_cmdline),whrhpg300n_mtdlayout,WHR-HP-G300N)
 endef
 define Image/Build/Profile/WHRHPG300N
        $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-g300n,$(whrhpg300n_cmdline),whrhpg300n_mtdlayout,WHR-HP-G300N)
 endef


@@ -1022,6 +1030,7 @@ define Image/Build/Profile/Default
        $(call Image/Build/Profile/FR54RTR,$(1))
        $(call Image/Build/Profile/HORNETUB,$(1))
        $(call Image/Build/Profile/JA76PF,$(1))
        $(call Image/Build/Profile/FR54RTR,$(1))
        $(call Image/Build/Profile/HORNETUB,$(1))
        $(call Image/Build/Profile/JA76PF,$(1))

+       $(call Image/Build/Profile/JA76PF2,$(1))

        $(call Image/Build/Profile/JWAP003,$(1))
        $(call Image/Build/Profile/MZKW04NU,$(1))
        $(call Image/Build/Profile/MZKW300NH,$(1))
        $(call Image/Build/Profile/JWAP003,$(1))
        $(call Image/Build/Profile/MZKW04NU,$(1))
        $(call Image/Build/Profile/MZKW300NH,$(1))