Message ID | 1461188128-1107-1-git-send-email-sylvain@sylvaingarrigues.com |
---|---|
State | New |
Headers | show |
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
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
Signed-off-by: Sylvain Garrigues <sylvain@sylvaingarrigues.com> --- hw/arm/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)