aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-10-29 09:55:20 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-10-29 09:55:20 +0000
commit3d12aaad33787003e0a67a952343618bb7a3de01 (patch)
tree429efc0cc26b80123f6ee617e86aa0388d48d9de
parent32c84b93c1ea79d9002c1865331e66fbb62b1050 (diff)
downloadmaster-187ad058-3d12aaad33787003e0a67a952343618bb7a3de01.tar.gz
master-187ad058-3d12aaad33787003e0a67a952343618bb7a3de01.tar.bz2
master-187ad058-3d12aaad33787003e0a67a952343618bb7a3de01.zip
[orion]: the uImage's filename will hardly change
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33985 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/orion/image/generic.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk
index 9187b569a0..f4319e0b6c 100644
--- a/target/linux/orion/image/generic.mk
+++ b/target/linux/orion/image/generic.mk
@@ -18,7 +18,6 @@ KERNEL_MTD_SIZE:=1024
# Netgear WNR854T: erase size is 128KiB = 0x00020000 = 131072
ERASE_SIZE_128K:=128
-UIMAGE_FILE_NAME_WNR854T:=uImage
# Linksys WRT350N v2: erase size is 64KiB = 0x00010000 = 65536
ERASE_SIZE_64K:=64
@@ -48,7 +47,7 @@ define Image/BuildKernel
$(call Image/BuildKernel/ARM/zImage,wn802t,"\x0c\x1c\xa0\xe3\xea\x10\x81\xe3")
$(call Image/BuildKernel/ARM/uImage,wn802t)
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # nothing more to do for a ramdisk build
-$(call Image/BuildKernel/JFFS2uImage,wn802t,$(ERASE_SIZE_64K),$(UIMAGE_FILE_NAME_WNR854T))
+$(call Image/BuildKernel/JFFS2uImage,wn802t,$(ERASE_SIZE_64K),uImage)
$(call Image/Default/FileSizeCheck,$(KDIR)/wn802t-uImage.jffs2,$(shell expr $(KERNEL_MTD_SIZE) \* 1024))
endif
@@ -56,7 +55,7 @@ $(call Image/Default/FileSizeCheck,$(KDIR)/wn802t-uImage.jffs2,$(shell expr $(KE
$(call Image/BuildKernel/ARM/zImage,wnr854t,"\x07\x1c\xa0\xe3\x09\x10\x81\xe3")
$(call Image/BuildKernel/ARM/uImage,wnr854t)
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) # nothing more to do for a ramdisk build
-$(call Image/BuildKernel/JFFS2uImage,wnr854t,$(ERASE_SIZE_128K),$(UIMAGE_FILE_NAME_WNR854T))
+$(call Image/BuildKernel/JFFS2uImage,wnr854t,$(ERASE_SIZE_128K),uImage)
$(call Image/Default/FileSizeCheck,$(KDIR)/wnr854t-uImage.jffs2,$(shell expr $(KERNEL_MTD_SIZE) \* 1024))
endif