diff options
Diffstat (limited to 'src/soc/nvidia')
| -rw-r--r-- | src/soc/nvidia/tegra124/cbmem.c | 5 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra210/cbmem.c | 4 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra210/ramstage.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/soc/nvidia/tegra124/cbmem.c b/src/soc/nvidia/tegra124/cbmem.c index 3f59f061c1..287ef62992 100644 --- a/src/soc/nvidia/tegra124/cbmem.c +++ b/src/soc/nvidia/tegra124/cbmem.c @@ -1,10 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0-only */ #include <cbmem.h> +#include <commonlib/bsd/helpers.h> #include <soc/display.h> #include <soc/sdram.h> -void *cbmem_top_chipset(void) +uintptr_t cbmem_top_chipset(void) { - return (void *)((sdram_max_addressable_mb() - FB_SIZE_MB) << 20UL); + return (sdram_max_addressable_mb() - FB_SIZE_MB) * MiB; } diff --git a/src/soc/nvidia/tegra210/cbmem.c b/src/soc/nvidia/tegra210/cbmem.c index d9b22263ec..a56f150b26 100644 --- a/src/soc/nvidia/tegra210/cbmem.c +++ b/src/soc/nvidia/tegra210/cbmem.c @@ -3,7 +3,7 @@ #include <cbmem.h> #include <soc/addressmap.h> -void *cbmem_top_chipset(void) +uintptr_t cbmem_top_chipset(void) { static uintptr_t addr; @@ -19,5 +19,5 @@ void *cbmem_top_chipset(void) addr = end_mib << 20; } - return (void *)addr; + return addr; } diff --git a/src/soc/nvidia/tegra210/ramstage.c b/src/soc/nvidia/tegra210/ramstage.c index 50249b7051..45b221b3fc 100644 --- a/src/soc/nvidia/tegra210/ramstage.c +++ b/src/soc/nvidia/tegra210/ramstage.c @@ -59,7 +59,7 @@ void ramstage_entry(void) /* Ramstage is run on a different core, so passing cbmem_top via calling arguments is not an option, but it is not a problem to call cbmem_top_chipset() again here to populate _cbmem_top_ptr. */ - _cbmem_top_ptr = (uintptr_t)cbmem_top_chipset(); + _cbmem_top_ptr = cbmem_top_chipset(); /* Jump to boot state machine in common code. */ main(); |