From c0dceae4bbb3aab0c4fcaf229925e8916d286797 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 22 Jul 2016 14:04:16 +0200 Subject: [PATCH] build: minor cleanup of redundant code Signed-off-by: Felix Fietkau --- include/image-legacy.mk | 2 +- include/image.mk | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/image-legacy.mk b/include/image-legacy.mk index da8279c26341..9ace98fbe57e 100644 --- a/include/image-legacy.mk +++ b/include/image-legacy.mk @@ -36,7 +36,7 @@ endif LegacyDevice/Dump = $(Device/Dump) define LegacyDevice/Check - _PROFILE_SET = $$(strip $$(foreach profile,$$(PROFILES) DEVICE_$(1),$$(call DEVICE_CHECK_PROFILE,$$(profile)))) + $(Device/Check/Common) _TARGET_PREPARE := $$(if $$(_PROFILE_SET),legacy-images-prepare,prepare-disabled) _TARGET := $$(if $$(_PROFILE_SET),legacy-images,install-disabled) $$(if $$(_PROFILE_SET),install: legacy-images-make) diff --git a/include/image.mk b/include/image.mk index 8cc6a91373ab..5970e58e1aae 100644 --- a/include/image.mk +++ b/include/image.mk @@ -345,9 +345,13 @@ else DEVICE_CHECK_PROFILE = $(CONFIG_TARGET_$(if $(CONFIG_TARGET_MULTI_PROFILE),DEVICE_)$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_$(1)) endif +define Device/Check/Common + _PROFILE_SET = $$(strip $$(foreach profile,$$(PROFILES) DEVICE_$(1),$$(call DEVICE_CHECK_PROFILE,$$(profile)))) +endef + define Device/Check + $(Device/Check/Common) KDIR_KERNEL_IMAGE := $(KDIR)/$(1)$$(KERNEL_SUFFIX) - _PROFILE_SET = $$(strip $$(foreach profile,$$(PROFILES) DEVICE_$(1),$$(call DEVICE_CHECK_PROFILE,$$(profile)))) _TARGET := $$(if $$(_PROFILE_SET),install-images,install-disabled) ifndef IB _COMPILE_TARGET := $$(if $(CONFIG_IB)$$(_PROFILE_SET),compile,compile-disabled) -- 2.30.2