random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

ARMv8/sec_firmware: Remove SEC_FIRMWARE_FIT_CNF_NAME

Browse Source 
The config to use for FIT images can be better specified by enabling
CONFIG_MULTI_DTB_FIT and implementing board_fit_config_name_match.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Sean Anderson 2022-08-16 11:16:02 -04:00 committed by Peng Fan
parent 33043b396c
commit 1b0e98221d
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,9 +36,6 @@ phys_addr_t sec_firmware_addr;
#ifndef SEC_FIRMWARE_FIT_IMAGE #ifndef SEC_FIRMWARE_FIT_IMAGE
#define SEC_FIRMWARE_FIT_IMAGE "firmware" #define SEC_FIRMWARE_FIT_IMAGE "firmware"
#endif #endif
#ifndef SEC_FIRMWARE_FIT_CNF_NAME
#define SEC_FIRMWARE_FIT_CNF_NAME "config-1"
#endif
#ifndef SEC_FIRMWARE_TARGET_EL #ifndef SEC_FIRMWARE_TARGET_EL
#define SEC_FIRMWARE_TARGET_EL 2 #define SEC_FIRMWARE_TARGET_EL 2
#endif #endif
@ -47,15 +44,12 @@ static int sec_firmware_get_data(const void *sec_firmware_img,
const void **data, size_t *size) const void **data, size_t *size)
{ {
int conf_node_off, fw_node_off; int conf_node_off, fw_node_off;
char *conf_node_name = NULL;
char *desc; char *desc;
int ret; int ret;
conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME; conf_node_off = fit_conf_get_node(sec_firmware_img, NULL);
conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name);
if (conf_node_off < 0) { if (conf_node_off < 0) {
printf("SEC Firmware: %s: no such config\n", conf_node_name); puts("SEC Firmware: no config\n");
return -ENOENT; return -ENOENT;
} }
@ -124,18 +118,15 @@ static int sec_firmware_check_copy_loadable(const void *sec_firmware_img,
{ {
phys_addr_t sec_firmware_loadable_addr = 0; phys_addr_t sec_firmware_loadable_addr = 0;
int conf_node_off, ld_node_off, images; int conf_node_off, ld_node_off, images;
char *conf_node_name = NULL;
const void *data; const void *data;
size_t size; size_t size;
ulong load; ulong load;
const char *name, *str, *type; const char *name, *str, *type;
int len; int len;
conf_node_name = SEC_FIRMWARE_FIT_CNF_NAME; conf_node_off = fit_conf_get_node(sec_firmware_img, NULL);
conf_node_off = fit_conf_get_node(sec_firmware_img, conf_node_name);
if (conf_node_off < 0) { if (conf_node_off < 0) {
printf("SEC Firmware: %s: no such config\n", conf_node_name); puts("SEC Firmware: no config\n");
return -ENOENT; return -ENOENT;
} }