diff options
Diffstat (limited to 'plat/rpi/rpi4/platform.mk')
-rw-r--r-- | plat/rpi/rpi4/platform.mk | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/plat/rpi/rpi4/platform.mk b/plat/rpi/rpi4/platform.mk index 99d51fb29b..f17911fecf 100644 --- a/plat/rpi/rpi4/platform.mk +++ b/plat/rpi/rpi4/platform.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2013-2024, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -15,16 +15,18 @@ PLAT_INCLUDES := -Iplat/rpi/common/include \ PLAT_BL_COMMON_SOURCES := drivers/ti/uart/aarch64/16550_console.S \ drivers/arm/pl011/aarch64/pl011_console.S \ plat/rpi/common/rpi3_common.c \ + plat/rpi/common/rpi3_console_dual.c \ ${XLAT_TABLES_LIB_SRCS} BL31_SOURCES += lib/cpus/aarch64/cortex_a72.S \ plat/rpi/common/aarch64/plat_helpers.S \ - plat/rpi/rpi4/aarch64/armstub8_header.S \ + plat/rpi/common/aarch64/armstub8_header.S \ drivers/delay_timer/delay_timer.c \ drivers/gpio/gpio.c \ drivers/rpi3/gpio/rpi3_gpio.c \ plat/common/plat_gicv2.c \ - plat/rpi/rpi4/rpi4_bl31_setup.c \ + plat/rpi/common/rpi4_bl31_setup.c \ + plat/rpi/rpi4/rpi4_setup.c \ plat/rpi/common/rpi3_pm.c \ plat/common/plat_psci_common.c \ plat/rpi/common/rpi3_topology.c \ @@ -39,9 +41,9 @@ RESET_TO_BL31 := 1 COLD_BOOT_SINGLE_CPU := 0 # Tune compiler for Cortex-A72 -ifeq ($(notdir $(CC)),armclang) +ifeq ($($(ARCH)-cc-id),arm-clang) TF_CFLAGS_aarch64 += -mcpu=cortex-a72 -else ifneq ($(findstring clang,$(notdir $(CC))),) +else ifneq ($(filter %-clang,$($(ARCH)-cc-id)),) TF_CFLAGS_aarch64 += -mcpu=cortex-a72 else TF_CFLAGS_aarch64 += -mtune=cortex-a72 @@ -86,6 +88,9 @@ RPI3_RUNTIME_UART := 0 # Use normal memory mapping for ROM, FIP, SRAM and DRAM RPI3_USE_UEFI_MAP := 0 +# SMCCC PCI support (should be enabled for ACPI builds) +SMC_PCI_SUPPORT := 0 + # Process platform flags # ---------------------- @@ -96,6 +101,7 @@ $(eval $(call add_define,RPI3_PRELOADED_DTB_BASE)) endif $(eval $(call add_define,RPI3_RUNTIME_UART)) $(eval $(call add_define,RPI3_USE_UEFI_MAP)) +$(eval $(call add_define,SMC_PCI_SUPPORT)) ifeq (${ARCH},aarch32) $(error Error: AArch32 not supported on rpi4) @@ -105,3 +111,7 @@ ifneq ($(ENABLE_STACK_PROTECTOR), 0) PLAT_BL_COMMON_SOURCES += drivers/rpi3/rng/rpi3_rng.c \ plat/rpi/common/rpi3_stack_protector.c endif + +ifeq ($(SMC_PCI_SUPPORT), 1) +BL31_SOURCES += plat/rpi/rpi4/rpi4_pci_svc.c +endif |