oxnas: use u-boot.bin in KDIR
authorJohn Crispin <john@openwrt.org>
Fri, 12 Dec 2014 16:16:57 +0000 (16:16 +0000)
committerJohn Crispin <john@openwrt.org>
Fri, 12 Dec 2014 16:16:57 +0000 (16:16 +0000)
This fixes building *u-boot-initramfs.bin images using ImageBuilder

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 43663

target/linux/oxnas/image/Makefile

index 3a2a58d1e948879ae7e7f082c315ac7fbe3eabf0..a3dae16f7627c4df0cc88599dec1c0d08d09191d 100644 (file)
@@ -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