Fix some compile issues for MAI board.

Signed-off-by: Jason Jin <Jason.jin@freescale.com>
master
Jason Jin 18 years ago committed by Wolfgang Denk
parent 0f460a1ee1
commit 5618332409
  1. 86
      board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
  2. 1
      board/MAI/AmigaOneG3SE/video.c
  3. 2
      include/configs/AmigaOneG3SE.h

@ -30,49 +30,49 @@
#include "memio.h" #include "memio.h"
#include "via686.h" #include "via686.h"
__asm(" .globl send_kb \n __asm__(" .globl send_kb \n "
send_kb: \n "send_kb: \n "
lis r9, 0xfe00 \n " lis r9, 0xfe00 \n "
\n " \n "
li r4, 0x10 # retries \n " li r4, 0x10 # retries \n "
mtctr r4 \n " mtctr r4 \n "
\n " \n "
idle: \n "idle: \n "
lbz r4, 0x64(r9) \n " lbz r4, 0x64(r9) \n "
andi. r4, r4, 0x02 \n " andi. r4, r4, 0x02 \n "
bne idle \n " bne idle \n "
\n
ready: \n "ready: \n "
stb r3, 0x60(r9) \n " stb r3, 0x60(r9) \n "
\n " \n "
check: \n "check: \n "
lbz r4, 0x64(r9) \n " lbz r4, 0x64(r9) \n "
andi. r4, r4, 0x01 \n " andi. r4, r4, 0x01 \n "
beq check \n " beq check \n "
\n " \n "
lbz r4, 0x60(r9) \n " lbz r4, 0x60(r9) \n "
cmpwi r4, 0xfa \n " cmpwi r4, 0xfa \n "
beq done \n " beq done \n "
\n
bdnz idle \n " bdnz idle \n "
\n
li r3, 0 \n " li r3, 0 \n "
blr \n " blr \n "
\n
done: \n "done: \n "
li r3, 1 \n " li r3, 1 \n "
blr \n " blr \n "
\n
.globl test_kb \n ".globl test_kb \n "
test_kb: \n "test_kb: \n "
mflr r10 \n " mflr r10 \n "
li r3, 0xed \n " li r3, 0xed \n "
bl send_kb \n " bl send_kb \n "
li r3, 0x01 \n " li r3, 0x01 \n "
bl send_kb \n " bl send_kb \n "
mtlr r10 \n " mtlr r10 \n "
blr \n " blr "
"); );
int checkboard (void) int checkboard (void)

@ -56,6 +56,7 @@ int video_rows(void);
int video_cols(void); int video_cols(void);
char *prompt_string = "=>"; char *prompt_string = "=>";
unsigned char video_get_attr(void);
void video_set_color(unsigned char attr) void video_set_color(unsigned char attr)
{ {

@ -95,6 +95,8 @@
/* #define CONFIG_PCI_SCAN_SHOW 1 */ /* #define CONFIG_PCI_SCAN_SHOW 1 */
#define CONFIG_PCI_PNP 1 /* PCI plug-and-play */ #define CONFIG_PCI_PNP 1 /* PCI plug-and-play */
#define atoi(x) simple_strtoul(x,NULL,10)
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
*/ */

Loading…
Cancel
Save