Patchwork [U-Boot] board sc3: fix warning about nested comment

login
register
mail settings
Submitter Jeroen Hofstee
Date Jan. 8, 2013, 11:35 p.m.
Message ID <1357688153-4238-1-git-send-email-jeroen@myspectrum.nl>
Download mbox | patch
Permalink /patch/210570/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Jeroen Hofstee - Jan. 8, 2013, 11:35 p.m.
cc: Heiko Schocher <hs@denx.de>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
---
 board/sc3/init.S |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Tom Rini - Feb. 4, 2013, 4:39 p.m.
On Tue, Jan 08, 2013 at 01:35:53PM -0000, Jeroen Hofstee wrote:

> cc: Heiko Schocher <hs@denx.de>
> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
> 
> ---
> board/sc3/init.S |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)

Applied to u-boot/master, thanks!

Patch

diff --git a/board/sc3/init.S b/board/sc3/init.S
index d374db4..6352368 100644
--- a/board/sc3/init.S
+++ b/board/sc3/init.S
@@ -71,7 +71,8 @@  ext_bus_cntlr_init:
  * This is need for the external flash access
  */
 		lis r25,0x0800
-		ori r25,r25,0x0280			/* 0000 1000 0xxx 0000 0000 0010 100x xxxx = 0x03800280
+		/* 0000 1000 0xxx 0000 0000 0010 100x xxxx = 0x03800280 */
+		ori r25,r25,0x0280
 /*
  * Second, create a fast timing:
  * 90ns first cycle - 3 clock access
@@ -79,7 +80,8 @@  ext_bus_cntlr_init:
  * This is used for the internal access
  */
 		lis r26,0x8900
-		ori r26,r26,0x0280			/* 1000 1001 0xxx 0000 0000 0010 100x xxxx
+		/* 1000 1001 0xxx 0000 0000 0010 100x xxxx */
+		ori r26,r26,0x0280
 /*
  * We can't change settings on CS# if we currently use them.
  * -> load a few instructions into cache and run this code from cache