* Patch by Arun Dharankar, 4 Apr 2003:LABEL_2003_04_05_0300

  Add IDMA example code (tested on 8260 only)

* Add support for Purple Board (MIPS64 5Kc)

* Add support for MIPS64 5Kc CPUs

* Fix missing setting of "loadaddr" and "bootfile" on ARM and MIPS

* Patch by Denis Peter, 04 Apr 2003:
  - update MIP405-4 board

* Patches by Denis Peter, 03 April 2003:
  - fix PCI IRQs on MPL boards
  - fix two more un-relocated pointer problems

* Fix behaviour of "run" command:
  - print error message iv variable does not exist
  - terminate processing of arguments in case of error

* Patches by Peter Figuli, 10 Mar 2003
  - Add support for BTUART on PXA platform
  - Add support for WEP EP250 (PXA) board

* Fix flash problems on INCA-IP; add tool to allow bruning images  to
  flash using a BDI2000

* Implement fix for I2C Edge Conditions problem for all boards that
  use the bit-banging driver (common/soft_i2c.c)

* Add patches by Robert Schwebel, 31 Mar 2003:
  - csb226 board: bring in sync with innokom/memsetup.S
  - csb226 board: fix MDREFR handling
  - misc doc fixes / extensions
  - innokom board: cleanup, MDREFR fix in memsetup.S, config update
  - add BOOT_PROGRESS to armlinux.c

2 files changed, 11 insertions, 5 deletions

diff --git a/net/bootp.c b/net/bootp.c
index ef8cd60..ee9656c 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -59,7 +59,8 @@ unsigned int dhcp_leasetime = 0;
 static void DhcpHandler(uchar * pkt, unsigned dest, unsigned src, unsigned len);
 
 /* For Debug */
-char *dhcpmsg2str(int type)
+#if 0
+static char *dhcpmsg2str(int type)
 {
 	switch (type) {
 	case 1:  return "DHCPDISCOVER";	break;
@@ -72,6 +73,7 @@ char *dhcpmsg2str(int type)
 	default: return "UNKNOWN/INVALID MSG TYPE"; break;
 	}
 }
+#endif
 
 #if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_VENDOREX)
 extern u8 *dhcp_vendorex_prep (u8 *e); /*rtn new e after add own opts. */
@@ -112,7 +114,7 @@ static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src, unsigned len)
 /*
  * Copy parameters of interest from BOOTP_REPLY/DHCP_OFFER packet
  */
-void BootpCopyNetParams(Bootp_t *bp)
+static void BootpCopyNetParams(Bootp_t *bp)
 {
 	NetCopyIP(&NetOurIP, &bp->bp_yiaddr);
 	NetCopyIP(&NetServerIP, &bp->bp_siaddr);
@@ -675,9 +677,9 @@ BootpRequest (void)
 }
 
 #if (CONFIG_COMMANDS & CFG_CMD_DHCP)
-void DhcpOptionsProcess(char *popt)
+static void DhcpOptionsProcess(uchar *popt)
 {
-	char *end = popt + BOOTP_HDR_SIZE;
+	uchar *end = popt + BOOTP_HDR_SIZE;
 	int oplen, size;
 
 	while ( popt < end && *popt != 0xff ) {
@@ -747,7 +749,7 @@ static int DhcpMessageType(unsigned char *popt)
 	return -1;
 }
 
-void DhcpSendRequestPkt(Bootp_t *bp_offer)
+static void DhcpSendRequestPkt(Bootp_t *bp_offer)
 {
 	volatile uchar *pkt, *iphdr;
 	Bootp_t *bp;
diff --git a/net/eth.c b/net/eth.c
index 8742c1e..e2d699e 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -40,6 +40,7 @@ extern int pcnet_initialize(bd_t*);
 extern int fec_initialize(bd_t*);
 extern int scc_initialize(bd_t*);
 extern int inca_switch_initialize(bd_t*);
+extern int plb2800_eth_initialize(bd_t*);
 
 static struct eth_device *eth_devices, *eth_current;
 
@@ -99,6 +100,9 @@ int eth_initialize(bd_t *bis)
 #ifdef CONFIG_INCA_IP_SWITCH
 	inca_switch_initialize(bis);
 #endif
+#ifdef CONFIG_PLB2800_ETHER
+	plb2800_eth_initialize(bis);
+#endif
 #ifdef CONFIG_EEPRO100
 	eepro100_initialize(bis);
 #endif