Revision a8170e5e hw/arm_boot.c
| b/hw/arm_boot.c | ||
|---|---|---|
| 89 | 89 |
static void set_kernel_args(const struct arm_boot_info *info) |
| 90 | 90 |
{
|
| 91 | 91 |
int initrd_size = info->initrd_size; |
| 92 |
target_phys_addr_t base = info->loader_start;
|
|
| 93 |
target_phys_addr_t p;
|
|
| 92 |
hwaddr base = info->loader_start;
|
|
| 93 |
hwaddr p;
|
|
| 94 | 94 |
|
| 95 | 95 |
p = base + KERNEL_ARGS_ADDR; |
| 96 | 96 |
/* ATAG_CORE */ |
| ... | ... | |
| 142 | 142 |
|
| 143 | 143 |
static void set_kernel_args_old(const struct arm_boot_info *info) |
| 144 | 144 |
{
|
| 145 |
target_phys_addr_t p;
|
|
| 145 |
hwaddr p;
|
|
| 146 | 146 |
const char *s; |
| 147 | 147 |
int initrd_size = info->initrd_size; |
| 148 |
target_phys_addr_t base = info->loader_start;
|
|
| 148 |
hwaddr base = info->loader_start;
|
|
| 149 | 149 |
|
| 150 | 150 |
/* see linux/include/asm-arm/setup.h */ |
| 151 | 151 |
p = base + KERNEL_ARGS_ADDR; |
| ... | ... | |
| 213 | 213 |
} |
| 214 | 214 |
} |
| 215 | 215 |
|
| 216 |
static int load_dtb(target_phys_addr_t addr, const struct arm_boot_info *binfo)
|
|
| 216 |
static int load_dtb(hwaddr addr, const struct arm_boot_info *binfo)
|
|
| 217 | 217 |
{
|
| 218 | 218 |
#ifdef CONFIG_FDT |
| 219 | 219 |
uint32_t *mem_reg_property; |
| ... | ... | |
| 342 | 342 |
int n; |
| 343 | 343 |
int is_linux = 0; |
| 344 | 344 |
uint64_t elf_entry; |
| 345 |
target_phys_addr_t entry;
|
|
| 345 |
hwaddr entry;
|
|
| 346 | 346 |
int big_endian; |
| 347 | 347 |
QemuOpts *machine_opts; |
| 348 | 348 |
|
| ... | ... | |
| 419 | 419 |
*/ |
| 420 | 420 |
if (info->dtb_filename) {
|
| 421 | 421 |
/* Place the DTB after the initrd in memory */ |
| 422 |
target_phys_addr_t dtb_start = TARGET_PAGE_ALIGN(info->loader_start
|
|
| 422 |
hwaddr dtb_start = TARGET_PAGE_ALIGN(info->loader_start
|
|
| 423 | 423 |
+ INITRD_LOAD_ADDR |
| 424 | 424 |
+ initrd_size); |
| 425 | 425 |
if (load_dtb(dtb_start, info)) {
|
Also available in: Unified diff