hc
2024-02-19 1c055e55a242a33e574e48be530e06770a210dcd
kernel/arch/mips/include/asm/bootinfo.h
....@@ -42,17 +42,6 @@
4242 #define MACH_DS5900 10 /* DECsystem 5900 */
4343
4444 /*
45
- * Valid machtype for group PMC-MSP
46
- */
47
-#define MACH_MSP4200_EVAL 0 /* PMC-Sierra MSP4200 Evaluation */
48
-#define MACH_MSP4200_GW 1 /* PMC-Sierra MSP4200 Gateway demo */
49
-#define MACH_MSP4200_FPGA 2 /* PMC-Sierra MSP4200 Emulation */
50
-#define MACH_MSP7120_EVAL 3 /* PMC-Sierra MSP7120 Evaluation */
51
-#define MACH_MSP7120_GW 4 /* PMC-Sierra MSP7120 Residential GW */
52
-#define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */
53
-#define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */
54
-
55
-/*
5645 * Valid machtype for group Mikrotik
5746 */
5847 #define MACH_MIKROTIK_RB532 0 /* Mikrotik RouterBoard 532 */
....@@ -61,7 +50,7 @@
6150 /*
6251 * Valid machtype for Loongson family
6352 */
64
-enum loongson_machine_type {
53
+enum loongson2ef_machine_type {
6554 MACH_LOONGSON_UNKNOWN,
6655 MACH_LEMOTE_FL2E,
6756 MACH_LEMOTE_FL2F,
....@@ -70,49 +59,42 @@
7059 MACH_DEXXON_GDIUM2F10,
7160 MACH_LEMOTE_NAS,
7261 MACH_LEMOTE_LL2F,
73
- MACH_LOONGSON_GENERIC,
7462 MACH_LOONGSON_END
7563 };
7664
7765 /*
7866 * Valid machtype for group INGENIC
7967 */
80
-#define MACH_INGENIC_JZ4730 0 /* JZ4730 SOC */
81
-#define MACH_INGENIC_JZ4740 1 /* JZ4740 SOC */
82
-#define MACH_INGENIC_JZ4770 2 /* JZ4770 SOC */
83
-#define MACH_INGENIC_JZ4780 3 /* JZ4780 SOC */
68
+enum ingenic_machine_type {
69
+ MACH_INGENIC_UNKNOWN,
70
+ MACH_INGENIC_JZ4720,
71
+ MACH_INGENIC_JZ4725,
72
+ MACH_INGENIC_JZ4725B,
73
+ MACH_INGENIC_JZ4730,
74
+ MACH_INGENIC_JZ4740,
75
+ MACH_INGENIC_JZ4750,
76
+ MACH_INGENIC_JZ4755,
77
+ MACH_INGENIC_JZ4760,
78
+ MACH_INGENIC_JZ4770,
79
+ MACH_INGENIC_JZ4775,
80
+ MACH_INGENIC_JZ4780,
81
+ MACH_INGENIC_X1000,
82
+ MACH_INGENIC_X1000E,
83
+ MACH_INGENIC_X1830,
84
+ MACH_INGENIC_X2000,
85
+ MACH_INGENIC_X2000E,
86
+};
8487
8588 extern char *system_type;
8689 const char *get_system_type(void);
8790
8891 extern unsigned long mips_machtype;
8992
90
-#define BOOT_MEM_MAP_MAX 32
91
-#define BOOT_MEM_RAM 1
92
-#define BOOT_MEM_ROM_DATA 2
93
-#define BOOT_MEM_RESERVED 3
94
-#define BOOT_MEM_INIT_RAM 4
95
-
96
-/*
97
- * A memory map that's built upon what was determined
98
- * or specified on the command line.
99
- */
100
-struct boot_mem_map {
101
- int nr_map;
102
- struct boot_mem_map_entry {
103
- phys_addr_t addr; /* start of memory segment */
104
- phys_addr_t size; /* size of memory segment */
105
- long type; /* type of memory segment */
106
- } map[BOOT_MEM_MAP_MAX];
107
-};
108
-
109
-extern struct boot_mem_map boot_mem_map;
110
-
111
-extern void add_memory_region(phys_addr_t start, phys_addr_t size, long type);
11293 extern void detect_memory_region(phys_addr_t start, phys_addr_t sz_min, phys_addr_t sz_max);
11394
11495 extern void prom_init(void);
11596 extern void prom_free_prom_memory(void);
97
+extern void prom_cleanup(void);
11698
11799 extern void free_init_pages(const char *what,
118100 unsigned long begin, unsigned long end);
....@@ -134,7 +116,7 @@
134116 #endif
135117
136118 /*
137
- * Platform memory detection hook called by setup_arch
119
+ * Platform memory detection hook called by arch_mem_init()
138120 */
139121 extern void plat_mem_setup(void);
140122