mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-29 17:51:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cbfs: Use ulong consistently

Browse Source 
U-Boot uses ulong for addresses but there are a few places in this driver
that don't use it. Convert this driver over to follow this convention
fully.

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:13 -06:00 committed by Bin Meng
parent ea38ee93ef
commit 45637dbfce
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/cbfs/cbfs.c
View File

@ -170,8 +170,7 @@ static void file_cbfs_fill_cache(struct cbfs_priv *priv, u8 *start, u32 size,
} }
/* Get the CBFS header out of the ROM and do endian conversion. */ /* Get the CBFS header out of the ROM and do endian conversion. */
static int file_cbfs_load_header(uintptr_t end_of_rom, static int file_cbfs_load_header(ulong end_of_rom, struct cbfs_header *header)
struct cbfs_header *header)
{ {
struct cbfs_header *header_in_rom; struct cbfs_header *header_in_rom;
int32_t offset = *(u32 *)(end_of_rom - 3); int32_t offset = *(u32 *)(end_of_rom - 3);
@ -204,7 +203,7 @@ static int cbfs_load_header_ptr(struct cbfs_priv *priv, ulong base,
return 0; return 0;
} }
static void cbfs_init(struct cbfs_priv *priv, uintptr_t end_of_rom) static void cbfs_init(struct cbfs_priv *priv, ulong end_of_rom)
{ {
u8 *start_of_rom; u8 *start_of_rom;
@ -221,7 +220,7 @@ static void cbfs_init(struct cbfs_priv *priv, uintptr_t end_of_rom)
priv->initialized = 1; priv->initialized = 1;
} }
void file_cbfs_init(uintptr_t end_of_rom) void file_cbfs_init(ulong end_of_rom)
{ {
cbfs_init(&cbfs_s, end_of_rom); cbfs_init(&cbfs_s, end_of_rom);
} }
@ -324,7 +323,7 @@ const struct cbfs_cachenode *file_cbfs_find(const char *name)
return cbfs_find_file(&cbfs_s, name); return cbfs_find_file(&cbfs_s, name);
} }
const struct cbfs_cachenode *file_cbfs_find_uncached(uintptr_t end_of_rom, const struct cbfs_cachenode *file_cbfs_find_uncached(ulong end_of_rom,
const char *name) const char *name)
{ {
struct cbfs_priv *priv = &cbfs_s; struct cbfs_priv *priv = &cbfs_s;

4
include/cbfs.h
View File

@ -101,7 +101,7 @@ enum cbfs_result cbfs_get_result(void);
* @end_of_rom: Points to the end of the ROM the CBFS should be read * @end_of_rom: Points to the end of the ROM the CBFS should be read
* from. * from.
*/ */
void file_cbfs_init(uintptr_t end_of_rom); void file_cbfs_init(ulong end_of_rom);
/** /**
* file_cbfs_get_header() - Get the header structure for the current CBFS. * file_cbfs_get_header() - Get the header structure for the current CBFS.
@ -170,7 +170,7 @@ int cbfs_init_mem(ulong base, ulong size, struct cbfs_priv **privp);
* *
* @return A handle to the file, or NULL on error. * @return A handle to the file, or NULL on error.
*/ */
const struct cbfs_cachenode *file_cbfs_find_uncached(uintptr_t end_of_rom, const struct cbfs_cachenode *file_cbfs_find_uncached(ulong end_of_rom,
const char *name); const char *name);
/** /**