From 9cd2b23c2ea045b5832b3d838e29f4b6a1b6cdfb Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 28 Oct 2014 17:23:17 -0500 Subject: [PATCH] arm64: add malloc support to secmon In order to dynamically allocate structures based on affinity levels add malloc() support. BUG=chrome-os-partner:32136 BRANCH=None TEST=Built and booted to kernel. Change-Id: Ie1412a3a9eb07689059a2cd69bd111274bcb88fa Signed-off-by: Aaron Durbin Reviewed-on: https://chromium-review.googlesource.com/226482 Reviewed-by: Furquan Shaikh --- src/arch/arm64/Makefile.inc | 1 + src/arch/arm64/armv8/secmon/Makefile.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index ad064f360c..8f99a4628b 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -147,6 +147,7 @@ rmodules_arm64-y += ../../lib/memmove.c rmodules_arm64-y += eabi_compat.c secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += stage_entry.S +secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += ../../lib/malloc.c secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += ../../lib/memset.c secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += ../../lib/memcmp.c secmon-$(CONFIG_ARCH_USE_SECURE_MONITOR) += ../../lib/memcpy.c diff --git a/src/arch/arm64/armv8/secmon/Makefile.inc b/src/arch/arm64/armv8/secmon/Makefile.inc index 21fabee19e..430962ec8a 100644 --- a/src/arch/arm64/armv8/secmon/Makefile.inc +++ b/src/arch/arm64/armv8/secmon/Makefile.inc @@ -41,7 +41,7 @@ secmon-y += ../../transition_asm.S ../../transition.c ramstage-objs += $(SECMON_RAMSTAGE) -$(eval $(call rmodule_link,$(SECMON_ELF), $$$$(secmon-objs), 0,arm64)) +$(eval $(call rmodule_link,$(SECMON_ELF), $$$$(secmon-objs),8192,arm64)) $(SECMON_BIN): $(SECMON_RMOD) $(OBJCOPY_secmon) -O binary $< $@