[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition
From: |
Paul Brook |
Subject: |
Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition |
Date: |
Wed, 8 Feb 2012 09:06:39 +0000 |
User-agent: |
KMail/1.13.7 (Linux/3.1.0-1-amd64; KDE/4.6.5; x86_64; ; ) |
> diff --git a/hw/versatilepb.c b/hw/versatilepb.c
> index 6e28e78..e42d845 100644
> --- a/hw/versatilepb.c
> +++ b/hw/versatilepb.c
> @@ -313,12 +313,14 @@ static void versatile_init(ram_addr_t ram_size,
> /* 0x101f3000 UART2. */
> /* 0x101f4000 SSPI. */
>
> - versatile_binfo.ram_size = ram_size;
> - versatile_binfo.kernel_filename = kernel_filename;
> - versatile_binfo.kernel_cmdline = kernel_cmdline;
> - versatile_binfo.initrd_filename = initrd_filename;
> - versatile_binfo.board_id = board_id;
> - arm_load_kernel(env, &versatile_binfo);
> + if (kernel_filename) {
> + versatile_binfo.ram_size = ram_size;
> + versatile_binfo.kernel_filename = kernel_filename;
> + versatile_binfo.kernel_cmdline = kernel_cmdline;
> + versatile_binfo.initrd_filename = initrd_filename;
> + versatile_binfo.board_id = board_id;
> + arm_load_kernel(env, &versatile_binfo);
> + }
> }
This should be using the new object you just added.
You also need to fix all the other uses of arm_load_kernel.
Paul
- [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Peter A. G. Crosthwaite, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition,
Paul Brook <=
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Peter Crosthwaite, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Paul Brook, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Peter Crosthwaite, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Paul Brook, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Peter Crosthwaite, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Paul Brook, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Alexander Graf, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Peter Crosthwaite, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Alexander Graf, 2012/02/08
- Re: [Qemu-devel] [RFC PATCH] arm boot: added QOM device definition, Peter Crosthwaite, 2012/02/08