diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-09-09 21:15:49 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-09-09 21:15:49 +0000 |
| commit | a01bb4f1afe37906d8797a3e0e117d81d0b1edde (patch) | |
| tree | 7b36c16d6ec4e446dd69bbbed241134d3b798fd1 /target/linux/imx6 | |
| parent | 16c98e4a9c9e32cb69f027542415052b1f09dc55 (diff) | |
| download | upstream-a01bb4f1afe37906d8797a3e0e117d81d0b1edde.tar.gz upstream-a01bb4f1afe37906d8797a3e0e117d81d0b1edde.tar.bz2 upstream-a01bb4f1afe37906d8797a3e0e117d81d0b1edde.zip | |
imx6: fix image build for Generic profile.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42455 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6')
| -rw-r--r-- | target/linux/imx6/image/Makefile | 12 |
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) |