aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2014-09-09 21:15:49 +0000
committerLuka Perkov <luka@openwrt.org>2014-09-09 21:15:49 +0000
commit9ccacbaa40f37999cbc7c7224812bc02924f62a3 (patch)
treefb110f802e6fb3e98abee8e2e8da1091aa259c10 /target/linux
parent4ba3d616be4ebbb46a60e39b1e0b31768e9cd748 (diff)
downloadupstream-9ccacbaa40f37999cbc7c7224812bc02924f62a3.tar.gz
upstream-9ccacbaa40f37999cbc7c7224812bc02924f62a3.tar.bz2
upstream-9ccacbaa40f37999cbc7c7224812bc02924f62a3.zip
imx6: fix image build for Generic profile.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> SVN-Revision: 42455
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/imx6/image/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile
index 2e2e11b6ac..391db78474 100644
--- a/target/linux/imx6/image/Makefile
+++ b/target/linux/imx6/image/Makefile
@@ -13,14 +13,16 @@ endef
define Image/BuildKernel/Template
+ ifneq ($(1),)
$(CP) $(DTS_DIR)/$(1).dtb $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb
$(call Image/BuildKernel/MkFIT,$(1),$(KDIR)/zImage,$(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb,none,0x10008000,0x10008000)
$(CP) $(KDIR)/fit-$(1).itb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fit-uImage.itb
- ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(call Image/BuildKernel/MkFIT,$(1),$(KDIR)/zImage-initramfs,$(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb,none,0x10008000,0x10008000,-initramfs)
$(CP) $(KDIR)/fit-$(1)-initramfs.itb $(BIN_DIR)/$(IMG_PREFIX)-$(1)-fit-uImage-initramfs.itb
+ endif
endif
$(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
@@ -71,10 +73,10 @@ endef
define Image/Build/squashfs
$(call prepare_generic_squashfs,$(KDIR)/root.$(1))
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).bin bs=128k conv=sync
- ( \
+ [ -f "$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-fit-uImage.itb" ] && ( \
dd if=$(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-fit-uImage.itb bs=2048k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
- ) > $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-fit-$(1).bin
+ ) > $(BIN_DIR)/$(IMG_PREFIX)-$(call sanitize_profile_name)-fit-$(1).bin || true
endef
define Image/mkfs/targz
@@ -107,8 +109,8 @@ define Image/Build/ubi
endef
-Image/BuildKernel/Template/generic=$(call Image/BuildKernel/Template)
-Image/InstallKernel/Template/generic=$(call Image/InstallKernel/Template)
+Image/BuildKernel/Template/Generic=$(call Image/BuildKernel/Template)
+Image/InstallKernel/Template/Generic=$(call Image/InstallKernel/Template)
Image/BuildKernel/Template/IMX6DL_WANDBOARD=$(call Image/BuildKernel/Template,imx6dl-wandboard)
Image/InstallKernel/Template/IMX6DL_WANDBOARD=$(call Image/InstallKernel/Template,imx6dl-wandboard)