Author: blogic Date: 2014-12-12 17:16:57 +0100 (Fri, 12 Dec 2014) New Revision: 43663
Modified: trunk/target/linux/oxnas/image/Makefile Log: oxnas: use u-boot.bin in KDIR This fixes building *u-boot-initramfs.bin images using ImageBuilder Signed-off-by: Daniel Golle <[email protected]> Modified: trunk/target/linux/oxnas/image/Makefile =================================================================== --- trunk/target/linux/oxnas/image/Makefile 2014-12-12 16:16:45 UTC (rev 43662) +++ trunk/target/linux/oxnas/image/Makefile 2014-12-12 16:16:57 UTC (rev 43663) @@ -36,8 +36,8 @@ 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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
