From daab00cf292a41ba1cd5bae0b0ce9d7a366734ac Mon Sep 17 00:00:00 2001
From: Chris Kay <chris.kay@arm.com>
Date: Tue, 3 Sep 2024 12:36:45 +0000
Subject: [PATCH] build: disable suffix rules globally

This change centralises the logic that disables the default suffix rules
that Make provides. These rules are a hold-over from legacy standards of
Make, and occasionally conflict with our rules.

Change-Id: I9e023edbc01b5ae48a96fa1078d0b81faabb0cb9
Signed-off-by: Chris Kay <chris.kay@arm.com>
---
 Makefile                                 | 1 -
 make_helpers/build-rules.mk              | 1 +
 plat/rockchip/rk3399/drivers/m0/Makefile | 2 --
 plat/st/common/common_rules.mk           | 1 -
 plat/st/stm32mp2/platform.mk             | 2 --
 5 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 3820ecc24..8e992595c 100644
--- a/Makefile
+++ b/Makefile
@@ -1503,7 +1503,6 @@ endif #(SPD)
 ################################################################################
 
 .PHONY:	all msg_start clean realclean distclean cscope locate-checkpatch checkcodebase checkpatch fiptool sptool fip sp tl fwu_fip certtool dtbs memmap doc enctool
-.SUFFIXES:
 
 all: msg_start
 
diff --git a/make_helpers/build-rules.mk b/make_helpers/build-rules.mk
index d325b3a81..959ff94b9 100644
--- a/make_helpers/build-rules.mk
+++ b/make_helpers/build-rules.mk
@@ -11,6 +11,7 @@ ifndef build-rules-mk
         include $(dir $(build-rules-mk))utilities.mk
 
         .SECONDEXPANSION:
+        .SUFFIXES:
 
         %/:
 		$(s)echo '  MD      '$(call escape-shell,$(abspath $@))
diff --git a/plat/rockchip/rk3399/drivers/m0/Makefile b/plat/rockchip/rk3399/drivers/m0/Makefile
index 32446efb0..7913190bb 100644
--- a/plat/rockchip/rk3399/drivers/m0/Makefile
+++ b/plat/rockchip/rk3399/drivers/m0/Makefile
@@ -17,8 +17,6 @@ ARCH		:= cortex-m0
 PLAT_M0		?= rk3399m0
 PLAT_M0_PMU	?= rk3399m0pmu
 
-.SUFFIXES:
-
 INCLUDES		+= -Iinclude/ \
 			   -I../../include/shared/
 
diff --git a/plat/st/common/common_rules.mk b/plat/st/common/common_rules.mk
index 9070a16a5..690507e48 100644
--- a/plat/st/common/common_rules.mk
+++ b/plat/st/common/common_rules.mk
@@ -6,7 +6,6 @@
 
 # Compilation rules
 .PHONY: check_dtc_version stm32image clean_stm32image check_boot_device
-.SUFFIXES:
 
 all: check_dtc_version stm32image ${STM32_TF_STM32}
 
diff --git a/plat/st/stm32mp2/platform.mk b/plat/st/stm32mp2/platform.mk
index f46165623..25ae5933d 100644
--- a/plat/st/stm32mp2/platform.mk
+++ b/plat/st/stm32mp2/platform.mk
@@ -204,8 +204,6 @@ BL31_SOURCES			+=	plat/common/plat_psci_common.c
 
 # Compilation rules
 .PHONY: check_ddr_type
-.SUFFIXES:
-
 bl2: check_ddr_type
 
 check_ddr_type: