|
@@ -262,14 +262,7 @@ define LINUX_INSTALL_DTB
|
|
|
cp $(addprefix \
|
|
|
$(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
|
|
|
$(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
|
|
|
- $(BINARIES_DIR)/
|
|
|
-endef
|
|
|
-define LINUX_INSTALL_DTB_TARGET
|
|
|
- # dtbs moved from arch/<ARCH>/boot to arch/<ARCH>/boot/dts since 3.8-rc1
|
|
|
- cp $(addprefix \
|
|
|
- $(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \
|
|
|
- $(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \
|
|
|
- $(TARGET_DIR)/boot/
|
|
|
+ $(1)
|
|
|
endef
|
|
|
endif
|
|
|
endif
|
|
@@ -310,11 +303,14 @@ define LINUX_BUILD_CMDS
|
|
|
$(LINUX_APPEND_DTB)
|
|
|
endef
|
|
|
|
|
|
+define LINUX_INSTALL_IMAGE
|
|
|
+ $(INSTALL) -m 0644 -D $(LINUX_IMAGE_PATH) $(1)/$(LINUX_IMAGE_NAME)
|
|
|
+endef
|
|
|
|
|
|
ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y)
|
|
|
define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET
|
|
|
- install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
|
|
|
- $(LINUX_INSTALL_DTB_TARGET)
|
|
|
+ $(call LINUX_INSTALL_IMAGE,$(TARGET_DIR)/boot)
|
|
|
+ $(call LINUX_INSTALL_DTB,$(TARGET_DIR)/boot)
|
|
|
endef
|
|
|
endif
|
|
|
|
|
@@ -328,8 +324,8 @@ endef
|
|
|
|
|
|
|
|
|
define LINUX_INSTALL_IMAGES_CMDS
|
|
|
- cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
|
|
|
- $(LINUX_INSTALL_DTB)
|
|
|
+ $(call LINUX_INSTALL_IMAGE,$(BINARIES_DIR))
|
|
|
+ $(call LINUX_INSTALL_DTB,$(BINARIES_DIR))
|
|
|
endef
|
|
|
|
|
|
define LINUX_INSTALL_TARGET_CMDS
|