diff options
| author | Tom Rini <trini@konsulko.com> | 2019-01-17 17:42:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-01-17 17:42:03 -0500 |
| commit | e964df1e2ae7b2c041a9d767f03ad2b72a3f2ac7 (patch) | |
| tree | 20fc239128010116c5034692afd9a82fb1ba0fa3 /common/bootm.c | |
| parent | aac0c29d4b8418c5c78b552070ffeda022b16949 (diff) | |
| parent | f8878da5571e5a1170f9c49214be5bafbc1b23a4 (diff) | |
Merge branch '2019-01-16-master-imports'
- Fixes for CVE-2018-18440 and CVE-2018-18439
- Patch to allow disabling unneeded NAND ECC layouts
- Optimize SPI flash env read process
Diffstat (limited to 'common/bootm.c')
| -rw-r--r-- | common/bootm.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/common/bootm.c b/common/bootm.c index 80f304ce9f..a4618b6d2e 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -56,15 +56,11 @@ static void boot_start_lmb(bootm_headers_t *images) ulong mem_start; phys_size_t mem_size; - lmb_init(&images->lmb); - mem_start = env_get_bootm_low(); mem_size = env_get_bootm_size(); - lmb_add(&images->lmb, (phys_addr_t)mem_start, mem_size); - - arch_lmb_reserve(&images->lmb); - board_lmb_reserve(&images->lmb); + lmb_init_and_reserve(&images->lmb, (phys_addr_t)mem_start, mem_size, + NULL); } #else #define lmb_reserve(lmb, base, size) |