Commit 415d7dd8 authored by Grant Likely's avatar Grant Likely
Browse files

Move delegate targets into the else clause of 'if $config-targets'



For consistency, and to prevent calling into build targets when doing
config operations, move all the delegate build targets into the else
clause of the $config-targets if/else/endif block.

Signed-off-by: Grant Likely's avatarGrant Likely <grant.likely@arm.com>
parent 9d7bc2ce
...@@ -240,11 +240,6 @@ TFA_EXTRA += SPD=opteed ...@@ -240,11 +240,6 @@ TFA_EXTRA += SPD=opteed
tfa/all tfa/fip: optee_os/all tfa/all tfa/fip: optee_os/all
# ================================================
# Delegate optee targets to optee Makefile
optee_os/%:
${MAKE} -C ${OPTEE_PATH} ${OPTEE_EXTRA} $*
endif # ifeq($(CONFIG_OPTEE),y) endif # ifeq($(CONFIG_OPTEE),y)
# Default Trusted Firmware configuration settings # Default Trusted Firmware configuration settings
...@@ -279,8 +274,6 @@ clean: u-boot/clean tfa/distclean devicetree/clean optee_os/clean edk2-clean ...@@ -279,8 +274,6 @@ clean: u-boot/clean tfa/distclean devicetree/clean optee_os/clean edk2-clean
mrproper: u-boot/mrproper tfa/distclean devicetree/clean optee_os/clean mrproper: u-boot/mrproper tfa/distclean devicetree/clean optee_os/clean
distclean: u-boot/distclean tfa/distclean devicetree/clean optee_os/clean distclean: u-boot/distclean tfa/distclean devicetree/clean optee_os/clean
endif #ifeq ($(config-targets),1)
# =========================================================================== # ===========================================================================
# Common targets - Mostly delegates to the individual project build systems # Common targets - Mostly delegates to the individual project build systems
...@@ -291,15 +284,16 @@ devicetree/%: ...@@ -291,15 +284,16 @@ devicetree/%:
${MAKE} -C ${DT_PATH} $* ${MAKE} -C ${DT_PATH} $*
# ================================================ # ================================================
# Delegate to op-tee clean target
optee_os/clean:
${MAKE} -C ${OPTEE_PATH} clean
# EDK2 Targets # EDK2 Targets
PHONY += edk2-clean PHONY += edk2-clean
edk2-clean: edk2-clean:
rm -rf $(EDK2_OUTPUT) rm -rf $(EDK2_OUTPUT)
# ================================================
# Delegate optee targets to optee Makefile
optee_os/%:
${MAKE} -C ${OPTEE_PATH} ${OPTEE_EXTRA} $*
# ================================================ # ================================================
# Delegate to trusted-firmware-a build # Delegate to trusted-firmware-a build
tfa/%: tfa/%:
...@@ -307,8 +301,12 @@ tfa/%: ...@@ -307,8 +301,12 @@ tfa/%:
tfa/all tfa/fip: u-boot/all tfa/all tfa/fip: u-boot/all
endif #ifeq,else ($(config-targets),1)
# ================================================ # ================================================
# Delegate to u-boot build # Delegate to u-boot build
# (This target is outside the $(config-targets) 'else'
# clause so that u-boot/%config targets can use it)
u-boot/%: u-boot/%:
$(MAKE) -C $(UBOOT_PATH) $(UBOOT_EXTRA) $* $(MAKE) -C $(UBOOT_PATH) $(UBOOT_EXTRA) $*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment