diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | board/voiceblue/Makefile | 2 | ||||
| -rw-r--r-- | board/voiceblue/eeprom.c | 3 | ||||
| -rw-r--r-- | board/voiceblue/eeprom_start.S | 5 | ||||
| -rw-r--r-- | net/net.c | 40 |
5 files changed, 27 insertions, 27 deletions
@@ -2,6 +2,8 @@ Changes for U-Boot 1.1.3: ====================================================================== +* Minor code cleanup + * Add forgotten new fils from latest VoiceBlue update * Make bootretry feature work with hush shell. @@ -26,7 +28,7 @@ Changes for U-Boot 1.1.3: * Move the AT91RM9200DK to the ARM Systems list. Patch by Anders Larsen, 26 Apr 2005 - + * Eliminate calls of ARM libgcc.a helper functions _divsi3 and _modsi3 Patch by Anders Larsen, 26 Apr 2005 diff --git a/board/voiceblue/Makefile b/board/voiceblue/Makefile index 3b3e5239e..6302fa854 100644 --- a/board/voiceblue/Makefile +++ b/board/voiceblue/Makefile @@ -32,7 +32,7 @@ SOBJS := setup.o gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) LOAD_ADDR = 0x10400000 -LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds +LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/eeprom.lds all: $(LIB) eeprom.srec eeprom.bin diff --git a/board/voiceblue/eeprom.c b/board/voiceblue/eeprom.c index 25e22947d..0ad1b666b 100644 --- a/board/voiceblue/eeprom.c +++ b/board/voiceblue/eeprom.c @@ -146,7 +146,7 @@ int eeprom(int argc, char *argv[]) { int i, len, ret; unsigned char buf[58], *p; - + app_startup(argv); if (get_version() != XF_VERSION) { printf("Wrong XF_VERSION.\n"); @@ -209,4 +209,3 @@ int eeprom(int argc, char *argv[]) return 0; } - diff --git a/board/voiceblue/eeprom_start.S b/board/voiceblue/eeprom_start.S index 16354f7cc..8f88de5c3 100644 --- a/board/voiceblue/eeprom_start.S +++ b/board/voiceblue/eeprom_start.S @@ -7,6 +7,5 @@ * */ -.globl _start -_start: b eeprom - +.globl _start +_start: b eeprom @@ -40,10 +40,10 @@ * * DHCP: * - * Prerequisites: - own ethernet address - * We want: - IP, Netmask, ServerIP, Gateway IP - * - bootfilename, lease time - * Next step: - TFTP + * Prerequisites: - own ethernet address + * We want: - IP, Netmask, ServerIP, Gateway IP + * - bootfilename, lease time + * Next step: - TFTP * * TFTP: * @@ -67,7 +67,7 @@ * * SNTP: * - * Prerequisites: - own ethernet address + * Prerequisites: - own ethernet address * - own IP address * We want: - network time * Next step: none @@ -185,7 +185,7 @@ static int net_check_prereq (proto_t protocol); IPaddr_t NetArpWaitPacketIP; IPaddr_t NetArpWaitReplyIP; uchar *NetArpWaitPacketMAC; /* MAC address of waiting packet's destination */ -uchar *NetArpWaitTxPacket; /* THE transmit packet */ +uchar *NetArpWaitTxPacket; /* THE transmit packet */ int NetArpWaitTxPacketSize; uchar NetArpWaitPacketBuf[PKTSIZE_ALIGN + PKTALIGN]; ulong NetArpWaitTimerStart; @@ -212,8 +212,8 @@ void ArpRequest (void) arp->ar_pln = 4; arp->ar_op = htons (ARPOP_REQUEST); - memcpy (&arp->ar_data[0], NetOurEther, 6); /* source ET addr */ - NetWriteIP ((uchar *) & arp->ar_data[6], NetOurIP); /* source IP addr */ + memcpy (&arp->ar_data[0], NetOurEther, 6); /* source ET addr */ + NetWriteIP ((uchar *) & arp->ar_data[6], NetOurIP); /* source IP addr */ for (i = 10; i < 16; ++i) { arp->ar_data[i] = 0; /* dest ET addr = 0 */ } @@ -372,11 +372,11 @@ restart: */ NetOurIP = 0; NetServerIP = getenv_IPaddr ("serverip"); - NetOurVLAN = getenv_VLAN("vlan"); /* VLANs must be read */ - NetOurNativeVLAN = getenv_VLAN("nvlan"); - case CDP: - NetOurVLAN = getenv_VLAN("vlan"); /* VLANs must be read */ - NetOurNativeVLAN = getenv_VLAN("nvlan"); + NetOurVLAN = getenv_VLAN("vlan"); /* VLANs must be read */ + NetOurNativeVLAN = getenv_VLAN("nvlan"); + case CDP: + NetOurVLAN = getenv_VLAN("vlan"); /* VLANs must be read */ + NetOurNativeVLAN = getenv_VLAN("nvlan"); break; default: break; @@ -1429,7 +1429,7 @@ NetReceive(volatile uchar * inpkt, int len) #ifdef CONFIG_UDP_CHECKSUM if (ip->udp_xsum != 0) { - ulong xsum; + ulong xsum; ushort *sumptr; ushort sumlen; @@ -1444,24 +1444,24 @@ NetReceive(volatile uchar * inpkt, int len) sumptr = (ushort *) &(ip->udp_src); while (sumlen > 1) { - ushort sumdata; + ushort sumdata; sumdata = *sumptr++; xsum += ntohs(sumdata); sumlen -= 2; } if (sumlen > 0) { - ushort sumdata; + ushort sumdata; sumdata = *(unsigned char *) sumptr; - sumdata = (sumdata << 8) & 0xff00; + sumdata = (sumdata << 8) & 0xff00; xsum += sumdata; } while ((xsum >> 16) != 0) { - xsum = (xsum & 0x0000ffff) + ((xsum >> 16) & 0x0000ffff); + xsum = (xsum & 0x0000ffff) + ((xsum >> 16) & 0x0000ffff); } if ((xsum != 0x00000000) && (xsum != 0x0000ffff)) { - printf(" UDP wrong checksum %08x %08x\n", xsum, ntohs(ip->udp_xsum)); + printf(" UDP wrong checksum %08x %08x\n", xsum, ntohs(ip->udp_xsum)); return; } } @@ -1517,7 +1517,7 @@ static int net_check_prereq (proto_t protocol) return (1); } #if (CONFIG_COMMANDS & (CFG_CMD_PING | CFG_CMD_SNTP)) - common: + common: #endif if (NetOurIP == 0) { |