aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-12-12 16:16:57 +0000
committerJohn Crispin <john@openwrt.org>2014-12-12 16:16:57 +0000
commit58a4113c5e9785faa49efc57d2b9de0f196acc3e (patch)
treee757b25c23728726f501f198eacbd8b8b709005f /target/linux
parent5ff8272cf07d0186a39f0ef75ca43a80dd104f81 (diff)
downloadupstream-58a4113c5e9785faa49efc57d2b9de0f196acc3e.tar.gz
upstream-58a4113c5e9785faa49efc57d2b9de0f196acc3e.tar.bz2
upstream-58a4113c5e9785faa49efc57d2b9de0f196acc3e.zip
oxnas: use u-boot.bin in KDIR
This fixes building *u-boot-initramfs.bin images using ImageBuilder Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 43663
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/oxnas/image/Makefile4
1 files changed, 2 insertions, 2 deletions
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