ramips: fix build error on oversized images by putting the dir-860l-b1 size check...

[openwrt/svn-archive/archive.git] / target / linux / ramips / image / Makefile

diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index 1b12249c823a86791c52c98fb603abdbf90d9723..27f349f61904af5d7ca862494058e1e56f9dfc88 100644 (file)
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -22,7 +22,7 @@ define Image/Build/Initramfs
        $(call Image/Build/Profile/$(PROFILE),initramfs)
 endef
 
-DEVICE_VARS += DTS
+DEVICE_VARS += DTS IMAGE_SIZE
 
 loadaddr-y := 0x80000000
 loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000
@@ -32,6 +32,7 @@ KERNEL_LOADADDR := $(loadaddr-y)
 
 KERNEL_DTB = kernel-bin | patch-dtb | lzma
 define Device/Default
+  KERNEL_DEPENDS = $$(wildcard ../dts/$$(DTS).dts)
   KERNEL := $(KERNEL_DTB) | uImage lzma
   IMAGES := sysupgrade.bin
   IMAGE_SIZE := $(ralink_default_fw_size_8M)
@@ -76,10 +77,10 @@ define Build/ubnt-erx-factory-compat
 endef
 
 define Build/ubnt-erx-factory-kernel
-       if [ -e $(BIN_DIR)/$(KERNEL_INITRAMFS_IMAGE) ]; then \
-               $(TAR) -rf $@ --transform='s/^.*/vmlinux.tmp/' $(BIN_DIR)/$(KERNEL_INITRAMFS_IMAGE); \
+       if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) ]; then \
+               $(TAR) -rf $@ --transform='s/^.*/vmlinux.tmp/' $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE); \
                \
-               md5sum --binary $(BIN_DIR)/$(KERNEL_INITRAMFS_IMAGE) | awk '{print $$1}'> $@.md5; \
+               md5sum --binary $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) | awk '{print $$1}'> $@.md5; \
                $(TAR) -rf $@ --transform='s/^.*/vmlinux.tmp.md5/' $@.md5; \
                $(RM) $@.md5; \
        fi
@@ -157,19 +158,19 @@ endef
 
 define MkImageTpl/squashfs
        $(eval output_name=$(IMG_PREFIX)-$(2)-$(1)-$(if $(4),$(4),sysupgrade).bin)
-       $(STAGING_DIR_HOST)/bin/mktplinkfw2 -V "ver. 2.0" -B "$(2)" -j \
+       -$(STAGING_DIR_HOST)/bin/mktplinkfw2 -V "ver. 2.0" -B "$(2)" -j \
                -o $(KDIR)/$(output_name) \
                -k $(KDIR)/vmlinux-$(1)$(4).bin.lzma \
-               -r $(KDIR)/root.$(1)
-       $(CP) $(KDIR)/$(output_name) $(BIN_DIR)/$(output_name)
+               -r $(KDIR)/root.$(1) && \
+               $(CP) $(KDIR)/$(output_name) $(BIN_DIR)/$(output_name)
 endef
 
 define MkImageTpl/initramfs
        $(eval output_name=$(IMG_PREFIX)-$(2)-$(1).bin)
-       $(STAGING_DIR_HOST)/bin/mktplinkfw2 -V "ver. 2.0" -B "$(2)" -c \
+       -$(STAGING_DIR_HOST)/bin/mktplinkfw2 -V "ver. 2.0" -B "$(2)" -c \
                -o $(KDIR)/$(output_name) \
-               -k $(KDIR)/vmlinux-$(1).bin.lzma
-       $(CP) $(KDIR)/$(output_name) $(BIN_DIR)/$(output_name)
+               -k $(KDIR)/vmlinux-$(1).bin.lzma && \
+               $(CP) $(KDIR)/$(output_name) $(BIN_DIR)/$(output_name)
 endef
 
 # $(1), lowercase board name like "mt7620a_v22sg"
@@ -591,7 +592,7 @@ define BuildFirmware/HLKRM04/initramfs
        $(call BuildFirmware/OF/initramfs,$(1),$(2),$(3),$(4))
        mkhilinkfw -e -i$(call imgname,$(1),$(2))-uImage.bin -o $(call imgname,$(1),$(2))-factory.bin;
 endef
-Image/Build/Profile/HLKRM04=$(call BuildFirmware/HLKRM04/$(1),$(1),hlk-rm04,HLKRM04,HLK-RM02)
+Image/Build/Profile/HLKRM04=$(call BuildFirmware/HLKRM04/$(1),$(1),hlk-rm04,HLKRM04,HLK-RM04)
 
 Image/Build/Profile/HT-TM02=$(call BuildFirmware/Default8M/$(1),$(1),ht-tm02,HT-TM02)
 
@@ -1009,6 +1010,7 @@ endef
 
 define Device/wsr-600
   DTS := WSR-600
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
 endef
 
 define Device/re6500
@@ -1018,6 +1020,7 @@ endef
 define Device/wsr-1166
   DTS := WSR-1166
   IMAGE/sysupgrade.bin := trx | pad-rootfs
+  IMAGE_SIZE := $(ralink_default_fw_size_16M)
 endef
 
 define Device/dir-860l-b1
@@ -1031,8 +1034,8 @@ define Device/dir-860l-b1
   IMAGE/factory.bin := \
        append-kernel | pad-offset 65536 64 | append-rootfs | pad-rootfs -x 64 | \
        seama -m "dev=/dev/mtdblock/2" -m "type=firmware" | \
-       check-size $$$$(IMAGE_SIZE) | \
-       seama-seal -m "signature=wrgac13_dlink.2013gui_dir860lb"
+       seama-seal -m "signature=wrgac13_dlink.2013gui_dir860lb" | \
+       check-size $$$$(IMAGE_SIZE)
 endef
 
 define Device/firewrt
@@ -1073,12 +1076,12 @@ define Device/ubnt-erx
   FILESYSTEMS := squashfs
   KERNEL_SIZE := 3145728
   KERNEL := $(KERNEL_DTB) | uImage lzma
-  IMAGES := sysupgrade.tar factory-initramfs.tar
+  IMAGES := sysupgrade.tar $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),factory-initramfs.tar)
   IMAGE/factory-initramfs.tar := ubnt-erx-factory-compat | \
                                 ubnt-erx-factory-kernel | \
                                 ubnt-erx-factory-rootfs | \
                                 ubnt-erx-factory-version | \
-                                ubnt-erx-factory-check-size $$$$(KERNEL_SIZE)
+                                ubnt-erx-factory-check-size $$(KERNEL_SIZE)
   IMAGE/sysupgrade.tar := sysupgrade-nand
 endef
 
@@ -1087,10 +1090,12 @@ endef
 #
 
 Image/Build/Profile/MT7628=$(call BuildFirmware/Default4M/$(1),$(1),mt7628,MT7628)
+Image/Build/Profile/WRTNODE2P=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode2p,WRTNODE2P)
 
 ifeq ($(SUBTARGET),mt7628)
 define Image/Build/Profile/Default
        $(call Image/Build/Profile/MT7628,$(1))
+       $(call Image/Build/Profile/WRTNODE2P,$(1))
 endef
 endif
 
@@ -1099,13 +1104,13 @@ endif
 # MT7688 Profiles
 #
 
-Image/Build/Profile/mt7688=$(call BuildFirmware/Default16M/$(1),$(1),mt7688,MT7688)
 Image/Build/Profile/LinkIt7688=$(call BuildFirmware/Default32M/$(1),$(1),LinkIt7688,LINKIT7688)
+Image/Build/Profile/WRTNODE2R=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode2r,WRTNODE2R)
 
 ifeq ($(SUBTARGET),mt7688)
 define Image/Build/Profile/Default
-       $(call Image/Build/Profile/mt7688,$(1))
        $(call Image/Build/Profile/LinkIt7688,$(1))
+       $(call Image/Build/Profile/WRTNODE2R,$(1))
 endef
 endif