diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-15 13:08:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-15 13:08:17 -0400 |
| commit | 9b54b0e37b72aa9bfff09cbbe13465abfa143f84 (patch) | |
| tree | db7a88320a3558c2287e5a0da642e1d28c17ba9f /arch/arm/mach-mvebu/arm64-common.c | |
| parent | f0efecd27dfb7fda224ccbf661ce4c55744edccc (diff) | |
| parent | d768dd88552df18d4a0527cf3d6ddd05dc072f02 (diff) | |
Merge tag 'efi-2023-10-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-10-rc3
Documentation:
* Correct description of board_get_usable_ram_top
* Add partition API to HTML documentation
* Describe lmb_is_reserved
* doc/sphinx/requirements.txt: Bump certifi up
UEFI:
* Fix efi_add_known_memory
* Make distro_efi_boot() static
Other:
* Correct return type board_get_usable_ram_top
Diffstat (limited to 'arch/arm/mach-mvebu/arm64-common.c')
| -rw-r--r-- | arch/arm/mach-mvebu/arm64-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index d3a95730be..4c67f1aba4 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -30,7 +30,7 @@ DECLARE_GLOBAL_DATA_PTR; */ #define USABLE_RAM_SIZE 0x80000000ULL -phys_size_t board_get_usable_ram_top(phys_size_t total_size) +phys_addr_t board_get_usable_ram_top(phys_size_t total_size) { unsigned long top = CFG_SYS_SDRAM_BASE + min(gd->ram_size, USABLE_RAM_SIZE); |