ar71xx: image: pass mtdlayout as a separate parameter for the ALFA template

SVN-Revision: 33236
This commit is contained in:
Gabor Juhos 2012-08-23 11:49:07 +00:00
parent 847afa343f
commit 6ebc77af73

View file

@ -359,15 +359,15 @@ endef
alfa_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware) alfa_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware)
define Image/Build/ALFA define Image/Build/ALFA
$(call MkuImageLzma,$(2),$(3)) $(call MkuImageLzma,$(2),$(3) $(4))
$(call Sysupgrade/RKuImage,$(1),$(2),$(4),$(5)) $(call Sysupgrade/RKuImage,$(1),$(2),$(5),$(6))
if [ -e "$(call sysupname,$(1),$(2))" ]; then \ if [ -e "$(call sysupname,$(1),$(2))" ]; then \
rm -rf $(KDIR)/$(1); \ rm -rf $(KDIR)/$(1); \
mkdir -p $(KDIR)/$(1); \ mkdir -p $(KDIR)/$(1); \
cd $(KDIR)/$(1); \ cd $(KDIR)/$(1); \
cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(6); \ cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(7); \
cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(7); \ cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(8); \
$(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) $(6) $(7); \ $(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) $(7) $(8); \
( \ ( \
echo WRM7222C | dd bs=32 count=1 conv=sync; \ echo WRM7222C | dd bs=32 count=1 conv=sync; \
echo -ne '\xfe'; \ echo -ne '\xfe'; \
@ -376,7 +376,7 @@ define Image/Build/ALFA
endef endef
define Image/Build/ALFA/initramfs define Image/Build/ALFA/initramfs
$(call MkuImageLzma/initramfs,$(2),$(3)) $(call MkuImageLzma/initramfs,$(2),$(3) $(4))
endef endef
define Image/Build/TPLINKOLD/loader define Image/Build/TPLINKOLD/loader
@ -665,9 +665,9 @@ define Image/Build/Template/128k/jffs2-128k
$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
alfa_nx_cmdline=board=ALFA-NX console=ttyS0,115200 $(alfa_mtdlayout_8M) alfa_nx_cmdline=board=ALFA-NX console=ttyS0,115200
define Image/Build/Profile/ALFANX define Image/Build/Profile/ALFANX
$(call Image/Build/Template/$(fs_64k)/$(1),ALFA,alfa-nx,$(alfa_nx_cmdline),1638400,6291456,vmlinux.gz.uImage,pb9x-2.6.31-jffs2) $(call Image/Build/Template/$(fs_64k)/$(1),ALFA,alfa-nx,$(alfa_nx_cmdline),$(alfa_mtdlayout_8M),1638400,6291456,vmlinux.gz.uImage,pb9x-2.6.31-jffs2)
endef endef
alfa_ap96_cmdline=board=ALFA-AP96 console=ttyS0,115200 alfa_ap96_cmdline=board=ALFA-AP96 console=ttyS0,115200
@ -793,9 +793,9 @@ define Image/Build/Profile/EAP7660D
$(call Image/Build/Template/$(fs_128k)/$(1),PB4X,eap7660d,$(eap7660d_cmdline)) $(call Image/Build/Template/$(fs_128k)/$(1),PB4X,eap7660d,$(eap7660d_cmdline))
endef endef
hornetub_cmdline=board=HORNET-UB console=ttyATH0,115200 $(alfa_mtdlayout_8M) hornetub_cmdline=board=HORNET-UB console=ttyATH0,115200
define Image/Build/Profile/HORNETUB define Image/Build/Profile/HORNETUB
$(call Image/Build/Template/$(fs_64k)/$(1),ALFA,hornet-ub,$(hornetub_cmdline),1638400,6291456,kernel_image,rootfs_image) $(call Image/Build/Template/$(fs_64k)/$(1),ALFA,hornet-ub,$(hornetub_cmdline),$(alfa_mtdlayout_8M),1638400,6291456,kernel_image,rootfs_image)
endef endef
ja76pf_cmdline=board=JA76PF console=ttyS0,115200 ja76pf_cmdline=board=JA76PF console=ttyS0,115200