* [Qemu-devel] [PATCH] arm: allow machine IDs > 0xffff
@ 2012-01-20 18:43 Grant Likely
2012-01-20 20:43 ` Grant Likely
0 siblings, 1 reply; 3+ messages in thread
From: Grant Likely @ 2012-01-20 18:43 UTC (permalink / raw)
To: qemu-devel
Cc: Grant Likely, Peter Maydell, Jeremy Kerr, Paul Brook, Rob Herring
From: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Cc: Paul Brook <paul@codesourcery.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
hw/arm_boot.c | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/hw/arm_boot.c b/hw/arm_boot.c
index de8f1a4..f2b7332 100644
--- a/hw/arm_boot.c
+++ b/hw/arm_boot.c
@@ -26,10 +26,10 @@
/* The worlds second smallest bootloader. Set r0-r2, then jump to kernel. */
static uint32_t bootloader[] = {
0xe3a00000, /* mov r0, #0 */
- 0xe3a01000, /* mov r1, #0x?? */
- 0xe3811c00, /* orr r1, r1, #0x??00 */
- 0xe59f2000, /* ldr r2, [pc, #0] */
- 0xe59ff000, /* ldr pc, [pc, #0] */
+ 0xe59f1004, /* ldr r1, [pc, #4] */
+ 0xe59f2004, /* ldr r2, [pc, #4] */
+ 0xe59ff004, /* ldr pc, [pc, #4] */
+ 0, /* Machine ID */
0, /* Address of kernel args. Set by integratorcp_init. */
0 /* Kernel entry point. Set by integratorcp_init. */
};
@@ -327,8 +327,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info)
} else {
initrd_size = 0;
}
- bootloader[1] |= info->board_id & 0xff;
- bootloader[2] |= (info->board_id >> 8) & 0xff;
+ bootloader[4] = info->board_id;
/* for device tree boot, we pass the DTB directly in r2. Otherwise
* we point to the kernel args */
if (info->dtb_filename)
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] arm: allow machine IDs > 0xffff
2012-01-20 18:43 [Qemu-devel] [PATCH] arm: allow machine IDs > 0xffff Grant Likely
@ 2012-01-20 20:43 ` Grant Likely
2012-01-21 2:36 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Grant Likely @ 2012-01-20 20:43 UTC (permalink / raw)
To: qemu-devel
Cc: Grant Likely, Peter Maydell, Jeremy Kerr, Paul Brook, Rob Herring
On Fri, Jan 20, 2012 at 11:43 AM, Grant Likely
<grant.likely@secretlab.ca> wrote:
> From: Jeremy Kerr <jeremy.kerr@canonical.com>
>
> Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
> Cc: Paul Brook <paul@codesourcery.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Rob Herring <rob.herring@calxeda.com>
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Oops, this one won't apply directly since it's build on top of another
patch. I'll repost a clean version soon.
g.
> ---
> hw/arm_boot.c | 11 +++++------
> 1 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/hw/arm_boot.c b/hw/arm_boot.c
> index de8f1a4..f2b7332 100644
> --- a/hw/arm_boot.c
> +++ b/hw/arm_boot.c
> @@ -26,10 +26,10 @@
> /* The worlds second smallest bootloader. Set r0-r2, then jump to kernel. */
> static uint32_t bootloader[] = {
> 0xe3a00000, /* mov r0, #0 */
> - 0xe3a01000, /* mov r1, #0x?? */
> - 0xe3811c00, /* orr r1, r1, #0x??00 */
> - 0xe59f2000, /* ldr r2, [pc, #0] */
> - 0xe59ff000, /* ldr pc, [pc, #0] */
> + 0xe59f1004, /* ldr r1, [pc, #4] */
> + 0xe59f2004, /* ldr r2, [pc, #4] */
> + 0xe59ff004, /* ldr pc, [pc, #4] */
> + 0, /* Machine ID */
> 0, /* Address of kernel args. Set by integratorcp_init. */
> 0 /* Kernel entry point. Set by integratorcp_init. */
> };
> @@ -327,8 +327,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info)
> } else {
> initrd_size = 0;
> }
> - bootloader[1] |= info->board_id & 0xff;
> - bootloader[2] |= (info->board_id >> 8) & 0xff;
> + bootloader[4] = info->board_id;
> /* for device tree boot, we pass the DTB directly in r2. Otherwise
> * we point to the kernel args */
> if (info->dtb_filename)
> --
> 1.7.5.4
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] arm: allow machine IDs > 0xffff
2012-01-20 20:43 ` Grant Likely
@ 2012-01-21 2:36 ` Peter Maydell
0 siblings, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2012-01-21 2:36 UTC (permalink / raw)
To: Grant Likely; +Cc: Jeremy Kerr, qemu-devel, Rob Herring, Paul Brook
On 20 January 2012 20:43, Grant Likely <grant.likely@secretlab.ca> wrote:
> On Fri, Jan 20, 2012 at 11:43 AM, Grant Likely
> <grant.likely@secretlab.ca> wrote:
>> From: Jeremy Kerr <jeremy.kerr@canonical.com>
>>
>> Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
>> Cc: Paul Brook <paul@codesourcery.com>
>> Cc: Peter Maydell <peter.maydell@linaro.org>
>> Cc: Rob Herring <rob.herring@calxeda.com>
>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>
> Oops, this one won't apply directly since it's build on top of another
> patch. I'll repost a clean version soon.
I already sent basically exactly this patch to the list, so don't
worry about it :-)
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-21 2:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-20 18:43 [Qemu-devel] [PATCH] arm: allow machine IDs > 0xffff Grant Likely
2012-01-20 20:43 ` Grant Likely
2012-01-21 2:36 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).