diff mbox

[U-Boot] qemu-ppce500: Align code at 64k boundary

Message ID 1429719224-24857-1-git-send-email-agraf@suse.de
State Not Applicable
Delegated to: York Sun
Headers show

Commit Message

Alexander Graf April 22, 2015, 4:13 p.m. UTC
The QEMU u-boot located itself at a 4k aligned offset which the rest
of the code didn't really expect. Align it with 64k to allow the memory
code to deal with 64k granularity.

This fixes broken interrupt delivery with the ppce500 machine for me.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 include/configs/qemu-ppce500.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Scott Wood April 23, 2015, 2:26 a.m. UTC | #1
On Wed, 2015-04-22 at 18:13 +0200, Alexander Graf wrote:
> The QEMU u-boot located itself at a 4k aligned offset which the rest
> of the code didn't really expect. Align it with 64k to allow the memory
> code to deal with 64k granularity.
> 
> This fixes broken interrupt delivery with the ppce500 machine for me.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>
> ---
>  include/configs/qemu-ppce500.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
> index 7071849..ec90797 100644
> --- a/include/configs/qemu-ppce500.h
> +++ b/include/configs/qemu-ppce500.h
> @@ -18,7 +18,7 @@
>  #define CONFIG_QEMU_E500
>  
>  #undef CONFIG_SYS_TEXT_BASE
> -#define CONFIG_SYS_TEXT_BASE	0xf01000 /* 15 MB */
> +#define CONFIG_SYS_TEXT_BASE	0xf10000 /* 15 MB */
>  #define CONFIG_SYS_GENERIC_BOARD
>  
>  #define CONFIG_SYS_MPC85XX_NO_RESETVEC

I think we have a similar problem with NAND, SD, etc. boot on some
targets.  I'll try to fix it so that the existing addresses work.

-Scott
York Sun June 29, 2015, 6:17 p.m. UTC | #2
Scott,

I lost track on your progress. Please let me know if I should hold this one or
drop it.

York

On 04/22/2015 07:26 PM, Scott Wood wrote:
> On Wed, 2015-04-22 at 18:13 +0200, Alexander Graf wrote:
>> The QEMU u-boot located itself at a 4k aligned offset which the rest
>> of the code didn't really expect. Align it with 64k to allow the memory
>> code to deal with 64k granularity.
>>
>> This fixes broken interrupt delivery with the ppce500 machine for me.
>>
>> Signed-off-by: Alexander Graf <agraf@suse.de>
>> ---
>>  include/configs/qemu-ppce500.h |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
>> index 7071849..ec90797 100644
>> --- a/include/configs/qemu-ppce500.h
>> +++ b/include/configs/qemu-ppce500.h
>> @@ -18,7 +18,7 @@
>>  #define CONFIG_QEMU_E500
>>  
>>  #undef CONFIG_SYS_TEXT_BASE
>> -#define CONFIG_SYS_TEXT_BASE	0xf01000 /* 15 MB */
>> +#define CONFIG_SYS_TEXT_BASE	0xf10000 /* 15 MB */
>>  #define CONFIG_SYS_GENERIC_BOARD
>>  
>>  #define CONFIG_SYS_MPC85XX_NO_RESETVEC
> 
> I think we have a similar problem with NAND, SD, etc. boot on some
> targets.  I'll try to fix it so that the existing addresses work.
> 
> -Scott
> 
>
Scott Wood June 29, 2015, 6:38 p.m. UTC | #3
On Mon, 2015-06-29 at 11:17 -0700, York Sun wrote:
> Scott,
> 
> I lost track on your progress. Please let me know if I should hold this one 
> or
> drop it.
> 
> York

It shouldn't be needed anymore, as of commit 
e1bfd1c6b7bc0dc530247fd9108feba3147adf36 ("powerpc/mpc85xx: Use GOT when 
loading IVORs post-relocation").

-Scott

> On 04/22/2015 07:26 PM, Scott Wood wrote:
> > On Wed, 2015-04-22 at 18:13 +0200, Alexander Graf wrote:
> > > The QEMU u-boot located itself at a 4k aligned offset which the rest
> > > of the code didn't really expect. Align it with 64k to allow the memory
> > > code to deal with 64k granularity.
> > > 
> > > This fixes broken interrupt delivery with the ppce500 machine for me.
> > > 
> > > Signed-off-by: Alexander Graf <agraf@suse.de>
> > > ---
> > >  include/configs/qemu-ppce500.h |    2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-
> > > ppce500.h
> > > index 7071849..ec90797 100644
> > > --- a/include/configs/qemu-ppce500.h
> > > +++ b/include/configs/qemu-ppce500.h
> > > @@ -18,7 +18,7 @@
> > >  #define CONFIG_QEMU_E500
> > >  
> > >  #undef CONFIG_SYS_TEXT_BASE
> > > -#define CONFIG_SYS_TEXT_BASE     0xf01000 /* 15 MB */
> > > +#define CONFIG_SYS_TEXT_BASE     0xf10000 /* 15 MB */
> > >  #define CONFIG_SYS_GENERIC_BOARD
> > >  
> > >  #define CONFIG_SYS_MPC85XX_NO_RESETVEC
> > 
> > I think we have a similar problem with NAND, SD, etc. boot on some
> > targets.  I'll try to fix it so that the existing addresses work.
> > 
> > -Scott
> > 
> >
diff mbox

Patch

diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h
index 7071849..ec90797 100644
--- a/include/configs/qemu-ppce500.h
+++ b/include/configs/qemu-ppce500.h
@@ -18,7 +18,7 @@ 
 #define CONFIG_QEMU_E500
 
 #undef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE	0xf01000 /* 15 MB */
+#define CONFIG_SYS_TEXT_BASE	0xf10000 /* 15 MB */
 #define CONFIG_SYS_GENERIC_BOARD
 
 #define CONFIG_SYS_MPC85XX_NO_RESETVEC