Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Synced across updates from Etherboot 5.4 tree
  • Loading branch information
Michael Brown committed May 19, 2005
2 parents c0a9494 + aeb70ec commit 4e87543
Show file tree
Hide file tree
Showing 32 changed files with 940 additions and 539 deletions.
6 changes: 6 additions & 0 deletions src/arch/armnommu/Config
Expand Up @@ -17,6 +17,12 @@ CFLAGS+= -DRAWADDR=0x40100000
# NIC Debug Outputs
#CFLAGS+= -DDEBUG_NIC

# Reduced Media Independent Interface
# MAZBR LPEC2001: MII (Intel LXT971ALE at 0..1)
# Elmeg D@VOS : RMII (Altima AC104-QF at 4..7)
# Telekom XI521 : RMII (Altima AC104-QF at 4..7)
#CFLAGS+= -DRMII

# Fixed MAC address
# p2001_eth has no flash and fixed mac address
#CFLAGS+= -DMAC_HW_ADDR_DRV="'H','Y','L','N','X','1'"
Expand Down
4 changes: 2 additions & 2 deletions src/arch/armnommu/core/serial.c
Expand Up @@ -17,7 +17,7 @@ void serial_putc(int ch)
{
/* wait for room in the 32 byte tx FIFO */
while ((P2001_UART->r.STATUS & 0x3f) > /* 30 */ 0) ;
P2001_UART->w.TX1 = ch & 0xff;
P2001_UART->w.TX[0] = ch & 0xff;
}

/*
Expand All @@ -27,7 +27,7 @@ void serial_putc(int ch)
int serial_getc(void)
{
while (((P2001_UART->r.STATUS >> 6) & 0x3f) == 0) ;
return P2001_UART->r.RX1 & 0xff;
return P2001_UART->r.RX[0] & 0xff;
}

/*
Expand Down

0 comments on commit 4e87543

Please sign in to comment.