Commit a94e4f24 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Paul Burton

MIPS: init: Drop boot_mem_map

boot_mem_map was introduced very early and cannot handle memory maps
with nid. Nowadays, memblock can exactly replace boot_mem_map.

Detect pfn info and setup resources with memblock maps.
Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
[paul.burton@mips.com: Fix size calculation in check_kernel_sections_mem]
Signed-off-by: default avatarPaul 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
parent a5718fe8
...@@ -88,28 +88,12 @@ const char *get_system_type(void); ...@@ -88,28 +88,12 @@ const char *get_system_type(void);
extern unsigned long mips_machtype; extern unsigned long mips_machtype;
#define BOOT_MEM_MAP_MAX 32
#define BOOT_MEM_RAM 1 #define BOOT_MEM_RAM 1
#define BOOT_MEM_ROM_DATA 2 #define BOOT_MEM_ROM_DATA 2
#define BOOT_MEM_RESERVED 3 #define BOOT_MEM_RESERVED 3
#define BOOT_MEM_INIT_RAM 4 #define BOOT_MEM_INIT_RAM 4
#define BOOT_MEM_NOMAP 5 #define BOOT_MEM_NOMAP 5
/*
* A memory map that's built upon what was determined
* or specified on the command line.
*/
struct boot_mem_map {
int nr_map;
struct boot_mem_map_entry {
phys_addr_t addr; /* start of memory segment */
phys_addr_t size; /* size of memory segment */
long type; /* type of memory segment */
} map[BOOT_MEM_MAP_MAX];
};
extern struct boot_mem_map boot_mem_map;
extern void add_memory_region(phys_addr_t start, phys_addr_t size, long type); extern void add_memory_region(phys_addr_t start, phys_addr_t size, long type);
extern void detect_memory_region(phys_addr_t start, phys_addr_t sz_min, phys_addr_t sz_max); extern void detect_memory_region(phys_addr_t start, phys_addr_t sz_min, phys_addr_t sz_max);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment