diff mbox

[U-Boot,v9,07/15] ARM: Fix arm720t SPL build

Message ID 1345151056-16985-8-git-send-email-amartin@nvidia.com
State Superseded
Headers show

Commit Message

Allen Martin Aug. 16, 2012, 9:04 p.m. UTC
Take a few SPL fixes from armv7 and apply them to arm720t:
-Use dummy exception handlers for SPL build
-Initialize relocation register r9 to 0 for the case of no relocation
-ifdef out interrupt handler code

Signed-off-by: Allen Martin <amartin@nvidia.com>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
Signed-off-by: Tom Warren <twarren@nvidia.com>
---
 arch/arm/cpu/arm720t/start.S |   13 +++++++++++++
 1 file changed, 13 insertions(+)

Comments

seedshope Aug. 16, 2012, 11:03 p.m. UTC | #1
On 08/17/2012 05:04 AM, Allen Martin wrote:
> Take a few SPL fixes from armv7 and apply them to arm720t:
> -Use dummy exception handlers for SPL build
> -Initialize relocation register r9 to 0 for the case of no relocation
> -ifdef out interrupt handler code
> 
> Signed-off-by: Allen Martin <amartin@nvidia.com>
> Acked-by: Stephen Warren <swarren@wwwdotorg.org>
> Tested-by: Thierry Reding <thierry.reding@avionic-design.de>
> Signed-off-by: Tom Warren <twarren@nvidia.com>
> ---
>  arch/arm/cpu/arm720t/start.S |   13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
> index 3b97e80..dc047b8 100644
> --- a/arch/arm/cpu/arm720t/start.S
> +++ b/arch/arm/cpu/arm720t/start.S
> @@ -51,6 +51,15 @@ _start: b	reset
>  	ldr	pc, _irq
>  	ldr	pc, _fiq
>  
> +#ifdef CONFIG_SPL_BUILD
> +_undefined_instruction: .word _undefined_instruction
> +_software_interrupt:	.word _software_interrupt
> +_prefetch_abort:	.word _prefetch_abort
> +_data_abort:		.word _data_abort
> +_not_used:		.word _not_used
> +_irq:			.word _irq
> +_fiq:			.word _fiq
> +#else
>  _undefined_instruction: .word undefined_instruction
>  _software_interrupt:	.word software_interrupt
>  _prefetch_abort:	.word prefetch_abort
> @@ -58,6 +67,7 @@ _data_abort:		.word data_abort
>  _not_used:		.word not_used
>  _irq:			.word irq
>  _fiq:			.word fiq
> +#endif	/* CONFIG_SPL_BUILD */
>  
>  	.balignl 16,0xdeadbeef
>  
> @@ -167,6 +177,7 @@ stack_setup:
>  
>  	adr	r0, _start
>  	cmp	r0, r6
> +	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
Hi Allen,

I have already do a patch to fix all the arm common issue:

http://patchwork.ozlabs.org/patch/174471/
[V2] arm: Fixed the offset for the no relocation.

Thanks,
hongbo
>  	beq	clear_bss		/* skip relocation */
>  	mov	r1, r6			/* r1 <- scratch for copy_loop */
>  	ldr	r3, _bss_start_ofs
> @@ -427,6 +438,7 @@ lock_loop:
>  	mov	pc, lr
>  
>  
> +#ifndef CONFIG_SPL_BUILD
>  /*
>   *************************************************************************
>   *
> @@ -589,6 +601,7 @@ fiq:
>  	bl	do_fiq
>  
>  #endif
> +#endif /* CONFIG_SPL_BUILD */
>  
>  #if defined(CONFIG_NETARM)
>  	.align	5
> 
f
Allen Martin Aug. 17, 2012, 9:17 p.m. UTC | #2
On Thu, Aug 16, 2012 at 04:03:15PM -0700, Zhong Hongbo wrote:
> On 08/17/2012 05:04 AM, Allen Martin wrote:
> > @@ -167,6 +177,7 @@ stack_setup:
> >  
> >  	adr	r0, _start
> >  	cmp	r0, r6
> > +	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
> Hi Allen,
> 
> I have already do a patch to fix all the arm common issue:
> 
> http://patchwork.ozlabs.org/patch/174471/
> [V2] arm: Fixed the offset for the no relocation.
> 

Thanks for pointing that out, what's the status of that patch?  Is it
being reviewed for u-boot/master?  My patch is being carried in the
u-boot-tegra/master tree and Tom is about to issue a pull request for
u-boot-arm.  If your patch is going up first I can rebase mine on top
of that.

-Allen
seedshope Aug. 17, 2012, 10:44 p.m. UTC | #3
On 08/18/2012 05:17 AM, Allen Martin wrote:
> On Thu, Aug 16, 2012 at 04:03:15PM -0700, Zhong Hongbo wrote:
>> On 08/17/2012 05:04 AM, Allen Martin wrote:
>>> @@ -167,6 +177,7 @@ stack_setup:
>>>  
>>>  	adr	r0, _start
>>>  	cmp	r0, r6
>>> +	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
>> Hi Allen,
>>
>> I have already do a patch to fix all the arm common issue:
>>
>> http://patchwork.ozlabs.org/patch/174471/
>> [V2] arm: Fixed the offset for the no relocation.
>>
Hi Allen
> 
> Thanks for pointing that out, what's the status of that patch?

At first, I fix the issue in arm1176 and send it in my s3c64xx patch
thread, But Albert suggest me to correct all the arm platform.

> Is it being reviewed for u-boot/master?

Up to now, I have not o receive any response from the patch.

> My patch is being carried in the u-boot-tegra/master tree and Tom is about to issue a pull request for
> u-boot-arm.  If your patch is going up first I can rebase mine on top
> of that.

Ok,

Thanks,
hongbo
> 
> -Allen
>
Albert ARIBAUD Aug. 18, 2012, 6:59 a.m. UTC | #4
Le 18/08/2012 00:44, Zhong Hongbo a écrit :
> On 08/18/2012 05:17 AM, Allen Martin wrote:
>> On Thu, Aug 16, 2012 at 04:03:15PM -0700, Zhong Hongbo wrote:
>>> On 08/17/2012 05:04 AM, Allen Martin wrote:
>>>> @@ -167,6 +177,7 @@ stack_setup:
>>>>
>>>>   	adr	r0, _start
>>>>   	cmp	r0, r6
>>>> +	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
>>> Hi Allen,
>>>
>>> I have already do a patch to fix all the arm common issue:
>>>
>>> http://patchwork.ozlabs.org/patch/174471/
>>> [V2] arm: Fixed the offset for the no relocation.
>>>
> Hi Allen
>>
>> Thanks for pointing that out, what's the status of that patch?
>
> At first, I fix the issue in arm1176 and send it in my s3c64xx patch
> thread, But Albert suggest me to correct all the arm platform.
>
>> Is it being reviewed for u-boot/master?
>
> Up to now, I have not o receive any response from the patch.
>
>> My patch is being carried in the u-boot-tegra/master tree and Tom is about to issue a pull request for
>> u-boot-arm.  If your patch is going up first I can rebase mine on top
>> of that.
>
> Ok,
>
> Thanks,
> hongbo
>>
>> -Allen

1. Somebody is using my non-u-boot e-mail address for u-boot mails... 
Anyone, please make sure you're using albert.u.boot@aribaud.net, not 
albert.aribaud@free.fr.

2. I'll check Hongbo's patch series sometime on Sunday and do some 
regression on it.

Amicalement,
diff mbox

Patch

diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S
index 3b97e80..dc047b8 100644
--- a/arch/arm/cpu/arm720t/start.S
+++ b/arch/arm/cpu/arm720t/start.S
@@ -51,6 +51,15 @@  _start: b	reset
 	ldr	pc, _irq
 	ldr	pc, _fiq
 
+#ifdef CONFIG_SPL_BUILD
+_undefined_instruction: .word _undefined_instruction
+_software_interrupt:	.word _software_interrupt
+_prefetch_abort:	.word _prefetch_abort
+_data_abort:		.word _data_abort
+_not_used:		.word _not_used
+_irq:			.word _irq
+_fiq:			.word _fiq
+#else
 _undefined_instruction: .word undefined_instruction
 _software_interrupt:	.word software_interrupt
 _prefetch_abort:	.word prefetch_abort
@@ -58,6 +67,7 @@  _data_abort:		.word data_abort
 _not_used:		.word not_used
 _irq:			.word irq
 _fiq:			.word fiq
+#endif	/* CONFIG_SPL_BUILD */
 
 	.balignl 16,0xdeadbeef
 
@@ -167,6 +177,7 @@  stack_setup:
 
 	adr	r0, _start
 	cmp	r0, r6
+	moveq	r9, #0		/* no relocation. relocation offset(r9) = 0 */
 	beq	clear_bss		/* skip relocation */
 	mov	r1, r6			/* r1 <- scratch for copy_loop */
 	ldr	r3, _bss_start_ofs
@@ -427,6 +438,7 @@  lock_loop:
 	mov	pc, lr
 
 
+#ifndef CONFIG_SPL_BUILD
 /*
  *************************************************************************
  *
@@ -589,6 +601,7 @@  fiq:
 	bl	do_fiq
 
 #endif
+#endif /* CONFIG_SPL_BUILD */
 
 #if defined(CONFIG_NETARM)
 	.align	5