* Fix PHY address argument passing with mii info command

Patch by Andrew Dyer, 28 Dec 2004

* Cleanup: fix broken builds

CHANGELOG

@@ -2,6 +2,11 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Cleanup: fix broken builds
+
+* Fix PHY address argument passing with mii info command
+  Patch by Andrew Dyer, 28 Dec 2004
+
 * Cleanup (PPC4xx is AMCC now)
 
 * esd CPCI2DP board added

board/esd/cpci5200/Makefile

@@ -0,0 +1,53 @@
+
+#
+# (C) Copyright 2003
+# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+#
+# See file CREDITS for list of people who contributed to this
+# project.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= lib$(BOARD).a
+
+# Objects for Xilinx JTAG programming (CPLD)
+# CPLD  = ../common/xilinx_jtag/lenval.o \
+# 	  ../common/xilinx_jtag/micro.o \
+# 	  ../common/xilinx_jtag/ports.o
+
+# OBJS	= $(BOARD).o flash.o $(CPLD)
+OBJS	= $(BOARD).o strataflash.o
+
+$(LIB):	$(OBJS) $(SOBJS)
+	$(AR) crv $@ $(OBJS)
+
+clean:
+	rm -f $(SOBJS) $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak .depend
+
+#########################################################################
+
+.depend:	Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c)
+		$(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@
+
+-include .depend
+
+#########################################################################

board/sandburst/karef/karef.c

@@ -242,7 +242,7 @@ int checkboard (void)
 	sys_info_t sysinfo;
 	unsigned char brd_rev, brd_id;
 	unsigned short sernum;
-	unsigned char scan_rev, scan_id, ofem_rev, ofem_id;
+	unsigned char scan_rev, scan_id, ofem_rev=0, ofem_id=0;
 	unsigned char ofem_brd_rev, ofem_brd_id;
 	KAREF_FPGA_REGS_ST *karef_ps;
 	OFEM_FPGA_REGS_ST *ofem_ps;
@@ -349,7 +349,6 @@ int misc_init_r (void)
 	char envstr[255];
 	KAREF_FPGA_REGS_ST *karef_ps;
 	OFEM_FPGA_REGS_ST *ofem_ps;
-	unsigned char ofem_id;
 
 	if(NULL != getenv("secondserial")) {
 		puts("secondserial is set, switching to second serial port\n");

common/cmd_mii.c

@@ -414,7 +414,7 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 {
 	char		op;
 	unsigned char	addrlo, addrhi, reglo, reghi;
-	unsigned char	addr = 0, reg = 0;
+	unsigned char	addr, reg;
 	unsigned short	data;
 	int		rcode = 0;
 
@@ -456,12 +456,12 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 		 * Look for any and all PHYs.  Valid addresses are 0..31.
 		 */
 		if (argc >= 3) {
-			start = addr; end = addr + 1;
+			start = addrlo; end = addrhi;
 		} else {
-			start = 0; end = 32;
+			start = 0; end = 31;
 		}
 
-		for (j = start; j < end; j++) {
+		for (j = start; j <= end; j++) {
 			if (miiphy_info (j, &oui, &model, &rev) == 0) {
 				printf("PHY 0x%02X: "
 					"OUI = 0x%04X, "
@@ -482,8 +482,7 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 					"Error reading from the PHY addr=%02x reg=%02x\n",
 						addr, reg);
 					rcode = 1;
-				}
+				} else {
-				else {
 					if ((addrlo != addrhi) || (reglo != reghi))
 						printf("addr=%02x reg=%02x data=",
 							(uint)addr, (uint)reg);

include/configs/LANTEC.h

@@ -86,6 +86,7 @@
 #define CONFIG_CMD_FULL		(CFG_CMD_ALL & ~CFG_CMD_BEDBUG	\
 					     & ~CFG_CMD_BMP	\
 					     & ~CFG_CMD_BSP	\
+					     & ~CFG_CMD_DISPLAY	\
 					     & ~CFG_CMD_DOC	\
 					     & ~CFG_CMD_DTT	\
 					     & ~CFG_CMD_EEPROM	\

include/configs/MPC8260ADS.h

@@ -191,6 +191,7 @@
 				CFG_CMD_BMP	| \
 				CFG_CMD_BSP	| \
 				CFG_CMD_DATE	| \
+				CFG_CMD_DISPLAY | \
 				CFG_CMD_DOC	| \
 				CFG_CMD_DTT	| \
 				CFG_CMD_EEPROM	| \

include/configs/MPC8266ADS.h

@@ -152,6 +152,7 @@
 				CFG_CMD_BSP	| \
 				CFG_CMD_DATE	| \
 				CFG_CMD_DHCP	| \
+				CFG_CMD_DISPLAY | \
 				CFG_CMD_DOC	| \
 				CFG_CMD_DTT	| \
 				CFG_CMD_EEPROM	| \

include/configs/RBC823.h

@@ -97,6 +97,7 @@
 #define CONFIG_COMMANDS	      ( CFG_CMD_ALL	& \
 				~CFG_CMD_BSP	& \
 				~CFG_CMD_DATE	& \
+				~CFG_CMD_DISPLAY& \
 				~CFG_CMD_DTT	& \
 				~CFG_CMD_EXT2	& \
 				~CFG_CMD_FDC	& \

include/configs/ep8260.h

@@ -299,6 +299,7 @@
 					CFG_CMD_BSP	| \
 					CFG_CMD_DCR	| \
 					CFG_CMD_DHCP	| \
+					CFG_CMD_DISPLAY	| \
 					CFG_CMD_DOC	| \
 					CFG_CMD_DTT	| \
 					CFG_CMD_EEPROM	| \

include/configs/hymod.h

@@ -177,6 +177,7 @@
 #define CONFIG_COMMANDS		(CFG_CMD_ALL & ~( \
 					CFG_CMD_BEDBUG	| \
 					CFG_CMD_BMP	| \
+					CFG_CMD_DISPLAY	| \
 					CFG_CMD_DOC	| \
 					CFG_CMD_EXT2	| \
 					CFG_CMD_FDC	| \