ARM: Add secure section for initialized data

The secure monitor may need to store global or static values within the
secure section of memory, such as target PC or CPU power status.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Chen-Yu Tsai 2016-07-05 21:45:06 +08:00 committed by Hans de Goede
parent afc1f65f50
commit a5aa7ff33a
3 changed files with 10 additions and 4 deletions

View file

@ -120,8 +120,8 @@ endif
ifdef CONFIG_ARM64 ifdef CONFIG_ARM64
OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .u_boot_list -j .rela.dyn OBJCOPYFLAGS += -j .text -j .rodata -j .data -j .u_boot_list -j .rela.dyn
else else
OBJCOPYFLAGS += -j .text -j .secure_text -j .rodata -j .hash -j .data -j \ OBJCOPYFLAGS += -j .text -j .secure_text -j .secure_data -j .rodata -j .hash \
.got -j .got.plt -j .u_boot_list -j .rel.dyn -j .data -j .got -j .got.plt -j .u_boot_list -j .rel.dyn
endif endif
ifdef CONFIG_OF_EMBED ifdef CONFIG_OF_EMBED

View file

@ -69,12 +69,17 @@ SECTIONS
*(._secure.text) *(._secure.text)
} }
.secure_stack ALIGN(ADDR(.secure_text) + SIZEOF(.secure_text), .secure_data : AT(LOADADDR(.secure_text) + SIZEOF(.secure_text))
{
*(._secure.data)
}
.secure_stack ALIGN(ADDR(.secure_data) + SIZEOF(.secure_data),
CONSTANT(COMMONPAGESIZE)) (NOLOAD) : CONSTANT(COMMONPAGESIZE)) (NOLOAD) :
#ifdef __ARMV7_PSCI_STACK_IN_RAM #ifdef __ARMV7_PSCI_STACK_IN_RAM
AT(ADDR(.secure_stack)) AT(ADDR(.secure_stack))
#else #else
AT(LOADADDR(.secure_text) + SIZEOF(.secure_text)) AT(LOADADDR(.secure_data) + SIZEOF(.secure_data))
#endif #endif
{ {
KEEP(*(.__secure_stack_start)) KEEP(*(.__secure_stack_start))

View file

@ -4,6 +4,7 @@
#include <config.h> #include <config.h>
#define __secure __attribute__ ((section ("._secure.text"))) #define __secure __attribute__ ((section ("._secure.text")))
#define __secure_data __attribute__ ((section ("._secure.data")))
#ifdef CONFIG_ARMV7_SECURE_BASE #ifdef CONFIG_ARMV7_SECURE_BASE
/* /*