diff options
| author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2020-08-25 15:09:26 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-08-25 15:09:26 +0000 |
| commit | 3e1e08b79925f4acba5a900f6a6fea1b73648806 (patch) | |
| tree | 5bc5818abbf5e30ef83ac3d3ffe9f9004a04d636 /plat/nvidia | |
| parent | 0d5caf958cff06e3ea860c70cbb7c3b2cb9a6948 (diff) | |
| parent | 670306d340487ff5109c768a7dba1276cd9b28a9 (diff) | |
| download | arm-trusted-firmware-3e1e08b79925f4acba5a900f6a6fea1b73648806.tar.gz | |
Merge changes from topic "tegra194-spmd" into integration
* changes:
Tegra194: introduce support for `SPD=spmd`
Tegra: introduce backend support to compile libfdt
Tegra: disable signed comparison
plat: common: include "bl_common.h" from plat_spmd_manifest.c
Diffstat (limited to 'plat/nvidia')
| -rw-r--r-- | plat/nvidia/tegra/platform.mk | 11 | ||||
| -rw-r--r-- | plat/nvidia/tegra/soc/t194/platform_t194.mk | 10 |
2 files changed, 17 insertions, 4 deletions
diff --git a/plat/nvidia/tegra/platform.mk b/plat/nvidia/tegra/platform.mk index a4724e64b..abe94e4d2 100644 --- a/plat/nvidia/tegra/platform.mk +++ b/plat/nvidia/tegra/platform.mk @@ -55,27 +55,30 @@ ENABLE_STACK_PROTECTOR := strong # Enable SDEI SDEI_SUPPORT := 1 +# modify BUILD_PLAT to point to SoC specific build directory +BUILD_PLAT := ${BUILD_BASE}/${PLAT}/${TARGET_SOC}/${BUILD_TYPE} + include plat/nvidia/tegra/common/tegra_common.mk include ${SOC_DIR}/platform_${TARGET_SOC}.mk $(eval $(call add_define,ENABLE_TEGRA_WDT_LEGACY_FIQ_HANDLING)) $(eval $(call add_define,RELOCATE_BL32_IMAGE)) -# modify BUILD_PLAT to point to SoC specific build directory -BUILD_PLAT := $(abspath ${BUILD_BASE})/${PLAT}/${TARGET_SOC}/${BUILD_TYPE} - # platform cflags (enable signed comparisons, disable stdlib) -TF_CFLAGS += -Wsign-compare -nostdlib +TF_CFLAGS += -nostdlib # override with necessary libc files for the Tegra platform override LIBC_SRCS := $(addprefix lib/libc/, \ aarch64/setjmp.S \ assert.c \ + memchr.c \ + memcmp.c \ memcpy.c \ memmove.c \ memset.c \ printf.c \ putchar.c \ + strrchr.c \ strlen.c \ snprintf.c) diff --git a/plat/nvidia/tegra/soc/t194/platform_t194.mk b/plat/nvidia/tegra/soc/t194/platform_t194.mk index 7573ed23b..9705a7fe4 100644 --- a/plat/nvidia/tegra/soc/t194/platform_t194.mk +++ b/plat/nvidia/tegra/soc/t194/platform_t194.mk @@ -70,3 +70,13 @@ BL31_SOURCES += lib/extensions/ras/std_err_record.c \ lib/extensions/ras/ras_common.c \ ${SOC_DIR}/plat_ras.c endif + +# SPM dispatcher +ifeq (${SPD},spmd) +# include device tree helper library +include lib/libfdt/libfdt.mk +# sources to support spmd +BL31_SOURCES += plat/common/plat_spmd_manifest.c \ + common/fdt_wrappers.c \ + ${LIBFDT_SRCS} +endif |