Revision 462a8bc6
b/hw/arm-misc.h | ||
---|---|---|
31 | 31 |
target_phys_addr_t smp_priv_base; |
32 | 32 |
int nb_cpus; |
33 | 33 |
int board_id; |
34 |
int (*atag_board)(struct arm_boot_info *info, void *p); |
|
34 |
int (*atag_board)(const struct arm_boot_info *info, void *p);
|
|
35 | 35 |
/* Used internally by arm_boot.c */ |
36 | 36 |
int is_linux; |
37 | 37 |
target_phys_addr_t initrd_size; |
b/hw/arm_boot.c | ||
---|---|---|
49 | 49 |
p += 4; \ |
50 | 50 |
} while (0) |
51 | 51 |
|
52 |
static void set_kernel_args(struct arm_boot_info *info, |
|
52 |
static void set_kernel_args(const struct arm_boot_info *info,
|
|
53 | 53 |
int initrd_size, target_phys_addr_t base) |
54 | 54 |
{ |
55 | 55 |
target_phys_addr_t p; |
... | ... | |
102 | 102 |
WRITE_WORD(p, 0); |
103 | 103 |
} |
104 | 104 |
|
105 |
static void set_kernel_args_old(struct arm_boot_info *info, |
|
105 |
static void set_kernel_args_old(const struct arm_boot_info *info,
|
|
106 | 106 |
int initrd_size, target_phys_addr_t base) |
107 | 107 |
{ |
108 | 108 |
target_phys_addr_t p; |
... | ... | |
178 | 178 |
static void do_cpu_reset(void *opaque) |
179 | 179 |
{ |
180 | 180 |
CPUState *env = opaque; |
181 |
struct arm_boot_info *info = env->boot_info; |
|
181 |
const struct arm_boot_info *info = env->boot_info;
|
|
182 | 182 |
|
183 | 183 |
cpu_reset(env); |
184 | 184 |
if (info) { |
b/hw/nseries.c | ||
---|---|---|
1254 | 1254 |
return (void *) w - p; |
1255 | 1255 |
} |
1256 | 1256 |
|
1257 |
static int n800_atag_setup(struct arm_boot_info *info, void *p) |
|
1257 |
static int n800_atag_setup(const struct arm_boot_info *info, void *p)
|
|
1258 | 1258 |
{ |
1259 | 1259 |
return n8x0_atag_setup(p, 800); |
1260 | 1260 |
} |
1261 | 1261 |
|
1262 |
static int n810_atag_setup(struct arm_boot_info *info, void *p) |
|
1262 |
static int n810_atag_setup(const struct arm_boot_info *info, void *p)
|
|
1263 | 1263 |
{ |
1264 | 1264 |
return n8x0_atag_setup(p, 810); |
1265 | 1265 |
} |
b/target-arm/cpu.h | ||
---|---|---|
221 | 221 |
void *opaque; |
222 | 222 |
} cp[15]; |
223 | 223 |
void *nvic; |
224 |
struct arm_boot_info *boot_info; |
|
224 |
const struct arm_boot_info *boot_info;
|
|
225 | 225 |
} CPUARMState; |
226 | 226 |
|
227 | 227 |
CPUARMState *cpu_arm_init(const char *cpu_model); |
Also available in: Unified diff