From: Imre Kaloz Date: Mon, 29 Oct 2012 09:55:20 +0000 (+0000) Subject: the uImage's filename will hardly change X-Git-Tag: reboot~12470 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8e49dfe68a13908c8628ba40c621c2d35b308745;p=openwrt%2Fopenwrt.git the uImage's filename will hardly change SVN-Revision: 33985 --- 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