From 9f67b56772c2c25050fadf0766174c3c35a49995 Mon Sep 17 00:00:00 2001 From: Thomas Hebb Date: Sun, 10 Nov 2019 08:23:15 -0800 Subject: [PATCH] Fix typo in macros, "FIRMEWARE" -> "FIRMWARE" Signed-off-by: Thomas Hebb --- arch/arm/cpu/armv8/Kconfig | 2 +- arch/arm/cpu/armv8/sec_firmware.c | 8 ++++---- drivers/net/pfe_eth/pfe_firmware.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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 4dcda70b91..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) { diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c index adb2d06010..e4563f192b 100644 --- a/drivers/net/pfe_eth/pfe_firmware.c +++ b/drivers/net/pfe_eth/pfe_firmware.c @@ -16,7 +16,7 @@ #include #endif -#define PFE_FIRMEWARE_FIT_CNF_NAME "config@1" +#define PFE_FIRMWARE_FIT_CNF_NAME "config@1" static const void *pfe_fit_addr = (void *)CONFIG_SYS_LS_PFE_FW_ADDR; @@ -99,7 +99,7 @@ static int pfe_get_fw(const void **data, char *desc; int ret = 0; - conf_node_name = PFE_FIRMEWARE_FIT_CNF_NAME; + conf_node_name = PFE_FIRMWARE_FIT_CNF_NAME; conf_node_off = fit_conf_get_node(pfe_fit_addr, conf_node_name); if (conf_node_off < 0) { -- 2.39.5