diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2017-01-27 16:06:31 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-01-27 16:53:31 +0100 |
| commit | c6502ce3bb87b6a6a85209d3e67736bd2db21bc7 (patch) | |
| tree | 7af829172459e805158e43caf9f2f30a51559852 /package | |
| parent | 237bd361352446669d4058e423f5e1b27c930004 (diff) | |
| download | mtk-20170518-c6502ce3bb87b6a6a85209d3e67736bd2db21bc7.zip mtk-20170518-c6502ce3bb87b6a6a85209d3e67736bd2db21bc7.tar.gz mtk-20170518-c6502ce3bb87b6a6a85209d3e67736bd2db21bc7.tar.bz2 | |
layerscape: put u-boot and ucode images into image staging directory
Do not put the u-boot and ucode images into the kernel build directory as this
directory might get removed after kernel updates while the u-boot packages
InstallDev recipe is not getting re-executed because it is still considered
current, leading to image build failures later on due to missing images.
To ensure that built bootloader images persist over kernel version updates in
the buildroot, put them into the new STAGING_DIR_IMAGE directory.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package')
| -rw-r--r-- | package/boot/uboot-layerscape-32b/Makefile | 7 | ||||
| -rw-r--r-- | package/boot/uboot-layerscape/Makefile | 3 | ||||
| -rw-r--r-- | package/firmware/fman-ucode/Makefile | 3 | ||||
| -rw-r--r-- | package/firmware/rcw/Makefile | 3 |
4 files changed, 10 insertions, 6 deletions
diff --git a/package/boot/uboot-layerscape-32b/Makefile b/package/boot/uboot-layerscape-32b/Makefile index 852c83a..cf56eed 100644 --- a/package/boot/uboot-layerscape-32b/Makefile +++ b/package/boot/uboot-layerscape-32b/Makefile @@ -42,9 +42,10 @@ define Build/Compile endef define Build/InstallDev - $(CP) $(PKG_BUILD_DIR)/ls1043ardb-uboot.bin $(KERNEL_BUILD_DIR)/ls1043ardb-32b-uboot.bin - $(CP) $(PKG_BUILD_DIR)/ls1046ardb-uboot.bin $(KERNEL_BUILD_DIR)/ls1046ardb-32b-uboot.bin - $(CP) $(PKG_BUILD_DIR)/ls1012ardb-uboot.bin.swap $(KERNEL_BUILD_DIR)/ls1012ardb-32b-uboot.bin + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) + $(CP) $(PKG_BUILD_DIR)/ls1043ardb-uboot.bin $(STAGING_DIR_IMAGE)/ls1043ardb-32b-uboot.bin + $(CP) $(PKG_BUILD_DIR)/ls1046ardb-uboot.bin $(STAGING_DIR_IMAGE)/ls1046ardb-32b-uboot.bin + $(CP) $(PKG_BUILD_DIR)/ls1012ardb-uboot.bin.swap $(STAGING_DIR_IMAGE)/ls1012ardb-32b-uboot.bin endef $(eval $(call BuildPackage,uboot-layerscape-32b)) diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile index f0ab726..ac3d7ab 100644 --- a/package/boot/uboot-layerscape/Makefile +++ b/package/boot/uboot-layerscape/Makefile @@ -49,7 +49,8 @@ UBOOT_TARGETS := \ ls1012ardb define Build/InstallDev - $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(KERNEL_BUILD_DIR)/$(BUILD_VARIANT)-64b-uboot.bin + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) + $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-64b-uboot.bin endef define Package/u-boot/install/default diff --git a/package/firmware/fman-ucode/Makefile b/package/firmware/fman-ucode/Makefile index 5a0238d..396750f 100644 --- a/package/firmware/fman-ucode/Makefile +++ b/package/firmware/fman-ucode/Makefile @@ -72,7 +72,8 @@ define Build/Compile endef define Package/fman/install/default - $(CP) $(PKG_BUILD_DIR)/$(FMAN_CONFIG) $(KDIR)/$(1)-fman.bin + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) + $(CP) $(PKG_BUILD_DIR)/$(FMAN_CONFIG) $(STAGING_DIR_IMAGE)/$(1)-fman.bin endef define Package/fman/install/template diff --git a/package/firmware/rcw/Makefile b/package/firmware/rcw/Makefile index d832e6e..bae9c95 100644 --- a/package/firmware/rcw/Makefile +++ b/package/firmware/rcw/Makefile @@ -81,7 +81,8 @@ define Build/Compile endef define Package/rcw/install/default - $(CP) $(PKG_BUILD_DIR)/$(RCW_CONFIG) $(KDIR)/$(1)-rcw.bin + $(INSTALL_DIR) $(STAGING_DIR_IMAGE) + $(CP) $(PKG_BUILD_DIR)/$(RCW_CONFIG) $(STAGING_DIR_IMAGE)/$(1)-rcw.bin endef define Package/rcw/install/template |