Skip to content

Commit a94e4f2

Browse files
FlyGoatpaulburton
authored andcommitted
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: Jiaxun Yang <[email protected]> [[email protected]: Fix size calculation in check_kernel_sections_mem] Signed-off-by: Paul Burton <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected]
1 parent a5718fe commit a94e4f2

File tree

2 files changed

+85
-286
lines changed

2 files changed

+85
-286
lines changed

arch/mips/include/asm/bootinfo.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,28 +88,12 @@ const char *get_system_type(void);
8888

8989
extern unsigned long mips_machtype;
9090

91-
#define BOOT_MEM_MAP_MAX 32
9291
#define BOOT_MEM_RAM 1
9392
#define BOOT_MEM_ROM_DATA 2
9493
#define BOOT_MEM_RESERVED 3
9594
#define BOOT_MEM_INIT_RAM 4
9695
#define BOOT_MEM_NOMAP 5
9796

98-
/*
99-
* A memory map that's built upon what was determined
100-
* or specified on the command line.
101-
*/
102-
struct boot_mem_map {
103-
int nr_map;
104-
struct boot_mem_map_entry {
105-
phys_addr_t addr; /* start of memory segment */
106-
phys_addr_t size; /* size of memory segment */
107-
long type; /* type of memory segment */
108-
} map[BOOT_MEM_MAP_MAX];
109-
};
110-
111-
extern struct boot_mem_map boot_mem_map;
112-
11397
extern void add_memory_region(phys_addr_t start, phys_addr_t size, long type);
11498
extern void detect_memory_region(phys_addr_t start, phys_addr_t sz_min, phys_addr_t sz_max);
11599

0 commit comments

Comments
 (0)