aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-03-22 18:56:55 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-03-22 18:56:55 +0000
commit27ed2a371319a2005ac54d2adf2098ba9658ad74 (patch)
treeb5a09801052215efd0b207f4578350555acda162 /target/linux
parent008237895969306217fe0f19b0dc5046dc2beedb (diff)
downloadupstream-27ed2a371319a2005ac54d2adf2098ba9658ad74.tar.gz
upstream-27ed2a371319a2005ac54d2adf2098ba9658ad74.tar.bz2
upstream-27ed2a371319a2005ac54d2adf2098ba9658ad74.zip
[ar71xx] fix image generation in the Image Builder environment
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26271 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/image/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 678d46e096..197532b690 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -394,6 +394,8 @@ ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2752512 ]; then \
echo "Warning: $(KDIR)/root.$(1) is too big"; \
+ else if [ ! -f $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin ]; then \
+ echo "Warning: $(IMG_PREFIX)-$(2)-u-boot.bin not found"; \
else \
mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
0x80060000 \
@@ -408,7 +410,7 @@ ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
-b $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin \
-r $(call imgname,$(1),$(2))-sysupgrade.bin:0x10000 \
-o $(call imgname,$(1),$(2))-factory.bin; \
- fi; fi
+ fi; fi; fi
endef
endif