diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-14 00:08:10 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-11 00:23:04 +0200 |
| commit | 9543b0cdd64ac0ba109b92eaf00e458b6223a6a8 (patch) | |
| tree | c5e2daa1c8589115b23f6157ecc4a71e4ee7e697 /hw/arm_boot.c | |
| parent | 20e93374e902450fa90ddd30eb4bf7d46da9ab76 (diff) | |
| download | qemu-9543b0cdd64ac0ba109b92eaf00e458b6223a6a8.zip qemu-9543b0cdd64ac0ba109b92eaf00e458b6223a6a8.tar.gz qemu-9543b0cdd64ac0ba109b92eaf00e458b6223a6a8.tar.bz2 | |
arm_boot: Pass ARMCPU to arm_boot_info::write_secondary_boot()
Adapt exynos4210 and highbank accordingly.
The parameter itself is unused.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Igor Mitsyanko <i.mitsyanko@samsung.com> (for exynos)
Diffstat (limited to 'hw/arm_boot.c')
| -rw-r--r-- | hw/arm_boot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/arm_boot.c b/hw/arm_boot.c index eb2d176..4955f01 100644 --- a/hw/arm_boot.c +++ b/hw/arm_boot.c @@ -59,7 +59,7 @@ static uint32_t smpboot[] = { 0 /* bootreg: Boot register address is held here */ }; -static void default_write_secondary(CPUARMState *env, +static void default_write_secondary(ARMCPU *cpu, const struct arm_boot_info *info) { int n; @@ -303,7 +303,7 @@ static void do_cpu_reset(void *opaque) void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info) { - ARMCPU *cpu; + ARMCPU *cpu = arm_env_get_cpu(env); int kernel_size; int initrd_size; int n; @@ -402,7 +402,7 @@ void arm_load_kernel(CPUARMState *env, struct arm_boot_info *info) rom_add_blob_fixed("bootloader", bootloader, sizeof(bootloader), info->loader_start); if (info->nb_cpus > 1) { - info->write_secondary_boot(env, info); + info->write_secondary_boot(cpu, info); } } info->is_linux = is_linux; |