diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-10-18 23:05:00 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-12-20 15:23:01 +0100 |
| commit | 55b80d3bb92ebfe334ba4b2ba980c45d1d2f1c05 (patch) | |
| tree | 86120b5cf6d31b193173f1b15853c7e61d7be5f4 /linux | |
| parent | 4e793b82a557f9c0cb1c5897a750ef445e95c5d5 (diff) | |
linux: de-duplicate DTB and Linux image installation
Currently, the LINUX_INSTALL_DTB and LINUX_INSTALL_DTB_TARGET macros
are exactly the same, except for the target directory.
Similarly, LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET and
LINUX_INSTALL_IMAGES_CMDS are copying the kernel image, just to a
different place (and with a different strategy).
As a preparation for future additions, this commit de-duplicate this
code:
- LINUX_INSTALL_DTB becomes a make macro that takes one argument: the
destination directory.
- LINUX_INSTALL_IMAGE is a new make macro that also takes on
argument: the destination directory.
Both macros are used by LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET and
LINUX_INSTALL_IMAGES_CMDS to respectively install to the target
directory and the images directory.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/linux.mk | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/linux/linux.mk b/linux/linux.mk index f95bc5837..5d6791a39 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -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 |