diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-10-14 16:36:31 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-10-14 16:36:31 +0000 |
| commit | 16df02ee8d0d6c2120914cc58756ae6bfa0a56ed (patch) | |
| tree | d50c906868f84fc37df6d759c06b1d74b2290b54 /target | |
| parent | bbad6b5e944e0d099d4bde7523ade5bec94e475f (diff) | |
| download | upstream-16df02ee8d0d6c2120914cc58756ae6bfa0a56ed.tar.gz upstream-16df02ee8d0d6c2120914cc58756ae6bfa0a56ed.tar.bz2 upstream-16df02ee8d0d6c2120914cc58756ae6bfa0a56ed.zip | |
AA: ar71xx: unbreak building images for OpenMesh OM2P/OM2P-LC
Backport of r33767.
Commit r33248 introduced a regression by passing the board name plus
'board=' in the third argument. The board name string has to be put
into the image as identifier of the image type.
[juhosg: fix OpenMesh template instead of use of string substitution]
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33770 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ar71xx/image/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 569bdc9ef0..2e3c184131 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -641,7 +641,7 @@ define Image/Build/OpenMesh "$(KDIR_TMP)/vmlinux-$(2).uImage" \ "$(KDIR)/root.$(1)" -sh $(TOPDIR)/scripts/combined-ext-image.sh \ - "$(3)" "$(call factoryname,$(1),$(2))" \ + "$(4)" "$(call factoryname,$(1),$(2))" \ "$(BUILD_DIR)/om2p-fwupgrade.cfg" "fwupgrade.cfg" \ "$(KDIR_TMP)/vmlinux-$(2).uImage" "kernel" \ "$(KDIR)/root.$(1)" "rootfs" @@ -781,7 +781,7 @@ $(eval $(call SingleProfile,Netgear,$(fs_64k),WNDR3800,wndr3800,WNDR3700,ttyS0,1 $(eval $(call SingleProfile,Netgear,$(fs_64k),WNDRMAC,wndrmac,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),3701,WNDRMAC,"",-H 29763654+16+64)) $(eval $(call SingleProfile,Netgear,$(fs_64k),WNDRMACV2,wndrmacv2,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),3701,WNDRMACv2,"",-H 29763654+16+128)) -$(eval $(call SingleProfile,OpenMesh,$(fs_squash),OM2P,om2p,OM2P)) +$(eval $(call SingleProfile,OpenMesh,$(fs_squash),OM2P,om2p,,,,OM2P)) $(eval $(call SingleProfile,PB4X,$(fs_128k),ALL0305,all0305,ALL0305,ttyS0,115200)) $(eval $(call SingleProfile,PB4X,$(fs_128k),EAP7660D,eap7660d,EAP7660D,ttyS0,115200)) |