From: blogic Date: Fri, 12 Dec 2014 16:16:57 +0000 (+0000) Subject: oxnas: use u-boot.bin in KDIR X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=3c1c6de1de2c0ffb6ea70a45bf15ec3bb9097870;p=openwrt.git oxnas: use u-boot.bin in KDIR This fixes building *u-boot-initramfs.bin images using ImageBuilder Signed-off-by: Daniel Golle git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43663 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/oxnas/image/Makefile b/target/linux/oxnas/image/Makefile index 3a2a58d1e9..a3dae16f76 100644 --- a/target/linux/oxnas/image/Makefile +++ b/target/linux/oxnas/image/Makefile @@ -36,8 +36,8 @@ define Image/BuildKernel/Template ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),) $(call Image/BuildKernel/MkFIT,$(1),$(KDIR)/zImage-initramfs,$(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb,none,0x60008000,0x60008000,-initramfs) $(CP) $(KDIR)/fit-$(1)-initramfs.itb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fit-uImage-initramfs.itb - if [ -e "$(BIN_DIR)/$(IMG_PREFIX)-ox820-u-boot.bin" ]; then \ - ( dd if=$(BIN_DIR)/$(IMG_PREFIX)-ox820-u-boot.bin bs=128k conv=sync ; dd if=$(KDIR)/fit-$(1)-initramfs.itb bs=128k conv=sync ) \ + if [ -e "$(KDIR)/u-boot.bin" ]; then \ + ( dd if=$(KDIR)/u-boot.bin bs=128k conv=sync ; dd if=$(KDIR)/fit-$(1)-initramfs.itb bs=128k conv=sync ) \ > $(BIN_DIR)/$(IMG_PREFIX)-$(1)-u-boot-initramfs.itb; \ fi endif