* [Qemu-devel] [PATCH] Fix the ARM bootloader so that r0 is always 0 before jumping to the kernel entry point
@ 2016-04-20 21:35 Sylvain Garrigues
2016-04-21 12:14 ` Peter Maydell
0 siblings, 1 reply; 2+ messages in thread
From: Sylvain Garrigues @ 2016-04-20 21:35 UTC (permalink / raw)
To: Peter Maydell, qemu-arm; +Cc: qemu-devel, Sylvain Garrigues
Signed-off-by: Sylvain Garrigues <sylvain@sylvaingarrigues.com>
---
hw/arm/boot.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 5975fbf..5876945 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -68,7 +68,7 @@ static const ARMInsnFixup bootloader_aarch64[] = {
*/
static const ARMInsnFixup bootloader[] = {
- { 0xe28fe008 }, /* add lr, pc, #8 */
+ { 0xe28fe004 }, /* add lr, pc, #4 */
{ 0xe51ff004 }, /* ldr pc, [pc, #-4] */
{ 0, FIXUP_BOARD_SETUP },
#define BOOTLOADER_NO_BOARD_SETUP_OFFSET 3
--
2.8.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [Qemu-devel] [PATCH] Fix the ARM bootloader so that r0 is always 0 before jumping to the kernel entry point
2016-04-20 21:35 [Qemu-devel] [PATCH] Fix the ARM bootloader so that r0 is always 0 before jumping to the kernel entry point Sylvain Garrigues
@ 2016-04-21 12:14 ` Peter Maydell
0 siblings, 0 replies; 2+ messages in thread
From: Peter Maydell @ 2016-04-21 12:14 UTC (permalink / raw)
To: Sylvain Garrigues; +Cc: qemu-arm, QEMU Developers
On 20 April 2016 at 22:35, Sylvain Garrigues
<sylvain@sylvaingarrigues.com> wrote:
> Signed-off-by: Sylvain Garrigues <sylvain@sylvaingarrigues.com>
> ---
> hw/arm/boot.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/arm/boot.c b/hw/arm/boot.c
> index 5975fbf..5876945 100644
> --- a/hw/arm/boot.c
> +++ b/hw/arm/boot.c
> @@ -68,7 +68,7 @@ static const ARMInsnFixup bootloader_aarch64[] = {
> */
>
> static const ARMInsnFixup bootloader[] = {
> - { 0xe28fe008 }, /* add lr, pc, #8 */
> + { 0xe28fe004 }, /* add lr, pc, #4 */
> { 0xe51ff004 }, /* ldr pc, [pc, #-4] */
> { 0, FIXUP_BOARD_SETUP },
> #define BOOTLOADER_NO_BOARD_SETUP_OFFSET 3
Applied, to master, thanks. (I expanded the commit message a bit.)
-- PMM
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-21 12:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-20 21:35 [Qemu-devel] [PATCH] Fix the ARM bootloader so that r0 is always 0 before jumping to the kernel entry point Sylvain Garrigues
2016-04-21 12:14 ` 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).