diff --git a/script/tf-coverity/tf-cov-make b/script/tf-coverity/tf-cov-make
index b5f1f0d..a06d8ff 100755
--- a/script/tf-coverity/tf-cov-make
+++ b/script/tf-coverity/tf-cov-make
@@ -570,67 +570,66 @@
     RCAR_DRAM_SPLIT=2 RCAR_LOSSY_ENABLE=1 SPD=none
 
 # Platforms from ST
+stm32mp1_common_flags="$(common_flags) \
+		       ARCH=aarch32 \
+		       ARM_ARCH_MAJOR=7 \
+		       CROSS_COMPILE=arm-none-eabi- \
+		       ENABLE_STACK_PROTECTOR=strong \
+		       PLAT=stm32mp1"
+
+stm32mp13_common_flags="$(stm32mp1_common_flags) \
+			AARCH32_SP=optee \
+			STM32MP13=1"
+
 # STM32MP1 SDMMC boot
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_SDMMC=1 \
+make $(stm32mp1_common_flags) STM32MP_SDMMC=1 \
     BUILD_PLAT=build/stm32mp1-sdmmc/debug \
-    ARCH=aarch32 AARCH32_SP=sp_min ENABLE_STACK_PROTECTOR=strong bl2 bl32
+    AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 eMMC boot
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_EMMC=1 \
+make $(stm32mp1_common_flags) STM32MP_EMMC=1 \
     BUILD_PLAT=build/stm32mp1-emmc/debug \
-    ARCH=aarch32 AARCH32_SP=sp_min ENABLE_STACK_PROTECTOR=strong bl2 bl32
+    AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 Raw NAND boot
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_RAW_NAND=1 \
+make $(stm32mp1_common_flags) STM32MP_RAW_NAND=1 \
     BUILD_PLAT=build/stm32mp1-nand/debug \
-    ARCH=aarch32 AARCH32_SP=sp_min ENABLE_STACK_PROTECTOR=strong bl2 bl32
+    AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 SPI NAND boot
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_SPI_NAND=1 \
+make $(stm32mp1_common_flags) STM32MP_SPI_NAND=1 \
     BUILD_PLAT=build/stm32mp1-snand/debug \
-    ARCH=aarch32 AARCH32_SP=sp_min ENABLE_STACK_PROTECTOR=strong bl2 bl32
+    AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 SPI NOR boot
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_SPI_NOR=1 \
+make $(stm32mp1_common_flags) STM32MP_SPI_NOR=1 \
     BUILD_PLAT=build/stm32mp1-snor/debug \
-    ARCH=aarch32 AARCH32_SP=sp_min ENABLE_STACK_PROTECTOR=strong bl2 bl32
+    AARCH32_SP=sp_minbl2 bl32
 
 # STM32MP1 UART boot
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_UART_PROGRAMMER=1 \
+make $(stm32mp1_common_flags) STM32MP_UART_PROGRAMMER=1 \
     BUILD_PLAT=build/stm32mp1-uart/debug \
-    ARCH=aarch32 AARCH32_SP=sp_min ENABLE_STACK_PROTECTOR=strong bl2 bl32
+    AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 USB boot
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_USB_PROGRAMMER=1 \
+make $(stm32mp1_common_flags) STM32MP_USB_PROGRAMMER=1 \
     BUILD_PLAT=build/stm32mp1-usb/debug \
-    ARCH=aarch32 AARCH32_SP=sp_min ENABLE_STACK_PROTECTOR=strong bl2 bl32
+    AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP1 TBBR
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_SDMMC=1 \
+make $(stm32mp1_common_flags) STM32MP_SDMMC=1 \
     BUILD_PLAT=build/stm32mp1-sdmmc-tbbr/debug \
     MBEDTLS_DIR=$(pwd)/mbedtls TRUSTED_BOARD_BOOT=1 \
-    ARCH=aarch32 AARCH32_SP=sp_min ENABLE_STACK_PROTECTOR=strong bl2 bl32
+    AARCH32_SP=sp_min bl2 bl32
 
 # STM32MP13 SDMMC boot
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_SDMMC=1 \
-    BUILD_PLAT=build/stm32mp1-mp13-sdmmc/debug STM32MP13=1 \
-    ARCH=aarch32 AARCH32_SP=optee ENABLE_STACK_PROTECTOR=strong bl2
+make $(stm32mp13_common_flags) STM32MP_SDMMC=1 \
+    BUILD_PLAT=build/stm32mp1-mp13-sdmmc/debug bl2
 
 # STM32MP13 TBBR
-make PLAT=stm32mp1 CROSS_COMPILE=arm-none-eabi- \
-    $(common_flags) ARM_ARCH_MAJOR=7 STM32MP_SDMMC=1 \
-    BUILD_PLAT=build/stm32mp1-mp13-sdmmc-tbbr/debug STM32MP13=1 \
+make $(stm32mp13_common_flags) STM32MP_SDMMC=1 \
     MBEDTLS_DIR=$(pwd)/mbedtls TRUSTED_BOARD_BOOT=1 \
-    ARCH=aarch32 AARCH32_SP=optee ENABLE_STACK_PROTECTOR=strong bl2
+    BUILD_PLAT=build/stm32mp1-mp13-sdmmc-tbbr/debug bl2
 
 # Platforms from TI
 make PLAT=k3 $(common_flags) all