aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-08-12 12:48:26 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-08-12 12:48:26 +0000
commita2ec9c876d0d3246b866edeef273b54d9f4dc8e9 (patch)
tree2732f24a94390a6d52c04b8cbf7e8a8678066fed /target
parent41a89cfaab5396a424e3deb2ec6e81ae0a7a1b29 (diff)
downloadupstream-a2ec9c876d0d3246b866edeef273b54d9f4dc8e9.tar.gz
upstream-a2ec9c876d0d3246b866edeef273b54d9f4dc8e9.tar.bz2
upstream-a2ec9c876d0d3246b866edeef273b54d9f4dc8e9.zip
ramips: provide means to specify custom "image name" for uImages, use for DIR-620
D-Link's DIR-620 allows to flash a uImage directly from its web-interface but for that the image name should be set to DIR_620. Signed-off-by: Paul Fertser <fercerpav@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33143 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/ramips/image/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 5f42fe8a75..1e17187c32 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -49,14 +49,15 @@ define PatchKernelLzma
endef
define MkImage
+ $(eval imagename=$(if $(4),$(4),MIPS OpenWrt Linux-$(LINUX_VERSION)))
mkimage -A mips -O linux -T kernel -C $(1) $(call kernel_entry)\
- -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
+ -n "$(imagename)" \
-d $(2) $(3)
endef
define MkImageLzma
$(call PatchKernelLzma,$(1),$(2))
- $(call MkImage,lzma,$(KDIR)/vmlinux-$(1).bin.lzma,$(KDIR)/vmlinux-$(1).uImage)
+ $(call MkImage,lzma,$(KDIR)/vmlinux-$(1).bin.lzma,$(KDIR)/vmlinux-$(1).uImage,$(3))
endef
define CatFiles
@@ -95,7 +96,7 @@ define Image/BuildKernel
endef
define BuildFirmware/Generic
- $(call MkImageLzma,$(2),$(3))
+ $(call MkImageLzma,$(2),$(3),$(6))
$(call Sysupgrade/KRuImage,$(1),$(2),$(4),$(5))
endef
@@ -200,7 +201,7 @@ mtdlayout_dir620a1=192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,896k(kernel),
kernel_size_dir620a1=917504
rootfs_size_dir620a1=7143424
define BuildFirmware/DIR620A1
- $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),ttyS1,57600) $(call mkmtd/phys,$(mtdlayout_dir620a1)),$(kernel_size_dir620a1),$(rootfs_size_dir620a1))
+ $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),ttyS1,57600) $(call mkmtd/phys,$(mtdlayout_dir620a1)),$(kernel_size_dir620a1),$(rootfs_size_dir620a1),DIR_620)
endef
define BuildFirmware/DIR620A1/initramfs