diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-16 16:43:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-16 16:43:32 -0400 |
| commit | ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636 (patch) | |
| tree | c2c424ead06d5f265d6e4c954550454b9cf8c650 /lib | |
| parent | 2808576491ae36b6ea96743005058f370d936beb (diff) | |
| parent | 9b6639fa85bddd90df4c371f25a89c791a6ee6ef (diff) | |
| download | u-boot-ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636.tar.gz u-boot-ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636.tar.bz2 u-boot-ce38ebb6f7f0e2111b7d457651ae0a76bc5a2636.zip | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/efi_memory.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 95aa590c8a..db2ae19f59 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -431,11 +431,8 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, return EFI_SUCCESS; } -int efi_memory_init(void) +__weak void efi_add_known_memory(void) { - unsigned long runtime_start, runtime_end, runtime_pages; - unsigned long uboot_start, uboot_pages; - unsigned long uboot_stack_size = 16 * 1024 * 1024; int i; /* Add RAM */ @@ -448,6 +445,15 @@ int efi_memory_init(void) efi_add_memory_map(start, pages, EFI_CONVENTIONAL_MEMORY, false); } +} + +int efi_memory_init(void) +{ + unsigned long runtime_start, runtime_end, runtime_pages; + unsigned long uboot_start, uboot_pages; + unsigned long uboot_stack_size = 16 * 1024 * 1024; + + efi_add_known_memory(); /* Add U-Boot */ uboot_start = (gd->start_addr_sp - uboot_stack_size) & ~EFI_PAGE_MASK; |