diff --git a/package/boot/uboot-layerscape-32b/Makefile b/package/boot/uboot-layerscape-32b/Makefile
index 852c83a929dec3105b013fb8729051985d1db9ab..cf56eedd30eb666ff87b867d899ab30f512678ea 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 f0ab72653458c0b450f45d0bf7d667e7c33e8c32..ac3d7aba8620d6ccc7be230b65f640423d2d5e92 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 5a0238dee24cc9b5ce2b50e93bbec565fbae18b8..396750f804713f6037ff0f96349550f7a9c7b0aa 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 d832e6e5d70e16a6b74b175a2404ce1453b4268f..bae9c95b6cc4870598f94b65c105d2638ec074af 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
diff --git a/target/linux/layerscape/image/Makefile b/target/linux/layerscape/image/Makefile
index 341d5fbda0b8f7dfa3f62b08bebc9c0c77238cb3..107a3e6eed1b625e7844c4354637d21a67d51a76 100644
--- a/target/linux/layerscape/image/Makefile
+++ b/target/linux/layerscape/image/Makefile
@@ -9,15 +9,15 @@ include $(INCLUDE_DIR)/image.mk
 
 define Build/append-ls-rcw
 	rm -f $@
-	dd if=$(KDIR)/$(1)-rcw.bin >> $@
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-rcw.bin >> $@
 endef
 
 define Build/append-ls-uboot
-	dd if=$(KDIR)/$(1)-$(SUBTARGET)-uboot.bin >> $@
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-$(SUBTARGET)-uboot.bin >> $@
 endef
 
 define Build/append-ls-fman
-	dd if=$(KDIR)/$(1)-fman.bin >> $@
+	dd if=$(STAGING_DIR_IMAGE)/$(1)-fman.bin >> $@
 endef
 
 define Build/append-ls-dtb