diff options
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7m/cache.c | 5 | ||||
| -rw-r--r-- | arch/arm/cpu/armv8/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv8/sec_firmware.c | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/cpu/armv7m/cache.c b/arch/arm/cpu/armv7m/cache.c index 6dc2ca8e73..f4ba3ad50e 100644 --- a/arch/arm/cpu/armv7m/cache.c +++ b/arch/arm/cpu/armv7m/cache.c @@ -332,6 +332,11 @@ void icache_disable(void) isb(); /* subsequent instructions fetch see cache disable effect */ } #else +void invalidate_icache_all(void) +{ + return; +} + void icache_enable(void) { return; diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 92a2b58ed4..16c83e8614 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -65,7 +65,7 @@ config ARMV8_SEC_FIRMWARE_SUPPORT - Address of secure firmware. - Address to hold the return address from secure firmware. - Secure firmware FIT image related information. - Such as: SEC_FIRMWARE_FIT_IMAGE and SEC_FIRMEWARE_FIT_CNF_NAME + Such as: SEC_FIRMWARE_FIT_IMAGE and SEC_FIRMWARE_FIT_CNF_NAME - The target exception level that secure monitor firmware will return to. diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 11f9b4df38..95ea57d571 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -29,8 +29,8 @@ 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" +#ifndef SEC_FIRMWARE_FIT_CNF_NAME +#define SEC_FIRMWARE_FIT_CNF_NAME "config-1" #endif #ifndef SEC_FIRMWARE_TARGET_EL #define SEC_FIRMWARE_TARGET_EL 2 @@ -44,7 +44,7 @@ static int sec_firmware_get_data(const void *sec_firmware_img, char *desc; int ret; - conf_node_name = SEC_FIRMEWARE_FIT_CNF_NAME; + conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME; conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name); if (conf_node_off < 0) { @@ -124,7 +124,7 @@ static int sec_firmware_check_copy_loadable(const void *sec_firmware_img, const char *name, *str, *type; int len; - conf_node_name = SEC_FIRMEWARE_FIT_CNF_NAME; + conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME; conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name); if (conf_node_off < 0) { @@ -354,7 +354,7 @@ bool sec_firmware_support_hwrng(void) return true; #endif if (sec_firmware_addr & SEC_FIRMWARE_RUNNING) { - return true; + return true; } return false; |