diff mbox

[U-Boot,3/6] configs: am335x_evm: Use omap2 generic spl load script

Message ID 20170422065048.8617-4-lokeshvutla@ti.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Lokesh Vutla April 22, 2017, 6:50 a.m. UTC
No reason to use a separate load script for am33xx than using
omap-common load script.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 include/configs/am335x_evm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrew Davis April 24, 2017, 3:23 p.m. UTC | #1
On 04/22/2017 01:50 AM, Lokesh Vutla wrote:
> No reason to use a separate load script for am33xx than using
> omap-common load script.
> 
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> ---
>  include/configs/am335x_evm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> index fc8a08f5b7..796d5c32e9 100644
> --- a/include/configs/am335x_evm.h
> +++ b/include/configs/am335x_evm.h
> @@ -194,7 +194,7 @@
>  
>  /* USB gadget RNDIS */
>  
> -#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
> +#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"

Can we make this change to all other am335x platforms? They all are
copy/paste from this config and now need to also be updated. After that
we should delete am33xx/u-boot-spl.lds.

>  #endif
>  
>  #ifdef CONFIG_NAND
>
Lokesh Vutla April 25, 2017, 4:13 a.m. UTC | #2
On Monday 24 April 2017 08:53 PM, Andrew F. Davis wrote:
> On 04/22/2017 01:50 AM, Lokesh Vutla wrote:
>> No reason to use a separate load script for am33xx than using
>> omap-common load script.
>>
>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>> ---
>>  include/configs/am335x_evm.h | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
>> index fc8a08f5b7..796d5c32e9 100644
>> --- a/include/configs/am335x_evm.h
>> +++ b/include/configs/am335x_evm.h
>> @@ -194,7 +194,7 @@
>>  
>>  /* USB gadget RNDIS */
>>  
>> -#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
>> +#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
> 
> Can we make this change to all other am335x platforms? They all are
> copy/paste from this config and now need to also be updated. After that
> we should delete am33xx/u-boot-spl.lds.

okay. Ill also wait for Tom to comment on rest of the series, and then
post v2.

Thanks and regards,
Lokesh
Tom Rini April 25, 2017, 9:10 p.m. UTC | #3
On Mon, Apr 24, 2017 at 10:23:17AM -0500, Andrew F. Davis wrote:
> On 04/22/2017 01:50 AM, Lokesh Vutla wrote:
> > No reason to use a separate load script for am33xx than using
> > omap-common load script.
> > 
> > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> > ---
> >  include/configs/am335x_evm.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> > index fc8a08f5b7..796d5c32e9 100644
> > --- a/include/configs/am335x_evm.h
> > +++ b/include/configs/am335x_evm.h
> > @@ -194,7 +194,7 @@
> >  
> >  /* USB gadget RNDIS */
> >  
> > -#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
> > +#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
> 
> Can we make this change to all other am335x platforms? They all are
> copy/paste from this config and now need to also be updated. After that
> we should delete am33xx/u-boot-spl.lds.

Agreed.  It looks like d0b5d9da5de2 needs to be done to
arch/arm/mach-omap2/u-boot-spl.lds as well, btw.
Lokesh Vutla April 26, 2017, 6:14 a.m. UTC | #4
On Wednesday 26 April 2017 02:40 AM, Tom Rini wrote:
> On Mon, Apr 24, 2017 at 10:23:17AM -0500, Andrew F. Davis wrote:
>> On 04/22/2017 01:50 AM, Lokesh Vutla wrote:
>>> No reason to use a separate load script for am33xx than using
>>> omap-common load script.
>>>
>>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
>>> ---
>>>  include/configs/am335x_evm.h | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
>>> index fc8a08f5b7..796d5c32e9 100644
>>> --- a/include/configs/am335x_evm.h
>>> +++ b/include/configs/am335x_evm.h
>>> @@ -194,7 +194,7 @@
>>>  
>>>  /* USB gadget RNDIS */
>>>  
>>> -#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
>>> +#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
>>
>> Can we make this change to all other am335x platforms? They all are
>> copy/paste from this config and now need to also be updated. After that
>> we should delete am33xx/u-boot-spl.lds.
> 
> Agreed.  It looks like d0b5d9da5de2 needs to be done to
> arch/arm/mach-omap2/u-boot-spl.lds as well, btw.

The mentioned commit takes care of mach-omap2/u-boot-spl.lds(It was
arch/arm/cpu/armv7/omap-common/u-boot-spl.lds) as well. Or did I miss
something?

Thanks and regards,
Lokesh

>
Tom Rini April 26, 2017, 11:25 a.m. UTC | #5
On Wed, Apr 26, 2017 at 11:44:13AM +0530, Lokesh Vutla wrote:
> 
> 
> On Wednesday 26 April 2017 02:40 AM, Tom Rini wrote:
> > On Mon, Apr 24, 2017 at 10:23:17AM -0500, Andrew F. Davis wrote:
> >> On 04/22/2017 01:50 AM, Lokesh Vutla wrote:
> >>> No reason to use a separate load script for am33xx than using
> >>> omap-common load script.
> >>>
> >>> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
> >>> ---
> >>>  include/configs/am335x_evm.h | 2 +-
> >>>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>>
> >>> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
> >>> index fc8a08f5b7..796d5c32e9 100644
> >>> --- a/include/configs/am335x_evm.h
> >>> +++ b/include/configs/am335x_evm.h
> >>> @@ -194,7 +194,7 @@
> >>>  
> >>>  /* USB gadget RNDIS */
> >>>  
> >>> -#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
> >>> +#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
> >>
> >> Can we make this change to all other am335x platforms? They all are
> >> copy/paste from this config and now need to also be updated. After that
> >> we should delete am33xx/u-boot-spl.lds.
> > 
> > Agreed.  It looks like d0b5d9da5de2 needs to be done to
> > arch/arm/mach-omap2/u-boot-spl.lds as well, btw.
> 
> The mentioned commit takes care of mach-omap2/u-boot-spl.lds(It was
> arch/arm/cpu/armv7/omap-common/u-boot-spl.lds) as well. Or did I miss
> something?

No, maybe I just mis-read the diff yesterday morning, sorry, thanks!
diff mbox

Patch

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index fc8a08f5b7..796d5c32e9 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -194,7 +194,7 @@ 
 
 /* USB gadget RNDIS */
 
-#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/am33xx/u-boot-spl.lds"
+#define CONFIG_SPL_LDSCRIPT		"arch/arm/mach-omap2/u-boot-spl.lds"
 #endif
 
 #ifdef CONFIG_NAND