From: Jason Jin <Jason.jin@freescale.com>
Date: Fri, 13 Jul 2007 04:14:59 +0000 (+0800)
Subject: Fix some compile issues for MAI board.
X-Git-Tag: v1.3.0-rc1~19^2~20^2~17^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5618332409bb96f4448d1712899369fc80c0b489;p=oweals%2Fu-boot.git

Fix some compile issues for MAI board.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
---

diff --git a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
index 40f41c7818..b472176635 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 f6327f7203..fc27c68583 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 661149e66b..d914dccfbb 100644
--- a/include/configs/AmigaOneG3SE.h
+++ b/include/configs/AmigaOneG3SE.h
@@ -95,6 +95,8 @@
 /* #define CONFIG_PCI_SCAN_SHOW 1 */
 #define CONFIG_PCI_PNP		1	/* PCI plug-and-play */
 
+#define atoi(x)		simple_strtoul(x,NULL,10)
+
 /*
  * Miscellaneous configurable options
  */