diff options
| author | Jiaxun Yang <jiaxun.yang@flygoat.com> | 2019-08-19 16:23:11 +0200 |
|---|---|---|
| committer | Paul Burton <paul.burton@mips.com> | 2019-08-23 15:47:21 +0200 |
| commit | a121d6e0caf0982579a1be7f4ad4dcf45e36052b (patch) | |
| tree | ecbee93b849d8d200c58d07426079a5a08229961 /arch | |
| parent | MIPS: ip22: Drop addr_is_ram (diff) | |
| download | linux-a121d6e0caf0982579a1be7f4ad4dcf45e36052b.tar.xz linux-a121d6e0caf0982579a1be7f4ad4dcf45e36052b.zip | |
MIPS: xlp: Drop boot_mem_map
Simply replace with memblock functions.
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: linux-mips@vger.kernel.org
Cc: yasha.che3@gmail.com
Cc: aurelien@aurel32.net
Cc: sfr@canb.auug.org.au
Cc: fancer.lancer@gmail.com
Cc: matt.redfearn@mips.com
Cc: chenhc@lemote.com
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/netlogic/xlp/setup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c index f743fd9da323..1a0fc5b62ba4 100644 --- a/arch/mips/netlogic/xlp/setup.c +++ b/arch/mips/netlogic/xlp/setup.c @@ -34,6 +34,7 @@ #include <linux/kernel.h> #include <linux/of_fdt.h> +#include <linux/memblock.h> #include <asm/idle.h> #include <asm/reboot.h> @@ -67,12 +68,11 @@ static void nlm_linux_exit(void) static void nlm_fixup_mem(void) { const int pref_backup = 512; - int i; + struct memblock_region *mem; - for (i = 0; i < boot_mem_map.nr_map; i++) { - if (boot_mem_map.map[i].type != BOOT_MEM_RAM) - continue; - boot_mem_map.map[i].size -= pref_backup; + for_each_memblock(memory, mem) { + memblock_remove(mem->base + mem->size - pref_backup, + pref_backup); } } @@ -110,7 +110,7 @@ void __init plat_mem_setup(void) /* memory and bootargs from DT */ xlp_early_init_devtree(); - if (boot_mem_map.nr_map == 0) { + if (memblock_end_of_DRAM() == 0) { pr_info("Using DRAM BARs for memory map.\n"); xlp_init_mem_from_bars(); } |