summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHou Zhiqiang <Zhiqiang.Hou@nxp.com>2016-09-06 14:23:07 +0800
committerTom Rini <trini@konsulko.com>2016-10-06 20:57:36 -0400
commit81049ba8f43618a85867d88bb612fb5106f41dad (patch)
treeac61ee1c5fe89bfb5b81243c1bfbb30b3c6a812f /arch
parent22a402f00c9de841026105baa219a03d2273c01c (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv8/sec_firmware.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c
index e21e199381..2ddd67ef6c 100644
--- a/arch/arm/cpu/armv8/sec_firmware.c
+++ b/arch/arm/cpu/armv8/sec_firmware.c
@@ -19,12 +19,22 @@ extern void c_runtime_cpu_setup(void);
#define SEC_FIRMWARE_LOADED 0x1
#define SEC_FIRMWARE_RUNNING 0x2
#define SEC_FIRMWARE_ADDR_MASK (~0x3)
- /*
- * Secure firmware load addr
- * Flags used: 0x1 secure firmware has been loaded to secure memory
- * 0x2 secure firmware is running
- */
- phys_addr_t sec_firmware_addr;
+/*
+ * Secure firmware load addr
+ * Flags used: 0x1 secure firmware has been loaded to secure memory
+ * 0x2 secure firmware is running
+ */
+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,
const void **data, size_t *size)