From 13ff6e9ddec2f447953ed48b3a9cb99dfc8a3523 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 12 Sep 2023 15:26:42 +0200 Subject: [PATCH] chore: remove MULTI_CONSOLE_API references MULTI_CONSOLE_API have been removed long time ago by commit 5b6ebeec9c99 ("Remove MULTI_CONSOLE_API flag and references to it") that's why remove references in platform.mk files and also in one rst which is not valid anymore. Change-Id: I45f8e7db0a14ce63de62509100d8159b7aca2657 Signed-off-by: Michal Simek --- docs/plat/rpi3.rst | 5 ----- plat/arm/board/a5ds/platform.mk | 2 -- plat/imx/imx7/picopi/platform.mk | 1 - plat/intel/soc/agilex/platform.mk | 1 - plat/intel/soc/agilex5/platform.mk | 1 - plat/intel/soc/n5x/platform.mk | 1 - plat/mediatek/common/common_config.mk | 1 - plat/mediatek/mt8173/platform.mk | 2 -- plat/mediatek/mt8183/platform.mk | 2 -- plat/qemu/qemu_sbsa/platform.mk | 1 - plat/qti/sc7180/platform.mk | 2 -- plat/qti/sc7280/platform.mk | 2 -- plat/renesas/common/common.mk | 1 - plat/rockchip/px30/platform.mk | 1 - plat/rockchip/rk3288/platform.mk | 2 -- 15 files changed, 25 deletions(-) diff --git a/docs/plat/rpi3.rst b/docs/plat/rpi3.rst index 38c3dfa82..5d97a88fc 100644 --- a/docs/plat/rpi3.rst +++ b/docs/plat/rpi3.rst @@ -296,11 +296,6 @@ The following is not currently supported: address by changing the file ``armstub8.bin``, so there's no point in using TF-A in this case. -- ``MULTI_CONSOLE_API=0``: The multi console API must be enabled. Note that the - crash console uses the internal 16550 driver functions directly in order to be - able to print error messages during early crashes before setting up the - multi console API. - Building the firmware for kernels that don't support PSCI ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/plat/arm/board/a5ds/platform.mk b/plat/arm/board/a5ds/platform.mk index 3ed7a6374..dd82a1035 100644 --- a/plat/arm/board/a5ds/platform.mk +++ b/plat/arm/board/a5ds/platform.mk @@ -102,8 +102,6 @@ ifeq (${AARCH32_SP},none) $(error Variable AARCH32_SP has to be set for AArch32) endif -MULTI_CONSOLE_API := 1 - ARM_DISABLE_TRUSTED_WDOG := 1 PLAT_BL_COMMON_SOURCES += lib/xlat_tables/aarch32/nonlpae_tables.c diff --git a/plat/imx/imx7/picopi/platform.mk b/plat/imx/imx7/picopi/platform.mk index 0267a8b25..c59967547 100644 --- a/plat/imx/imx7/picopi/platform.mk +++ b/plat/imx/imx7/picopi/platform.mk @@ -34,7 +34,6 @@ SEPARATE_CODE_AND_RODATA := 1 USE_COHERENT_MEM := 1 # Use multi console API -MULTI_CONSOLE_API := 1 PLAT_PICOPI_UART :=5 $(eval $(call add_define,PLAT_PICOPI_UART)) diff --git a/plat/intel/soc/agilex/platform.mk b/plat/intel/soc/agilex/platform.mk index e9fa666a5..5c92f7255 100644 --- a/plat/intel/soc/agilex/platform.mk +++ b/plat/intel/soc/agilex/platform.mk @@ -79,5 +79,4 @@ BL31_SOURCES += \ PROGRAMMABLE_RESET_ADDRESS := 0 RESET_TO_BL2 := 1 BL2_INV_DCACHE := 0 -MULTI_CONSOLE_API := 1 USE_COHERENT_MEM := 1 diff --git a/plat/intel/soc/agilex5/platform.mk b/plat/intel/soc/agilex5/platform.mk index 779c62984..546bc2e72 100644 --- a/plat/intel/soc/agilex5/platform.mk +++ b/plat/intel/soc/agilex5/platform.mk @@ -104,4 +104,3 @@ $(eval $(call add_define,ARM_PRELOADED_DTB_BASE)) PROGRAMMABLE_RESET_ADDRESS := 0 RESET_TO_BL2 := 1 BL2_INV_DCACHE := 0 -MULTI_CONSOLE_API := 1 diff --git a/plat/intel/soc/n5x/platform.mk b/plat/intel/soc/n5x/platform.mk index 7afeb7474..95f076fab 100644 --- a/plat/intel/soc/n5x/platform.mk +++ b/plat/intel/soc/n5x/platform.mk @@ -49,5 +49,4 @@ BL31_SOURCES += \ PROGRAMMABLE_RESET_ADDRESS := 0 RESET_TO_BL2 := 1 BL2_INV_DCACHE := 0 -MULTI_CONSOLE_API := 1 USE_COHERENT_MEM := 1 diff --git a/plat/mediatek/common/common_config.mk b/plat/mediatek/common/common_config.mk index 31a61e020..300242bd5 100644 --- a/plat/mediatek/common/common_config.mk +++ b/plat/mediatek/common/common_config.mk @@ -6,7 +6,6 @@ # indicate the reset vector address can be programmed PROGRAMMABLE_RESET_ADDRESS := 1 -MULTI_CONSOLE_API := 1 COLD_BOOT_SINGLE_CPU := 1 # Build flag to include AArch32 registers in cpu context save and restore during # world switch. This flag must be set to 0 for AArch64-only platforms. diff --git a/plat/mediatek/mt8173/platform.mk b/plat/mediatek/mt8173/platform.mk index 6bf1aa735..4d5a100f1 100644 --- a/plat/mediatek/mt8173/platform.mk +++ b/plat/mediatek/mt8173/platform.mk @@ -71,5 +71,3 @@ $(eval $(call add_define,MTK_SIP_SET_AUTHORIZED_SECURE_REG_ENABLE)) # Do not enable SVE ENABLE_SVE_FOR_NS := 0 - -MULTI_CONSOLE_API := 1 diff --git a/plat/mediatek/mt8183/platform.mk b/plat/mediatek/mt8183/platform.mk index a737d24b8..55c49ff9c 100644 --- a/plat/mediatek/mt8183/platform.mk +++ b/plat/mediatek/mt8183/platform.mk @@ -81,8 +81,6 @@ PROGRAMMABLE_RESET_ADDRESS := 1 COLD_BOOT_SINGLE_CPU := 1 -MULTI_CONSOLE_API := 1 - MACH_MT8183 := 1 $(eval $(call add_define,MACH_MT8183)) diff --git a/plat/qemu/qemu_sbsa/platform.mk b/plat/qemu/qemu_sbsa/platform.mk index 4a8df46fc..1b147cee0 100644 --- a/plat/qemu/qemu_sbsa/platform.mk +++ b/plat/qemu/qemu_sbsa/platform.mk @@ -7,7 +7,6 @@ PLAT_QEMU_PATH := plat/qemu/qemu_sbsa PLAT_QEMU_COMMON_PATH := plat/qemu/common -MULTI_CONSOLE_API := 1 CRASH_REPORTING := 1 # Disable the PSCI platform compatibility layer diff --git a/plat/qti/sc7180/platform.mk b/plat/qti/sc7180/platform.mk index 41a08ca30..b576649df 100644 --- a/plat/qti/sc7180/platform.mk +++ b/plat/qti/sc7180/platform.mk @@ -32,8 +32,6 @@ PROGRAMMABLE_RESET_ADDRESS := 1 RESET_TO_BL31 := 0 -MULTI_CONSOLE_API := 1 - QTI_SDI_BUILD := 0 $(eval $(call assert_boolean,QTI_SDI_BUILD)) $(eval $(call add_define,QTI_SDI_BUILD)) diff --git a/plat/qti/sc7280/platform.mk b/plat/qti/sc7280/platform.mk index 528a1d441..3d7d72883 100644 --- a/plat/qti/sc7280/platform.mk +++ b/plat/qti/sc7280/platform.mk @@ -35,8 +35,6 @@ PROGRAMMABLE_RESET_ADDRESS := 1 RESET_TO_BL31 := 0 -MULTI_CONSOLE_API := 1 - QTI_SDI_BUILD := 0 $(eval $(call assert_boolean,QTI_SDI_BUILD)) $(eval $(call add_define,QTI_SDI_BUILD)) diff --git a/plat/renesas/common/common.mk b/plat/renesas/common/common.mk index 25fbb2f84..f769be711 100644 --- a/plat/renesas/common/common.mk +++ b/plat/renesas/common/common.mk @@ -12,7 +12,6 @@ RESET_TO_BL31 := 1 GENERATE_COT := 1 RESET_TO_BL2 := 1 ENABLE_SVE_FOR_NS := 0 -MULTI_CONSOLE_API := 1 CRASH_REPORTING := 1 HANDLE_EA_EL3_FIRST_NS := 1 diff --git a/plat/rockchip/px30/platform.mk b/plat/rockchip/px30/platform.mk index d14ffc4d6..72e12b10c 100644 --- a/plat/rockchip/px30/platform.mk +++ b/plat/rockchip/px30/platform.mk @@ -64,7 +64,6 @@ BL31_SOURCES += ${RK_PLAT_COMMON}/drivers/parameter/ddr_parameter.c endif ENABLE_PLAT_COMPAT := 0 -MULTI_CONSOLE_API := 1 include lib/libfdt/libfdt.mk diff --git a/plat/rockchip/rk3288/platform.mk b/plat/rockchip/rk3288/platform.mk index e6f78cfb8..fec4ebb03 100644 --- a/plat/rockchip/rk3288/platform.mk +++ b/plat/rockchip/rk3288/platform.mk @@ -56,8 +56,6 @@ BL32_SOURCES += ${RK_GIC_SOURCES} \ ${RK_PLAT_SOC}/drivers/secure/secure.c \ ${RK_PLAT_SOC}/drivers/soc/soc.c \ -MULTI_CONSOLE_API := 1 - include lib/coreboot/coreboot.mk include lib/libfdt/libfdt.mk