dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 15:01:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

cbfs: Adjust cbfs_load_header_ptr() to use cbfs_priv

Browse Source 
This function is strange at the moment in that it takes a header pointer
but then accesses the cbfs_s global. Currently clients have their own priv
pointer, so update the function to take that as a parameter instead.

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:17 -06:00
committed by Bin Meng
parent 54e19257a9
commit a2c528fe8a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/cbfs/cbfs.c
View File

@@ -8,6 +8,9 @@
#include <malloc.h> #include <malloc.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
/* Offset of master header from the start of a coreboot ROM */
#define MASTER_HDR_OFFSET 0x38
static const u32 good_magic = 0x4f524243; static const u32 good_magic = 0x4f524243;
static const u8 good_file_magic[] = "LARCHIVE"; static const u8 good_file_magic[] = "LARCHIVE";
@@ -192,9 +195,9 @@ static int file_cbfs_load_header(struct cbfs_priv *priv, ulong end_of_rom)
return 0; return 0;
} }
static int cbfs_load_header_ptr(struct cbfs_priv *priv, ulong base, static int cbfs_load_header_ptr(struct cbfs_priv *priv, ulong base)
struct cbfs_header *header)
{ {
struct cbfs_header *header = &priv->header;
struct cbfs_header *header_in_rom; struct cbfs_header *header_in_rom;
header_in_rom = (struct cbfs_header *)base; header_in_rom = (struct cbfs_header *)base;
@@ -241,7 +244,7 @@ int cbfs_init_mem(ulong base, ulong size, struct cbfs_priv **privp)
* valid. Assume that a master header appears at the start, at offset * valid. Assume that a master header appears at the start, at offset
* 0x38. * 0x38.
*/ */
ret = cbfs_load_header_ptr(priv, base + 0x38, &priv->header); ret = cbfs_load_header_ptr(priv, base + MASTER_HDR_OFFSET);
if (ret) if (ret)
return ret; return ret;