diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-08-23 11:49:07 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-08-23 11:49:07 +0000 |
| commit | 0f07b6e1273e3c98b0c086b971283b2e1299020a (patch) | |
| tree | 9bea03b1127ec75ea59d81f0f5f355fa1d2203e7 /target/linux/ar71xx | |
| parent | 7ef43e5fe3522f7bb1b81c4d617177c36f75698b (diff) | |
ar71xx: image: pass mtdlayout as a separate parameter for the ALFA template
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33236 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 3f4fc5d435..d885acb168 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -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) define Image/Build/ALFA - $(call MkuImageLzma,$(2),$(3)) - $(call Sysupgrade/RKuImage,$(1),$(2),$(4),$(5)) + $(call MkuImageLzma,$(2),$(3) $(4)) + $(call Sysupgrade/RKuImage,$(1),$(2),$(5),$(6)) if [ -e "$(call sysupname,$(1),$(2))" ]; then \ rm -rf $(KDIR)/$(1); \ mkdir -p $(KDIR)/$(1); \ cd $(KDIR)/$(1); \ - cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(6); \ - cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(7); \ - $(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) $(6) $(7); \ + cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(7); \ + cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(8); \ + $(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) $(7) $(8); \ ( \ echo WRM7222C | dd bs=32 count=1 conv=sync; \ echo -ne '\xfe'; \ @@ -376,7 +376,7 @@ define Image/Build/ALFA endef define Image/Build/ALFA/initramfs - $(call MkuImageLzma/initramfs,$(2),$(3)) + $(call MkuImageLzma/initramfs,$(2),$(3) $(4)) endef 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)) 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 - $(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 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)) 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 - $(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 ja76pf_cmdline=board=JA76PF console=ttyS0,115200 |