aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2014-05-01 14:53:06 +0100
committerSandrine Bailleux <sandrine.bailleux@arm.com>2014-06-04 15:37:36 +0100
commitd3c10e6c4471a276e784b88e2c4c0e563753ba4f (patch)
tree3131e5258c98abcea9f6c6d2954dec819ebd3260
parent2b80760dbe6e6717bfcf1bd7d0d842d096a4cc72 (diff)
downloadarm-trusted-firmware-d3c10e6c4471a276e784b88e2c4c0e563753ba4f.tar.gz
juno: Fix build further to changes on UP/MP stacks
These changes are necessary because of commit 2bf28e620a6. Change-Id: I3e42e97638fe895c885bcbf44392a899284956f8
-rw-r--r--plat/juno/aarch64/plat_common.c4
-rw-r--r--plat/juno/platform.h11
-rw-r--r--plat/juno/platform.mk3
3 files changed, 13 insertions, 5 deletions
diff --git a/plat/juno/aarch64/plat_common.c b/plat/juno/aarch64/plat_common.c
index cd64598..280122d 100644
--- a/plat/juno/aarch64/plat_common.c
+++ b/plat/juno/aarch64/plat_common.c
@@ -33,10 +33,6 @@
#include <xlat_tables.h>
#include <assert.h>
-unsigned char platform_normal_stacks[PLATFORM_STACK_SIZE][PLATFORM_CORE_COUNT]
-__attribute__ ((aligned(PLATFORM_CACHE_LINE_SIZE),
- section("tzfw_normal_stacks")));
-
void enable_mmu()
{
diff --git a/plat/juno/platform.h b/plat/juno/platform.h
index fcf63b7..aa46366 100644
--- a/plat/juno/platform.h
+++ b/plat/juno/platform.h
@@ -47,7 +47,16 @@
/*******************************************************************************
* Generic platform constants
******************************************************************************/
-#define PLATFORM_STACK_SIZE 0x800
+
+/* Size of cacheable stacks */
+#define PLATFORM_STACK_SIZE 0x800
+
+/* Size of coherent stacks for debug and release builds */
+#if DEBUG
+#define PCPU_DV_MEM_STACK_SIZE 0x400
+#else
+#define PCPU_DV_MEM_STACK_SIZE 0x300
+#endif
#define FIRMWARE_WELCOME_STR "Booting trusted firmware boot loader stage 1\n\r"
diff --git a/plat/juno/platform.mk b/plat/juno/platform.mk
index d74b6eb..3e705b8 100644
--- a/plat/juno/platform.mk
+++ b/plat/juno/platform.mk
@@ -63,11 +63,13 @@ PLAT_BL_COMMON_SOURCES := mmio.c \
BL1_SOURCES += bl1_plat_setup.c \
bl1_plat_helpers.S \
plat_helpers.S \
+ platform_up_stack.S \
plat_common.c \
cci400.c
BL2_SOURCES += bakery_lock.c \
bl2_plat_setup.c \
+ platform_up_stack.S \
mhu.c \
plat_helpers.S \
plat_common.c \
@@ -77,6 +79,7 @@ BL2_SOURCES += bakery_lock.c \
BL31_SOURCES += bl31_plat_setup.c \
mhu.c \
plat_helpers.S \
+ platform_mp_stack.S \
plat_common.c \
plat_pm.c \
plat_topology.c \