public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] nios2: clean up comments style in start.S
@ 2015-10-06  7:30 Thomas Chou
  2015-10-13 13:13 ` Thomas Chou
  0 siblings, 1 reply; 2+ messages in thread
From: Thomas Chou @ 2015-10-06  7:30 UTC (permalink / raw)
  To: u-boot

Clean up comments style in start.S.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
 arch/nios2/cpu/start.S | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
index 90e0310..00cec40 100644
--- a/arch/nios2/cpu/start.S
+++ b/arch/nios2/cpu/start.S
@@ -18,7 +18,8 @@
 
 _start:
 	wrctl	status, r0		/* Disable interrupts */
-	/* ICACHE INIT -- only the icache line at the reset address
+	/*
+	 * ICACHE INIT -- only the icache line at the reset address
 	 * is invalidated at reset. So the init must stay within
 	 * the cache line size (8 words). If GERMS is used, we'll
 	 * just be invalidating the cache a second time. If cache
@@ -32,7 +33,8 @@ _start:
 	bgt	r5, r0, 0b
 	br	_except_end	/* Skip the tramp */
 
-	/* EXCEPTION TRAMPOLINE -- the following gets copied
+	/*
+	 * EXCEPTION TRAMPOLINE -- the following gets copied
 	 * to the exception address (below), but is otherwise at the
 	 * default exception vector offset (0x0020).
 	 */
@@ -42,12 +44,14 @@ _except_start:
 	jmp	et
 _except_end:
 
-	/* INTERRUPTS -- for now, all interrupts masked and globally
+	/*
+	 * INTERRUPTS -- for now, all interrupts masked and globally
 	 * disabled.
 	 */
 	wrctl	ienable, r0		/* All disabled	*/
 
-	/* DCACHE INIT -- if dcache not implemented, initd behaves as
+	/*
+	 * DCACHE INIT -- if dcache not implemented, initd behaves as
 	 * nop.
 	 */
 	movhi	r4, %hi(CONFIG_SYS_DCACHELINE_SIZE)
@@ -59,7 +63,8 @@ _except_end:
 	add	r6, r6, r4
 	bltu	r6, r5, 1b
 
-	/* RELOCATE CODE, DATA & COMMAND TABLE -- the following code
+	/*
+	 * RELOCATE CODE, DATA & COMMAND TABLE -- the following code
 	 * assumes code, data and the command table are all
 	 * contiguous. This lets us relocate everything as a single
 	 * block. Make sure the linker script matches this ;-)
@@ -89,8 +94,7 @@ _cur:	movhi	r5, %hi(_cur - _start)
 	jmp	r4
 _reloc:
 
-	/* STACK INIT -- zero top two words for call back chain.
-	 */
+	/* STACK INIT -- zero top two words for call back chain. */
 	movhi	sp, %hi(CONFIG_SYS_INIT_SP)
 	ori	sp, sp, %lo(CONFIG_SYS_INIT_SP)
 	addi	sp, sp, -8
@@ -116,7 +120,8 @@ _reloc:
 	ori	r2, r2, %lo(board_init_f at h)
 	callr	r2
 
-	/* NEVER RETURNS -- but branch to the _start just
+	/*
+	 * NEVER RETURNS -- but branch to the _start just
 	 * in case ;-)
 	 */
 	br	_start
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [U-Boot] [PATCH] nios2: clean up comments style in start.S
  2015-10-06  7:30 [U-Boot] [PATCH] nios2: clean up comments style in start.S Thomas Chou
@ 2015-10-13 13:13 ` Thomas Chou
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Chou @ 2015-10-13 13:13 UTC (permalink / raw)
  To: u-boot



On 10/06/2015 03:30 PM, Thomas Chou wrote:
> Clean up comments style in start.S.
>
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> ---
>   arch/nios2/cpu/start.S | 21 +++++++++++++--------
>   1 file changed, 13 insertions(+), 8 deletions(-)
>

Applied to u-boot-nios.

> diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S
> index 90e0310..00cec40 100644
> --- a/arch/nios2/cpu/start.S
> +++ b/arch/nios2/cpu/start.S
> @@ -18,7 +18,8 @@
>
>   _start:
>   	wrctl	status, r0		/* Disable interrupts */
> -	/* ICACHE INIT -- only the icache line at the reset address
> +	/*
> +	 * ICACHE INIT -- only the icache line at the reset address
>   	 * is invalidated at reset. So the init must stay within
>   	 * the cache line size (8 words). If GERMS is used, we'll
>   	 * just be invalidating the cache a second time. If cache
> @@ -32,7 +33,8 @@ _start:
>   	bgt	r5, r0, 0b
>   	br	_except_end	/* Skip the tramp */
>
> -	/* EXCEPTION TRAMPOLINE -- the following gets copied
> +	/*
> +	 * EXCEPTION TRAMPOLINE -- the following gets copied
>   	 * to the exception address (below), but is otherwise at the
>   	 * default exception vector offset (0x0020).
>   	 */
> @@ -42,12 +44,14 @@ _except_start:
>   	jmp	et
>   _except_end:
>
> -	/* INTERRUPTS -- for now, all interrupts masked and globally
> +	/*
> +	 * INTERRUPTS -- for now, all interrupts masked and globally
>   	 * disabled.
>   	 */
>   	wrctl	ienable, r0		/* All disabled	*/
>
> -	/* DCACHE INIT -- if dcache not implemented, initd behaves as
> +	/*
> +	 * DCACHE INIT -- if dcache not implemented, initd behaves as
>   	 * nop.
>   	 */
>   	movhi	r4, %hi(CONFIG_SYS_DCACHELINE_SIZE)
> @@ -59,7 +63,8 @@ _except_end:
>   	add	r6, r6, r4
>   	bltu	r6, r5, 1b
>
> -	/* RELOCATE CODE, DATA & COMMAND TABLE -- the following code
> +	/*
> +	 * RELOCATE CODE, DATA & COMMAND TABLE -- the following code
>   	 * assumes code, data and the command table are all
>   	 * contiguous. This lets us relocate everything as a single
>   	 * block. Make sure the linker script matches this ;-)
> @@ -89,8 +94,7 @@ _cur:	movhi	r5, %hi(_cur - _start)
>   	jmp	r4
>   _reloc:
>
> -	/* STACK INIT -- zero top two words for call back chain.
> -	 */
> +	/* STACK INIT -- zero top two words for call back chain. */
>   	movhi	sp, %hi(CONFIG_SYS_INIT_SP)
>   	ori	sp, sp, %lo(CONFIG_SYS_INIT_SP)
>   	addi	sp, sp, -8
> @@ -116,7 +120,8 @@ _reloc:
>   	ori	r2, r2, %lo(board_init_f at h)
>   	callr	r2
>
> -	/* NEVER RETURNS -- but branch to the _start just
> +	/*
> +	 * NEVER RETURNS -- but branch to the _start just
>   	 * in case ;-)
>   	 */
>   	br	_start
>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-10-13 13:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-06  7:30 [U-Boot] [PATCH] nios2: clean up comments style in start.S Thomas Chou
2015-10-13 13:13 ` Thomas Chou

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox