colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spl: Drop use of uintptr_t

Browse Source 
U-Boot uses ulong for addresses. It is confusing to use uintptr_t in a
few places, since it makes people wonder if the types are compatible.
Change the few occurences in SPL to use ulong

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2024-12-19 11:29:00 -07:00
committed by Tom Rini
parent 7f67b6fa83
commit 7a585b9d6a
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
common/spl/spl_atf.c
View File

@@ -41,9 +41,9 @@ struct bl2_to_bl31_params_mem_v2 {
struct entry_point_info bl31_ep_info; struct entry_point_info bl31_ep_info;
}; };
struct bl31_params *bl2_plat_get_bl31_params_default(uintptr_t bl32_entry, struct bl31_params *bl2_plat_get_bl31_params_default(ulong bl32_entry,
uintptr_t bl33_entry, ulong bl33_entry,
uintptr_t fdt_addr) ulong fdt_addr)
{ {
static struct bl2_to_bl31_params_mem bl31_params_mem; static struct bl2_to_bl31_params_mem bl31_params_mem;
struct bl31_params *bl2_to_bl31_params; struct bl31_params *bl2_to_bl31_params;
@@ -100,17 +100,17 @@ struct bl31_params *bl2_plat_get_bl31_params_default(uintptr_t bl32_entry,
return bl2_to_bl31_params; return bl2_to_bl31_params;
} }
__weak struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry, __weak struct bl31_params *bl2_plat_get_bl31_params(ulong bl32_entry,
uintptr_t bl33_entry, ulong bl33_entry,
uintptr_t fdt_addr) ulong fdt_addr)
{ {
return bl2_plat_get_bl31_params_default(bl32_entry, bl33_entry, return bl2_plat_get_bl31_params_default(bl32_entry, bl33_entry,
fdt_addr); fdt_addr);
} }
struct bl_params *bl2_plat_get_bl31_params_v2_default(uintptr_t bl32_entry, struct bl_params *bl2_plat_get_bl31_params_v2_default(ulong bl32_entry,
uintptr_t bl33_entry, ulong bl33_entry,
uintptr_t fdt_addr) ulong fdt_addr)
{ {
static struct bl2_to_bl31_params_mem_v2 bl31_params_mem; static struct bl2_to_bl31_params_mem_v2 bl31_params_mem;
struct bl_params *bl_params; struct bl_params *bl_params;
@@ -173,9 +173,9 @@ struct bl_params *bl2_plat_get_bl31_params_v2_default(uintptr_t bl32_entry,
return bl_params; return bl_params;
} }
__weak struct bl_params *bl2_plat_get_bl31_params_v2(uintptr_t bl32_entry, __weak struct bl_params *bl2_plat_get_bl31_params_v2(ulong bl32_entry,
uintptr_t bl33_entry, ulong bl33_entry,
uintptr_t fdt_addr) ulong fdt_addr)
{ {
return bl2_plat_get_bl31_params_v2_default(bl32_entry, bl33_entry, return bl2_plat_get_bl31_params_v2_default(bl32_entry, bl33_entry,
fdt_addr); fdt_addr);
@@ -188,8 +188,8 @@ static inline void raw_write_daif(unsigned int daif)
typedef void __noreturn (*atf_entry_t)(struct bl31_params *params, void *plat_params); typedef void __noreturn (*atf_entry_t)(struct bl31_params *params, void *plat_params);
static void __noreturn bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry, static void __noreturn bl31_entry(ulong bl31_entry, ulong bl32_entry,
uintptr_t bl33_entry, uintptr_t fdt_addr) ulong bl33_entry, ulong fdt_addr)
{ {
atf_entry_t atf_entry = (atf_entry_t)bl31_entry; atf_entry_t atf_entry = (atf_entry_t)bl31_entry;
void *bl31_params; void *bl31_params;
@@ -238,7 +238,7 @@ static int spl_fit_images_find(void *blob, int os)
return -FDT_ERR_NOTFOUND; return -FDT_ERR_NOTFOUND;
} }
uintptr_t spl_fit_images_get_entry(void *blob, int node) ulong spl_fit_images_get_entry(void *blob, int node)
{ {
ulong val; ulong val;
int ret; int ret;
@@ -253,10 +253,10 @@ uintptr_t spl_fit_images_get_entry(void *blob, int node)
void __noreturn spl_invoke_atf(struct spl_image_info *spl_image) void __noreturn spl_invoke_atf(struct spl_image_info *spl_image)
{ {
uintptr_t bl32_entry = 0; ulong bl32_entry = 0;
uintptr_t bl33_entry = CONFIG_TEXT_BASE; ulong bl33_entry = CONFIG_TEXT_BASE;
void *blob = spl_image->fdt_addr; void *blob = spl_image->fdt_addr;
uintptr_t platform_param = (uintptr_t)blob; ulong platform_param = (ulong)blob;
int node; int node;
/* /*

2
common/spl/spl_fit.c
View File

@@ -862,7 +862,7 @@ int spl_load_fit_image(struct spl_image_info *spl_image,
{ {
struct bootm_headers images; struct bootm_headers images;
const char *fit_uname_config = NULL; const char *fit_uname_config = NULL;
uintptr_t fdt_hack; ulong fdt_hack;
const char *uname; const char *uname;
ulong fw_data = 0, dt_data = 0, img_data = 0; ulong fw_data = 0, dt_data = 0, img_data = 0;
ulong fw_len = 0, dt_len = 0, img_len = 0; ulong fw_len = 0, dt_len = 0, img_len = 0;

8
common/spl/spl_legacy.c
View File

@@ -16,11 +16,11 @@
#define LZMA_LEN (1 << 20) #define LZMA_LEN (1 << 20)
static void spl_parse_legacy_validate(uintptr_t start, uintptr_t size) static void spl_parse_legacy_validate(ulong start, ulong size)
{ {
uintptr_t spl_start = (uintptr_t)_start; ulong spl_start = (ulong)_start;
uintptr_t spl_end = (uintptr_t)&_image_binary_end; ulong spl_end = (ulong)&_image_binary_end;
uintptr_t end = start + size; ulong end = start + size;
if ((start >= spl_start && start < spl_end) || if ((start >= spl_start && start < spl_end) ||
(end > spl_start && end <= spl_end) || (end > spl_start && end <= spl_end) ||

28
include/spl.h
View File

@@ -268,8 +268,8 @@ enum spl_sandbox_flags {
struct spl_image_info { struct spl_image_info {
const char *name; const char *name;
u8 os; u8 os;
uintptr_t load_addr; ulong load_addr;
uintptr_t entry_point; ulong entry_point;
#if CONFIG_IS_ENABLED(LOAD_FIT) || CONFIG_IS_ENABLED(LOAD_FIT_FULL) #if CONFIG_IS_ENABLED(LOAD_FIT) || CONFIG_IS_ENABLED(LOAD_FIT_FULL)
void *fdt_addr; void *fdt_addr;
#endif #endif
@@ -951,9 +951,9 @@ void __noreturn spl_invoke_atf(struct spl_image_info *spl_image);
* *
* Return: bl31 params structure pointer * Return: bl31 params structure pointer
*/ */
struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry, struct bl31_params *bl2_plat_get_bl31_params(ulong bl32_entry,
uintptr_t bl33_entry, ulong bl33_entry,
uintptr_t fdt_addr); ulong fdt_addr);
/** /**
* bl2_plat_get_bl31_params_default() - prepare params for bl31. * bl2_plat_get_bl31_params_default() - prepare params for bl31.
@@ -972,9 +972,9 @@ struct bl31_params *bl2_plat_get_bl31_params(uintptr_t bl32_entry,
* *
* Return: bl31 params structure pointer * Return: bl31 params structure pointer
*/ */
struct bl31_params *bl2_plat_get_bl31_params_default(uintptr_t bl32_entry, struct bl31_params *bl2_plat_get_bl31_params_default(ulong bl32_entry,
uintptr_t bl33_entry, ulong bl33_entry,
uintptr_t fdt_addr); ulong fdt_addr);
/** /**
* bl2_plat_get_bl31_params_v2() - return params for bl31 * bl2_plat_get_bl31_params_v2() - return params for bl31
@@ -988,9 +988,9 @@ struct bl31_params *bl2_plat_get_bl31_params_default(uintptr_t bl32_entry,
* *
* Return: bl31 params structure pointer * Return: bl31 params structure pointer
*/ */
struct bl_params *bl2_plat_get_bl31_params_v2(uintptr_t bl32_entry, struct bl_params *bl2_plat_get_bl31_params_v2(ulong bl32_entry,
uintptr_t bl33_entry, ulong bl33_entry,
uintptr_t fdt_addr); ulong fdt_addr);
/** /**
* bl2_plat_get_bl31_params_v2_default() - prepare params for bl31. * bl2_plat_get_bl31_params_v2_default() - prepare params for bl31.
@@ -1007,9 +1007,9 @@ struct bl_params *bl2_plat_get_bl31_params_v2(uintptr_t bl32_entry,
* *
* Return: bl31 params structure pointer * Return: bl31 params structure pointer
*/ */
struct bl_params *bl2_plat_get_bl31_params_v2_default(uintptr_t bl32_entry, struct bl_params *bl2_plat_get_bl31_params_v2_default(ulong bl32_entry,
uintptr_t bl33_entry, ulong bl33_entry,
uintptr_t fdt_addr); ulong fdt_addr);
/** /**
* spl_optee_entry - entry function for optee * spl_optee_entry - entry function for optee
* *