mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-24 22:05:40 +00:00
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
This commit is contained in:
commit
3e1e08b799
3 changed files with 18 additions and 4 deletions
|
@ -9,6 +9,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <libfdt.h>
|
#include <libfdt.h>
|
||||||
|
|
||||||
|
#include <common/bl_common.h>
|
||||||
#include <common/debug.h>
|
#include <common/debug.h>
|
||||||
#include <common/fdt_wrappers.h>
|
#include <common/fdt_wrappers.h>
|
||||||
#include <lib/xlat_tables/xlat_tables_v2.h>
|
#include <lib/xlat_tables/xlat_tables_v2.h>
|
||||||
|
|
|
@ -55,27 +55,30 @@ ENABLE_STACK_PROTECTOR := strong
|
||||||
# Enable SDEI
|
# Enable SDEI
|
||||||
SDEI_SUPPORT := 1
|
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 plat/nvidia/tegra/common/tegra_common.mk
|
||||||
include ${SOC_DIR}/platform_${TARGET_SOC}.mk
|
include ${SOC_DIR}/platform_${TARGET_SOC}.mk
|
||||||
|
|
||||||
$(eval $(call add_define,ENABLE_TEGRA_WDT_LEGACY_FIQ_HANDLING))
|
$(eval $(call add_define,ENABLE_TEGRA_WDT_LEGACY_FIQ_HANDLING))
|
||||||
$(eval $(call add_define,RELOCATE_BL32_IMAGE))
|
$(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)
|
# 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 with necessary libc files for the Tegra platform
|
||||||
override LIBC_SRCS := $(addprefix lib/libc/, \
|
override LIBC_SRCS := $(addprefix lib/libc/, \
|
||||||
aarch64/setjmp.S \
|
aarch64/setjmp.S \
|
||||||
assert.c \
|
assert.c \
|
||||||
|
memchr.c \
|
||||||
|
memcmp.c \
|
||||||
memcpy.c \
|
memcpy.c \
|
||||||
memmove.c \
|
memmove.c \
|
||||||
memset.c \
|
memset.c \
|
||||||
printf.c \
|
printf.c \
|
||||||
putchar.c \
|
putchar.c \
|
||||||
|
strrchr.c \
|
||||||
strlen.c \
|
strlen.c \
|
||||||
snprintf.c)
|
snprintf.c)
|
||||||
|
|
||||||
|
|
|
@ -70,3 +70,13 @@ BL31_SOURCES += lib/extensions/ras/std_err_record.c \
|
||||||
lib/extensions/ras/ras_common.c \
|
lib/extensions/ras/ras_common.c \
|
||||||
${SOC_DIR}/plat_ras.c
|
${SOC_DIR}/plat_ras.c
|
||||||
endif
|
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
|
||||||
|
|
Loading…
Add table
Reference in a new issue