* Patch by Masami Komiy, 22 Feb 2004:

  Add support for NFS for file download

* Minor code cleanup

9 files changed, 16 insertions, 14 deletions

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index 1a9808325a1..e3ff631eb38 100644
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -46,7 +46,7 @@ typedef	struct	global_data {
 	unsigned long	scc_clk;
 	unsigned long	brg_clk;
 #endif
-#if defined(CONFIG_MPC5XXX)
+#if defined(CONFIG_MPC5xxx)
 	unsigned long	ipb_clk;
 	unsigned long	pci_clk;
 #endif
diff --git a/include/asm-ppc/u-boot.h b/include/asm-ppc/u-boot.h
index e9d9dc55b4d..8141222823c 100644
--- a/include/asm-ppc/u-boot.h
+++ b/include/asm-ppc/u-boot.h
@@ -42,7 +42,7 @@ typedef struct bd_info {
 	|| defined(CONFIG_E500)
 	unsigned long	bi_immr_base;	/* base of IMMR register */
 #endif
-#if defined(CONFIG_MPC5XXX)
+#if defined(CONFIG_MPC5xxx)
 	unsigned long	bi_mbar_base;	/* base of internal registers */
 #endif
 	unsigned long	bi_bootflags;	/* boot / reboot flag (for LynxOS) */
@@ -57,7 +57,7 @@ typedef struct bd_info {
 	unsigned long	bi_sccfreq;	/* SCC_CLK Freq, in MHz */
 	unsigned long	bi_vco;		/* VCO Out from PLL, in MHz */
 #endif
-#if defined(CONFIG_MPC5XXX)
+#if defined(CONFIG_MPC5xxx)
 	unsigned long	bi_ipbfreq;	/* IPB Bus Freq, in MHz */
 	unsigned long	bi_pcifreq;	/* PCI Bus Freq, in MHz */
 #endif
diff --git a/include/bmp_logo.h b/include/bmp_logo.h
index 9c924b8592d..265f744d0e3 100644
--- a/include/bmp_logo.h
+++ b/include/bmp_logo.h
@@ -18,7 +18,7 @@ unsigned short bmp_logo_palette[] = {
 	0x0343,  0x0454,  0x0565,  0x0565,  0x0676,  0x0787,  0x0898,  0x0999,
 	0x0AAA,  0x0ABA,  0x0BCB,  0x0CCC,  0x0DDD,  0x0EEE,  0x0FFF,  0x0FB3,
 	0x0FB4,  0x0FC4,  0x0FC5,  0x0FC6,  0x0FD7,  0x0FD8,  0x0FD9,  0x0FDA,
-	0x0FEA,  0x0FEB,  0x0FEC,  0x0FFD,  0x0FFE,  0x0FFF,  0x0FFF,
+	0x0FEA,  0x0FEB,  0x0FEC,  0x0FFD,  0x0FFE,  0x0FFF,  0x0FFF,  
 };
 
 unsigned char bmp_logo_bitmap[] = {
diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h
index af5654cd675..6f8154c8ed2 100644
--- a/include/cmd_confdefs.h
+++ b/include/cmd_confdefs.h
@@ -86,6 +86,7 @@
 #define CFG_CMD_FAT	0x0010000000000000U	/* FAT support			*/
 #define CFG_CMD_IMLS	0x0020000000000000U	/* List all found images        */
 #define CFG_CMD_ITEST	0x0040000000000000U	/* Integer (and string) test	*/
+#define CFG_CMD_NFS	0x0080000000000000U	/* NFS support			*/
 
 #define CFG_CMD_ALL	0xFFFFFFFFFFFFFFFFU	/* ALL commands			*/
 
diff --git a/include/common.h b/include/common.h
index df58008be8d..a1460f4c656 100644
--- a/include/common.h
+++ b/include/common.h
@@ -319,6 +319,7 @@ void	relocate_code (ulong, gd_t *, ulong);
 ulong	get_endaddr   (void);
 void	trap_init     (ulong);
 #if defined (CONFIG_4xx)	|| \
+    defined (CONFIG_5xxx)	|| \
     defined (CONFIG_74xx_7xx)	|| \
     defined (CONFIG_74x)	|| \
     defined (CONFIG_75x)	|| \
@@ -361,7 +362,7 @@ int	sdram_adjust_866 (void);
 #if defined(CONFIG_8260)
 int	prt_8260_clks (void);
 #endif
-#if defined(CONFIG_MPC5XXX)
+#if defined(CONFIG_MPC5xxx)
 int	prt_mpc5xxx_clks (void);
 #endif
 #ifdef CONFIG_4xx
diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 194f62faf2f..888b1652306 100644
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -29,7 +29,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5XXX		1	/* This is an MPC5xxx CPU */
+#define CONFIG_MPC5xxx		1	/* This is an MPC5xxx CPU */
 #define CONFIG_ICECUBE		1	/* ... on IceCube board */
 
 #define CFG_MPC5XXX_CLKIN	33000000 /* ... running at 33.000000MHz */
@@ -213,7 +213,7 @@
 /*
  * Ethernet configuration
  */
-#define CONFIG_MPC5XXX_FEC	1
+#define CONFIG_MPC5xxx_FEC	1
 #define CONFIG_FEC_10MBIT 1 /* Workaround for FEC 100Mbit problem */
 #define CONFIG_PHY_ADDR		0x00
 
diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index bdb7a46d89d..ae4677d6a85 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -41,7 +41,7 @@
  * (easy to change)
  */
 
-#define CONFIG_MPC5XXX		1	/* This is an MPC5xxx CPU */
+#define CONFIG_MPC5xxx		1	/* This is an MPC5xxx CPU */
 #define CONFIG_MPC5200		1	/* More exactly a MPC5200 */
 #define CONFIG_TOP5200		1	/* ... on TOP5200 board - we need this for FEC.C */
 
@@ -281,7 +281,7 @@
 /*
  * Ethernet configuration
  */
-#define CONFIG_MPC5XXX_FEC	1
+#define CONFIG_MPC5xxx_FEC	1
 #define CONFIG_FEC_10MBIT	1		/* Workaround for FEC 100Mbit problem */
 #define	CONFIG_PHY_ADDR		0x1f
 #define	CONFIG_PHY_TYPE		0x79c874
diff --git a/include/net.h b/include/net.h
index 39debc673d6..1b2b347f86a 100644
--- a/include/net.h
+++ b/include/net.h
@@ -21,13 +21,13 @@
 # endif
 #endif	/* CONFIG_8xx */
 
-#if defined(CONFIG_MPC5XXX)
+#if defined(CONFIG_MPC5xxx)
 # if !defined(CONFIG_NET_MULTI)
-#  if defined(CONFIG_MPC5XXX_FEC)
+#  if defined(CONFIG_MPC5xxx_FEC)
 #   define CONFIG_NET_MULTI
 #  endif
 # endif
-#endif	/* CONFIG_MPC5XXX */
+#endif	/* CONFIG_MPC5xxx */
 
 #if !defined(CONFIG_NET_MULTI) && (defined(CONFIG_8260) || defined(CONFIG_MPC8560))
 #include <config.h>
@@ -306,7 +306,7 @@ extern int		NetState;		/* Network loop state		*/
 extern int		NetRestartWrap;		/* Tried all network devices	*/
 #endif
 
-typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS } proto_t;
+typedef enum { BOOTP, RARP, ARP, TFTP, DHCP, PING, DNS, NFS } proto_t;
 
 /* from net/net.c */
 extern char	BootFile[128];			/* Boot File name		*/
diff --git a/include/ppc_asm.tmpl b/include/ppc_asm.tmpl
index 799a726e7d2..d4d3b74478b 100644
--- a/include/ppc_asm.tmpl
+++ b/include/ppc_asm.tmpl
@@ -175,7 +175,7 @@
 #define IM_IMMR		(IM_REGBASE+0x01a8)
 #define IM_SCCR		(IM_REGBASE+0x0c80)
 
-#elif defined(CONFIG_MPC5XXX)
+#elif defined(CONFIG_MPC5xxx)
 
 #define HID0_ICE_BITPOS	16
 #define HID0_DCE_BITPOS	17