From 9883ff708e300b93247b4463dc7dcf1681c32354 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 11 Oct 2022 17:02:10 +0300 Subject: [PATCH] configs/solidrun_{macchiatobin, clearfog_gt_8k}: disable SSP The Armada target does not provide platform level support for SSP. Fixes link failure: (.text.asm.update_stack_protector_canary+0x4): undefined reference to `plat_get_stack_protector_canary' This error does not show up on CI jobs because SSP was effectively always disabled until the previous commit. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- configs/solidrun_clearfog_gt_8k_defconfig | 1 + configs/solidrun_macchiatobin_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/solidrun_clearfog_gt_8k_defconfig b/configs/solidrun_clearfog_gt_8k_defconfig index bec4a7dacc..30b1e17925 100644 --- a/configs/solidrun_clearfog_gt_8k_defconfig +++ b/configs/solidrun_clearfog_gt_8k_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="mrvl_flash" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" +# BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set BR2_TARGET_BINARIES_MARVELL=y BR2_TARGET_MV_DDR_MARVELL=y diff --git a/configs/solidrun_macchiatobin_defconfig b/configs/solidrun_macchiatobin_defconfig index 7d06313b03..f388e37163 100644 --- a/configs/solidrun_macchiatobin_defconfig +++ b/configs/solidrun_macchiatobin_defconfig @@ -12,6 +12,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS="mrvl_flash" BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="USE_COHERENT_MEM=0" +# BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP is not set BR2_TARGET_BINARIES_MARVELL=y BR2_TARGET_MV_DDR_MARVELL=y