diff options
| author | John Crispin <blogic@openwrt.org> | 2014-12-12 16:16:57 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-12-12 16:16:57 +0000 |
| commit | d48ff407a55d7f7b5eee95756ae7469c5d9bb9e3 (patch) | |
| tree | 638b439aebd4efbbb622bc97bfeb59a324976d94 | |
| parent | f0b301a6e70d88599ba56e2e7313c3e6992987e7 (diff) | |
| download | upstream-d48ff407a55d7f7b5eee95756ae7469c5d9bb9e3.tar.gz upstream-d48ff407a55d7f7b5eee95756ae7469c5d9bb9e3.tar.bz2 upstream-d48ff407a55d7f7b5eee95756ae7469c5d9bb9e3.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43663 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/oxnas/image/Makefile | 4 |
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 |