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/mips/mach-octeon/dram.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/mips/mach-octeon/dram.c')
| -rw-r--r-- | arch/mips/mach-octeon/dram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mach-octeon/dram.c b/arch/mips/mach-octeon/dram.c index 85cb084c13..5b1311d8b5 100644 --- a/arch/mips/mach-octeon/dram.c +++ b/arch/mips/mach-octeon/dram.c @@ -77,7 +77,7 @@ phys_size_t get_effective_memsize(void) return UBOOT_RAM_SIZE_MAX; } -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) { if (IS_ENABLED(CONFIG_RAM_OCTEON)) { /* Map a maximum of 256MiB - return not size but address */ |