brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cbfs: Return the error code from file_cbfs_init() 

We may as well return the error code and use it directly in the command
code. CBFS still uses its own error enum which we may be able to remove,
but leave it for now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2020-05-24 17:38:21 -06:00 committed by Bin Meng
parent c685f8bcfc
commit 0e7b6312e7
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/cbfs.c
View File

@ -28,8 +28,7 @@ static int do_cbfs_init(struct cmd_tbl *cmdtp, int flag, int argc,
return 1;
}
}
file_cbfs_init(end_of_rom);
if (cbfs_get_result() != CBFS_SUCCESS) {
if (file_cbfs_init(end_of_rom)) {
printf("%s.\n", file_cbfs_error());
return 1;
}

23
fs/cbfs/cbfs.c
View File

@ -253,19 +253,26 @@ static int cbfs_load_header_ptr(struct cbfs_priv *priv, ulong base)
return 0;
}
static void cbfs_init(struct cbfs_priv *priv, ulong end_of_rom)
static int cbfs_init(struct cbfs_priv *priv, ulong end_of_rom)
{
if (file_cbfs_load_header(priv, end_of_rom))
return;
int ret;
file_cbfs_fill_cache(priv, priv->header.rom_size, priv->header.align);
if (priv->result == CBFS_SUCCESS)
priv->initialized = true;
ret = file_cbfs_load_header(priv, end_of_rom);
if (ret)
return ret;
ret = file_cbfs_fill_cache(priv, priv->header.rom_size,
priv->header.align);
if (ret)
return ret;
priv->initialized = true;
return 0;
}
void file_cbfs_init(ulong end_of_rom)
int file_cbfs_init(ulong end_of_rom)
{
cbfs_init(&cbfs_s, end_of_rom);
return cbfs_init(&cbfs_s, end_of_rom);
}
int cbfs_init_mem(ulong base, ulong size, struct cbfs_priv **privp)

6
include/cbfs.h
View File

@ -98,10 +98,10 @@ enum cbfs_result cbfs_get_result(void);
/**
* file_cbfs_init() - Initialize the CBFS driver and load metadata into RAM.
*
* @end_of_rom: Points to the end of the ROM the CBFS should be read
* from.
* @end_of_rom: Points to the end of the ROM the CBFS should be read from
* @return 0 if OK, -ve on error
*/
void file_cbfs_init(ulong end_of_rom);
int file_cbfs_init(ulong end_of_rom);
/**
* file_cbfs_get_header() - Get the header structure for the current CBFS.