EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

layerscape: put u-boot and ucode images into image staging directory

Browse Source 
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>
This commit is contained in:
Jo-Philipp Wich 2017-01-27 16:06:31 +01:00
parent 237bd36135
commit c6502ce3bb
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/boot/uboot-layerscape-32b/Makefile
View File

@ -42,9 +42,10 @@ define Build/Compile
endef endef
define Build/InstallDev define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/ls1043ardb-uboot.bin $(KERNEL_BUILD_DIR)/ls1043ardb-32b-uboot.bin $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(CP) $(PKG_BUILD_DIR)/ls1046ardb-uboot.bin $(KERNEL_BUILD_DIR)/ls1046ardb-32b-uboot.bin $(CP) $(PKG_BUILD_DIR)/ls1043ardb-uboot.bin $(STAGING_DIR_IMAGE)/ls1043ardb-32b-uboot.bin
$(CP) $(PKG_BUILD_DIR)/ls1012ardb-uboot.bin.swap $(KERNEL_BUILD_DIR)/ls1012ardb-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 endef
$(eval $(call BuildPackage,uboot-layerscape-32b)) $(eval $(call BuildPackage,uboot-layerscape-32b))

3
package/boot/uboot-layerscape/Makefile
View File

@ -49,7 +49,8 @@ UBOOT_TARGETS := \
ls1012ardb ls1012ardb
define Build/InstallDev 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 endef
define Package/u-boot/install/default define Package/u-boot/install/default

3
package/firmware/fman-ucode/Makefile
View File

@ -72,7 +72,8 @@ define Build/Compile
endef endef
define Package/fman/install/default 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 endef
define Package/fman/install/template define Package/fman/install/template

3
package/firmware/rcw/Makefile
View File

@ -81,7 +81,8 @@ define Build/Compile
endef endef
define Package/rcw/install/default 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 endef
define Package/rcw/install/template define Package/rcw/install/template

6
target/linux/layerscape/image/Makefile
View File

@ -9,15 +9,15 @@ include $(INCLUDE_DIR)/image.mk
define Build/append-ls-rcw define Build/append-ls-rcw
rm -f $@ rm -f $@
dd if=$(KDIR)/$(1)-rcw.bin >> $@ dd if=$(STAGING_DIR_IMAGE)/$(1)-rcw.bin >> $@
endef endef
define Build/append-ls-uboot define Build/append-ls-uboot
dd if=$(KDIR)/$(1)-$(SUBTARGET)-uboot.bin >> $@ dd if=$(STAGING_DIR_IMAGE)/$(1)-$(SUBTARGET)-uboot.bin >> $@
endef endef
define Build/append-ls-fman define Build/append-ls-fman
dd if=$(KDIR)/$(1)-fman.bin >> $@ dd if=$(STAGING_DIR_IMAGE)/$(1)-fman.bin >> $@
endef endef
define Build/append-ls-dtb define Build/append-ls-dtb