[U-Boot-Users] [PATCH 4/7] Fix some compile issues for MAI board.

[Jason Jin]

Signed-off-by: Jason Jin <Jason.jin at freescale.com>
---
 board/MAI/AmigaOneG3SE/AmigaOneG3SE.c |   86 ++++++++++++++++----------------
 board/MAI/AmigaOneG3SE/video.c        |    1 +
 include/configs/AmigaOneG3SE.h        |    1 +
 3 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
index 40f41c7..b472176 100644
--- a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
+++ b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
@@ -30,49 +30,49 @@
 #include "memio.h"
 #include "via686.h"
 
-__asm(" .globl send_kb                                      \n
-	send_kb:                                            \n
-		lis     r9, 0xfe00                          \n
-							    \n
-		li      r4, 0x10        # retries           \n
-		mtctr   r4                                  \n
-							    \n
-	idle:                                               \n
-		lbz     r4, 0x64(r9)                        \n
-		andi.   r4, r4, 0x02                        \n
-		bne     idle                                \n
-							    \n
-	ready:                                              \n
-		stb     r3, 0x60(r9)                        \n
-							    \n
-	check:                                              \n
-		lbz     r4, 0x64(r9)                        \n
-		andi.   r4, r4, 0x01                        \n
-		beq     check                               \n
-							    \n
-		lbz     r4, 0x60(r9)                        \n
-		cmpwi   r4, 0xfa                            \n
-		beq     done                                \n
-							    \n
-		bdnz    idle                                \n
-							    \n
-		li      r3, 0                               \n
-		blr                                         \n
-							    \n
-	done:                                               \n
-		li      r3, 1                               \n
-		blr                                         \n
-							    \n
-	.globl test_kb                                      \n
-	test_kb:                                            \n
-		mflr    r10                                 \n
-		li      r3, 0xed                            \n
-		bl      send_kb                             \n
-		li      r3, 0x01                            \n
-		bl      send_kb                             \n
-		mtlr    r10                                 \n
-		blr                                         \n
-");
+__asm__(" .globl send_kb                   		    \n "
+	"send_kb:                                           \n "
+	"	lis     r9, 0xfe00                          \n "
+	"						    \n "
+	"	li      r4, 0x10        # retries           \n "
+	"	mtctr   r4                                  \n "
+	"						    \n "
+	"idle:                                              \n "
+	"	lbz     r4, 0x64(r9)                        \n "
+	"	andi.   r4, r4, 0x02                        \n "
+	"	bne     idle                                \n "
+
+	"ready:                                             \n "
+	"	stb     r3, 0x60(r9)                        \n "
+	"						    \n "
+	"check:                                             \n "
+	"	lbz     r4, 0x64(r9)                        \n "
+	"	andi.   r4, r4, 0x01                        \n "
+	"	beq     check                               \n "
+	"						    \n "
+	"	lbz     r4, 0x60(r9)                        \n "
+	"	cmpwi   r4, 0xfa                            \n "
+	"	beq     done                                \n "
+
+	"	bdnz    idle                                \n "
+
+	"	li      r3, 0                               \n "
+	"	blr                                         \n "
+
+	"done:                                              \n "
+	"	li      r3, 1                               \n "
+	"	blr                                         \n "
+
+	".globl test_kb                                     \n "
+	"test_kb:                                           \n "
+	"	mflr    r10                                 \n "
+	"	li      r3, 0xed                            \n "
+	"	bl      send_kb                             \n "
+	"	li      r3, 0x01                            \n "
+	"	bl      send_kb                             \n "
+	"	mtlr    r10                                 \n "
+	"	blr                                         "
+);
 
 
 int checkboard (void)
diff --git a/board/MAI/AmigaOneG3SE/video.c b/board/MAI/AmigaOneG3SE/video.c
index f6327f7..fc27c68 100644
--- a/board/MAI/AmigaOneG3SE/video.c
+++ b/board/MAI/AmigaOneG3SE/video.c
@@ -56,6 +56,7 @@ int  video_rows(void);
 int  video_cols(void);
 
 char *prompt_string = "=>";
+unsigned char video_get_attr(void);
 
 void video_set_color(unsigned char attr)
 {
diff --git a/include/configs/AmigaOneG3SE.h b/include/configs/AmigaOneG3SE.h
index ea50f41..9c89915 100644
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -88,6 +88,7 @@
  */
 #include <cmd_confdefs.h>
 
+#define atoi(x)		simple_strtoul(x,NULL,10)
 
 /*
  * Miscellaneous configurable options
-- 
1.5.1