[PATCH v4 3/9] board_f: Rename reserve_stack_aligned()
Simon Glass
sjg at chromium.org
Sun Nov 3 01:28:20 CET 2024
Most of the calls to this function have nothing to do with the stack.
Rename the function to avoid confusion.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
(no changes since v1)
common/board_f.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c
index 677e37d93c0..3532ffec46f 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -492,7 +492,7 @@ static int reserve_uboot(void)
* ref = x86_64 ABI: https://reviews.llvm.org/D30049: 16 bytes
* = ARMv8 Instruction Set Overview: quad word, 16 bytes
*/
-static unsigned long reserve_stack_aligned(size_t size)
+static unsigned long reserve_aligned(size_t size)
{
return ALIGN_DOWN(gd->start_addr_sp - size, 16);
}
@@ -522,7 +522,7 @@ static int reserve_noncached(void)
/* reserve memory for malloc() area */
static int reserve_malloc(void)
{
- gd->start_addr_sp = reserve_stack_aligned(TOTAL_MALLOC_LEN);
+ gd->start_addr_sp = reserve_aligned(TOTAL_MALLOC_LEN);
debug("Reserving %dk for malloc() at: %08lx\n",
TOTAL_MALLOC_LEN >> 10, gd->start_addr_sp);
#ifdef CONFIG_SYS_NONCACHED_MEMORY
@@ -536,7 +536,7 @@ static int reserve_malloc(void)
static int reserve_board(void)
{
if (!gd->bd) {
- gd->start_addr_sp = reserve_stack_aligned(sizeof(struct bd_info));
+ gd->start_addr_sp = reserve_aligned(sizeof(struct bd_info));
gd->bd = (struct bd_info *)map_sysmem(gd->start_addr_sp,
sizeof(struct bd_info));
memset(gd->bd, '\0', sizeof(struct bd_info));
@@ -548,7 +548,7 @@ static int reserve_board(void)
static int reserve_global_data(void)
{
- gd->start_addr_sp = reserve_stack_aligned(sizeof(gd_t));
+ gd->start_addr_sp = reserve_aligned(sizeof(gd_t));
gd->new_gd = (gd_t *)map_sysmem(gd->start_addr_sp, sizeof(gd_t));
debug("Reserving %zu Bytes for Global Data at: %08lx\n",
sizeof(gd_t), gd->start_addr_sp);
@@ -567,7 +567,7 @@ static int reserve_fdt(void)
gd->boardf->fdt_size =
ALIGN(fdt_totalsize(gd->fdt_blob), 32);
- gd->start_addr_sp = reserve_stack_aligned(
+ gd->start_addr_sp = reserve_aligned(
gd->boardf->fdt_size);
gd->boardf->new_fdt = map_sysmem(gd->start_addr_sp,
gd->boardf->fdt_size);
@@ -584,7 +584,7 @@ static int reserve_bootstage(void)
#ifdef CONFIG_BOOTSTAGE
int size = bootstage_get_size(true);
- gd->start_addr_sp = reserve_stack_aligned(size);
+ gd->start_addr_sp = reserve_aligned(size);
gd->boardf->new_bootstage = map_sysmem(gd->start_addr_sp, size);
debug("Reserving %#x Bytes for bootstage at: %08lx\n", size,
gd->start_addr_sp);
@@ -601,7 +601,7 @@ __weak int arch_reserve_stacks(void)
static int reserve_stacks(void)
{
/* make stack pointer 16-byte aligned */
- gd->start_addr_sp = reserve_stack_aligned(0);
+ gd->start_addr_sp = reserve_aligned(0);
/*
* let the architecture-specific code tailor gd->start_addr_sp and
--
2.43.0
More information about the U-Boot
mailing list