V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARMv8/sec-firmware: fix a compile error 

When enabled sec firmware framework, but lack of definition of
the marco SEC_FIRMWARE_FIT_IMAGE, SEC_FIRMEWARE_FIT_CNF_NAME
and SEC_FIRMWARE_TARGET_EL, there will be some build errors,
so give a default definition.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>
This commit is contained in:
Hou Zhiqiang 2016-09-06 14:23:07 +08:00 committed by Tom Rini
parent 22a402f00c
commit 81049ba8f4
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/cpu/armv8/sec_firmware.c
View File

@ -19,12 +19,22 @@ extern void c_runtime_cpu_setup(void);
#define SEC_FIRMWARE_LOADED 0x1 #define SEC_FIRMWARE_LOADED 0x1
#define SEC_FIRMWARE_RUNNING 0x2 #define SEC_FIRMWARE_RUNNING 0x2
#define SEC_FIRMWARE_ADDR_MASK (~0x3) #define SEC_FIRMWARE_ADDR_MASK (~0x3)
/* /*
* Secure firmware load addr * Secure firmware load addr
* Flags used: 0x1 secure firmware has been loaded to secure memory * Flags used: 0x1 secure firmware has been loaded to secure memory
* 0x2 secure firmware is running * 0x2 secure firmware is running
*/ */
phys_addr_t sec_firmware_addr; phys_addr_t sec_firmware_addr;
#ifndef SEC_FIRMWARE_FIT_IMAGE
#define SEC_FIRMWARE_FIT_IMAGE "firmware"
#endif
#ifndef SEC_FIRMEWARE_FIT_CNF_NAME
#define SEC_FIRMEWARE_FIT_CNF_NAME "config@1"
#endif
#ifndef SEC_FIRMWARE_TARGET_EL
#define SEC_FIRMWARE_TARGET_EL 2
#endif
static int sec_firmware_get_data(const void *sec_firmware_img, static int sec_firmware_get_data(const void *sec_firmware_img,
const void **data, size_t *size) const void **data, size_t *size)