Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Librem5
uboot-imx
Commits
b2f50807
Commit
b2f50807
authored
Aug 12, 2005
by
Wolfgang Denk
Browse files
Minor code cleanup
parent
50814844
Changes
5
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
b2f50807
...
...
@@ -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
...
...
board/voiceblue/Makefile
View file @
b2f50807
...
...
@@ -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
...
...
board/voiceblue/eeprom.c
View file @
b2f50807
...
...
@@ -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
;
}
board/voiceblue/eeprom_start.S
View file @
b2f50807
...
...
@@ -7,6 +7,5 @@
*
*/
.
globl
_start
_start
:
b
eeprom
.
globl
_start
_start
:
b
eeprom
net/net.c
View file @
b2f50807
...
...
@@ -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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment