Merge branch 'master' of git://git.denx.de/u-boot-ti

30 files changed, 60 insertions, 70 deletions

diff --git a/include/configs/AR405.h b/include/configs/AR405.h
index 52ead43..45c64c2 100644
--- a/include/configs/AR405.h
+++ b/include/configs/AR405.h
@@ -175,9 +175,9 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
-#define CONFIG_SYS_FLASH_BASE		0xFFFC0000
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_MONITOR_LEN		(256 * 1024)	/* Reserve 256 kB for Monitor	*/
+#define CONFIG_SYS_FLASH_BASE		CONFIG_SYS_MONITOR_BASE
+#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN		(~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
 
 /*
@@ -209,11 +209,11 @@
 #define CONFIG_SYS_FLASH_EMPTY_INFO		/* print 'E' for empty sector on flinfo */
 
 #define CONFIG_ENV_IS_IN_FLASH	1
-#define CONFIG_ENV_ADDR		0xFFFB0000	/* Address of Environment Sector*/
+#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SECT_SIZE	0x10000 /* see README - env sector total size	*/
 #define CONFIG_ENV_SIZE		0x04000	        /* Size of Environment	        */
 
-#define CONFIG_ENV_ADDR_REDUND     0xFFFA0000
+#define CONFIG_ENV_ADDR_REDUND  (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND	CONFIG_ENV_SIZE
 
 /*
diff --git a/include/configs/CANBT.h b/include/configs/CANBT.h
index cdba81d..115a6f9 100644
--- a/include/configs/CANBT.h
+++ b/include/configs/CANBT.h
@@ -120,9 +120,9 @@
  * Please note that CONFIG_SYS_SDRAM_BASE _must_ start at 0
  */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
-#define CONFIG_SYS_FLASH_BASE		0xFFFE0000
-#define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_FLASH_BASE
-#define CONFIG_SYS_MONITOR_LEN		(128 * 1024)	/* Reserve 128 kB for Monitor	*/
+#define CONFIG_SYS_FLASH_BASE		CONFIG_SYS_MONITOR_BASE
+#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE
+#define CONFIG_SYS_MONITOR_LEN		(~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN		(128 * 1024)	/* Reserve 128 kB for malloc()	*/
 
 /*
diff --git a/include/configs/MPC8323ERDB.h b/include/configs/MPC8323ERDB.h
index 7c84393..9a296a1 100644
--- a/include/configs/MPC8323ERDB.h
+++ b/include/configs/MPC8323ERDB.h
@@ -338,7 +338,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 
 #define CONFIG_UEC_ETH1		/* ETH3 */
 
diff --git a/include/configs/MPC832XEMDS.h b/include/configs/MPC832XEMDS.h
index 7bd2793..68ff191 100644
--- a/include/configs/MPC832XEMDS.h
+++ b/include/configs/MPC832XEMDS.h
@@ -353,7 +353,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 
 #define CONFIG_UEC_ETH1		/* ETH3 */
 
diff --git a/include/configs/MPC8360EMDS.h b/include/configs/MPC8360EMDS.h
index 87a137b..c58e003 100644
--- a/include/configs/MPC8360EMDS.h
+++ b/include/configs/MPC8360EMDS.h
@@ -390,7 +390,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 #define CONFIG_PHY_MODE_NEED_CHANGE
 
 #define CONFIG_UEC_ETH1		/* GETH1 */
diff --git a/include/configs/MPC8360ERDK.h b/include/configs/MPC8360ERDK.h
index e78cf60..9fa577d 100644
--- a/include/configs/MPC8360ERDK.h
+++ b/include/configs/MPC8360ERDK.h
@@ -309,7 +309,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 
 #define CONFIG_UEC_ETH1		/* GETH1 */
 
diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h
index ea7a134..2dc2932 100644
--- a/include/configs/MPC8568MDS.h
+++ b/include/configs/MPC8568MDS.h
@@ -313,7 +313,7 @@ extern unsigned long get_clock_freq(void);
  */
 #define CONFIG_UEC_ETH
 #ifndef CONFIG_TSEC_ENET
-#define CONFIG_ETHPRIME         "FSL UEC0"
+#define CONFIG_ETHPRIME         "UEC0"
 #endif
 #define CONFIG_PHY_MODE_NEED_CHANGE
 #define CONFIG_eTSEC_MDIO_BUS
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index f69b650..8177db3 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -363,7 +363,7 @@ extern unsigned long get_clock_freq(void);
 
 #define CONFIG_MIIM_ADDRESS	(CONFIG_SYS_CCSRBAR + 0x82120)
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME         "FSL UEC0"
+#define CONFIG_ETHPRIME         "UEC0"
 #define CONFIG_PHY_MODE_NEED_CHANGE
 
 #define CONFIG_UEC_ETH1         /* GETH1 */
diff --git a/include/configs/NSCU.h b/include/configs/NSCU.h
index 5724f45..6a4c47d 100644
--- a/include/configs/NSCU.h
+++ b/include/configs/NSCU.h
@@ -485,7 +485,6 @@
 
 #undef CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-/* #define CONFIG_ETHPRIME		"FEC ETHERNET" */
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h
index c2fb56c..3c19f52 100644
--- a/include/configs/PMC440.h
+++ b/include/configs/PMC440.h
@@ -53,7 +53,7 @@
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
  *----------------------------------------------------------------------*/
-#define CONFIG_SYS_MONITOR_LEN		(384  * 1024)	/* Reserve 384 kB for Monitor   */
+#define CONFIG_SYS_MONITOR_LEN		(~(TEXT_BASE) + 1)
 #define CONFIG_SYS_MALLOC_LEN		(1024 * 1024)	/* Reserve 256 kB for malloc()  */
 
 #define CONFIG_PRAM		0	/* use pram variable to overwrite */
@@ -61,7 +61,7 @@
 #define CONFIG_SYS_BOOT_BASE_ADDR	0xf0000000
 #define CONFIG_SYS_SDRAM_BASE		0x00000000	/* _must_ be 0          */
 #define CONFIG_SYS_FLASH_BASE		0xfc000000	/* start of FLASH       */
-#define CONFIG_SYS_MONITOR_BASE	TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE		TEXT_BASE
 #define CONFIG_SYS_NAND_ADDR		0xd0000000	/* NAND Flash           */
 #define CONFIG_SYS_OCM_BASE		0xe0010000	/* ocm                  */
 #define CONFIG_SYS_OCM_DATA_ADDR	CONFIG_SYS_OCM_BASE
@@ -301,8 +301,8 @@
 	"fdt_addr_r=800000\0"						\
 	"fpga=fpga loadb 0 ${fpga_addr}\0"				\
 	"load=tftp 200000 /tftpboot/pmc440/u-boot.bin\0"		\
-	"update=protect off fffa0000 ffffffff;era fffa0000 ffffffff;"	\
-		"cp.b 200000 fffa0000 60000\0"				\
+	"update=protect off fff90000 ffffffff;era fff90000 ffffffff;"	\
+		"cp.b 200000 fff90000 70000\0"				\
 	""
 
 #define CONFIG_BOOTDELAY	3	/* autoboot after 3 seconds     */
diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h
index 0df1b6e..7cefa32 100644
--- a/include/configs/TK885D.h
+++ b/include/configs/TK885D.h
@@ -65,8 +65,8 @@
 #undef	CONFIG_BOOTARGS
 
 #define CONFIG_EXTRA_ENV_SETTINGS					\
-	"ethprime=FEC ETHERNET\0"					\
-	"ethact=FEC ETHERNET\0"						\
+	"ethprime=FEC\0"						\
+	"ethact=FEC\0"							\
 	"netdev=eth0\0"							\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
 		"nfsroot=${serverip}:${rootpath}\0"			\
@@ -514,7 +514,7 @@
 #define CONFIG_MII_INIT	1
 
 #define CONFIG_NET_RETRY_COUNT	3
-#define CONFIG_ETHPRIME		"FEC ETHERNET"
+#define CONFIG_ETHPRIME		"FEC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h
index 32a7e79..5bf8f02 100644
--- a/include/configs/TQM855L.h
+++ b/include/configs/TQM855L.h
@@ -481,7 +481,7 @@
 
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h
index 4f44be3..456ed7e 100644
--- a/include/configs/TQM855M.h
+++ b/include/configs/TQM855M.h
@@ -516,7 +516,7 @@
 
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h
index e86fe5e..94b9a3b 100644
--- a/include/configs/TQM860L.h
+++ b/include/configs/TQM860L.h
@@ -480,7 +480,7 @@
 
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT       1
diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h
index 4fd873b..ce5e691 100644
--- a/include/configs/TQM860M.h
+++ b/include/configs/TQM860M.h
@@ -484,7 +484,7 @@
 
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h
index 0c966c9..d77df9c 100644
--- a/include/configs/TQM862L.h
+++ b/include/configs/TQM862L.h
@@ -486,7 +486,7 @@
 #define CONFIG_NET_MULTI
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 178e6e2..a6c465b 100644
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -487,7 +487,7 @@
 #define CONFIG_NET_MULTI
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h
index a65946d..9ec815c 100644
--- a/include/configs/TQM866M.h
+++ b/include/configs/TQM866M.h
@@ -506,7 +506,7 @@
 
 #define CONFIG_SCC1_ENET
 #define CONFIG_FEC_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h
index 0fc4b69..c715c07 100644
--- a/include/configs/TQM885D.h
+++ b/include/configs/TQM885D.h
@@ -506,7 +506,7 @@
 					   switching to another netwok (if the
 					   tried network is unreachable) */
 
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT	1
diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 13a941e..23a859f 100644
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -278,15 +278,13 @@
 	"load=tftp 200000 ${u-boot}\0"					\
 	"update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"	\
 		"era " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"		\
-		"cp.b ${fileaddr} " xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize};" \
-		"setenv filesize;saveenv\0"				\
+		"cp.b ${fileaddr} " xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize}" \
 	"upd=run load update\0"						\
 
 #define CONFIG_AMCC_DEF_ENV_NAND_UPD					\
 	"u-boot-nand=" xstr(CONFIG_HOSTNAME) "/u-boot-nand.bin\0"	\
 	"nload=tftp 200000 ${u-boot-nand}\0"				\
-	"nupdate=nand erase 0 100000;nand write 200000 0 100000;"	\
-		"setenv filesize;saveenv\0"				\
+	"nupdate=nand erase 0 100000;nand write 200000 0 100000"	\
 	"nupd=run nload nupdate\0"
 
 #endif /* __AMCC_COMMON_H */
diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h
index c737f10..b52b941 100644
--- a/include/configs/ep82xxm.h
+++ b/include/configs/ep82xxm.h
@@ -147,7 +147,7 @@
 #define CONFIG_BOOTDELAY	5	/* autoboot after 5 seconds */
 #define CONFIG_ENV_IN_OWN_SECT	1
 #define CONFIG_AUTO_COMPLETE	1
-#define	CONFIG_EXTRA_ENV_SETTINGS	"ethprime=FCC3 ETHERNET"
+#define	CONFIG_EXTRA_ENV_SETTINGS	"ethprime=FCC3"
 
 #if defined(CONFIG_CMD_KGDB)
 #undef	CONFIG_KGDB_ON_SMC		/* define if kgdb on SMC */
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 61e3bad..8105876 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -74,7 +74,7 @@
 	"net_nfs=tftp 200000 $(bootfile);run nfsargs addip;bootm\0"	\
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
 		"nfsroot=$(serverip):$(rootpath)\0"			\
-	"ethact=FEC ETHERNET\0"						\
+	"ethact=FEC\0	"						\
 	"update=prot off ff800000 ff81ffff; era ff800000 ff81ffff; "	\
 		"cp.b 200000 ff800000 $(filesize);"			\
 		"prot on ff800000 ff81ffff\0"				\
diff --git a/include/configs/katmai.h b/include/configs/katmai.h
index 76e9a76..2a7ab8d 100644
--- a/include/configs/katmai.h
+++ b/include/configs/katmai.h
@@ -53,13 +53,6 @@
 #define CONFIG_HOSTNAME		katmai
 #include "amcc-common.h"
 
-/*
- * For booting 256K-paged Linux we should have 16MB of memory
- * for Linux initial memory map
- */
-#undef CONFIG_SYS_BOOTMAPSZ
-#define CONFIG_SYS_BOOTMAPSZ	(16 << 20)
-
 #define CONFIG_BOARD_EARLY_INIT_F 1	/* Call board_pre_init		*/
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
@@ -188,11 +181,10 @@
 #define	CONFIG_EXTRA_ENV_SETTINGS					\
 	CONFIG_AMCC_DEF_ENV						\
 	CONFIG_AMCC_DEF_ENV_POWERPC					\
-	CONFIG_AMCC_DEF_ENV_PPC_OLD					\
 	CONFIG_AMCC_DEF_ENV_NOR_UPD					\
-	"kernel_addr=fff10000\0"					\
-	"ramdisk_addr=fff20000\0"					\
-	"kozio=bootm ffc60000\0"					\
+	"kernel_addr=ff000000\0"					\
+	"fdt_addr=ff1e0000\0"						\
+	"ramdisk_addr=ff200000\0"					\
 	"pciconfighost=1\0"						\
 	"pcie_mode=RP:RP:RP\0"						\
 	""
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index 3a9f790..6c14ca0 100644
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -139,8 +139,8 @@
 
 #ifdef CONFIG_IO_MUXING
 #define	CONFIG_KM_DEF_ENV_IOMUX \
-	"nc=setenv ethact HDLC ETHERNET \0" \
-	"nce=setenv ethact SCC ETHERNET \0"	\
+	"nc=setenv ethact HDLC \0" \
+	"nce=setenv ethact SCC \0"	\
 	"stderr=serial,nc \0"	\
 	"stdin=serial,nc \0" \
 	"stdout=serial,nc \0" \
diff --git a/include/configs/km8xx.h b/include/configs/km8xx.h
index b5552d2..a10744e 100644
--- a/include/configs/km8xx.h
+++ b/include/configs/km8xx.h
@@ -280,7 +280,7 @@
 #define BOOTFLAG_WARM	0x02	/* Software reboot		    */
 
 #define CONFIG_SCC3_ENET
-#define CONFIG_ETHPRIME		"SCC ETHERNET"
+#define CONFIG_ETHPRIME		"SCC"
 #define CONFIG_HAS_ETH0
 
 /* pass open firmware flat tree */
diff --git a/include/configs/kmeter1.h b/include/configs/kmeter1.h
index 6497231..f7d36b1 100644
--- a/include/configs/kmeter1.h
+++ b/include/configs/kmeter1.h
@@ -284,7 +284,7 @@
  * QE UEC ethernet configuration
  */
 #define CONFIG_UEC_ETH
-#define CONFIG_ETHPRIME		"FSL UEC0"
+#define CONFIG_ETHPRIME		"UEC0"
 
 #define CONFIG_UEC_ETH1		/* GETH1 */
 #define UEC_VERBOSE_DEBUG	1
diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 61eb26e..19084ce 100644
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -379,8 +379,9 @@
  */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
 #define CONFIG_SYS_FLASH_BASE		0xFFE00000
-#define CONFIG_SYS_MONITOR_BASE	0xFFFC0000     /* placed last 256k */
-#define CONFIG_SYS_MONITOR_LEN		(224 * 1024)	/* Reserve 224 KiB for Monitor	*/
+
+#define CONFIG_SYS_MONITOR_BASE	TEXT_BASE	/* Start of U-Boot	*/
+#define CONFIG_SYS_MONITOR_LEN		(0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN		(128 * 1024)	/* Reserve 128 KiB for malloc()	*/
 
 /*
diff --git a/include/configs/v38b.h b/include/configs/v38b.h
index d462ed0..600ccfb 100644
--- a/include/configs/v38b.h
+++ b/include/configs/v38b.h
@@ -154,7 +154,7 @@
 	"nfsargs=setenv bootargs root=/dev/nfs rw "			\
 		"nfsroot=$(serverip):$(rootpath) wdt=off\0"		\
 	"hostname=v38b\0"						\
-	"ethact=FEC ETHERNET\0"						\
+	"ethact=FEC\0"							\
 	"rootpath=/opt/eldk-3.1.1/ppc_6xx\0"				\
 	"update=prot off ff000000 ff03ffff; era ff000000 ff03ffff; "	\
 		"cp.b 200000 ff000000 $(filesize);"			\
diff --git a/include/miiphy.h b/include/miiphy.h
index 5362125..2f7d915 100644
--- a/include/miiphy.h
+++ b/include/miiphy.h
@@ -36,30 +36,30 @@
 
 #include <net.h>
 
-int miiphy_read (char *devname, unsigned char addr, unsigned char reg,
+int miiphy_read (const char *devname, unsigned char addr, unsigned char reg,
 		 unsigned short *value);
-int miiphy_write (char *devname, unsigned char addr, unsigned char reg,
+int miiphy_write (const char *devname, unsigned char addr, unsigned char reg,
 		  unsigned short value);
-int miiphy_info (char *devname, unsigned char addr, unsigned int *oui,
+int miiphy_info (const char *devname, unsigned char addr, unsigned int *oui,
 		 unsigned char *model, unsigned char *rev);
-int miiphy_reset (char *devname, unsigned char addr);
-int miiphy_speed (char *devname, unsigned char addr);
-int miiphy_duplex (char *devname, unsigned char addr);
-int miiphy_is_1000base_x (char *devname, unsigned char addr);
+int miiphy_reset (const char *devname, unsigned char addr);
+int miiphy_speed (const char *devname, unsigned char addr);
+int miiphy_duplex (const char *devname, unsigned char addr);
+int miiphy_is_1000base_x (const char *devname, unsigned char addr);
 #ifdef CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-int miiphy_link (char *devname, unsigned char addr);
+int miiphy_link (const char *devname, unsigned char addr);
 #endif
 
 void miiphy_init (void);
 
-void miiphy_register (char *devname,
-		      int (*read) (char *devname, unsigned char addr,
+void miiphy_register (const char *devname,
+		      int (*read) (const char *devname, unsigned char addr,
 				   unsigned char reg, unsigned short *value),
-		      int (*write) (char *devname, unsigned char addr,
+		      int (*write) (const char *devname, unsigned char addr,
 				    unsigned char reg, unsigned short value));
 
-int miiphy_set_current_dev (char *devname);
-char *miiphy_get_current_dev (void);
+int miiphy_set_current_dev (const char *devname);
+const char *miiphy_get_current_dev (void);
 
 void miiphy_listdev (void);
 
@@ -85,9 +85,9 @@ extern struct bb_miiphy_bus bb_miiphy_buses[];
 extern int bb_miiphy_buses_num;
 
 void bb_miiphy_init (void);
-int bb_miiphy_read (char *devname, unsigned char addr,
+int bb_miiphy_read (const char *devname, unsigned char addr,
 		    unsigned char reg, unsigned short *value);
-int bb_miiphy_write (char *devname, unsigned char addr,
+int bb_miiphy_write (const char *devname, unsigned char addr,
 		     unsigned char reg, unsigned short value);
 #endif
 
diff --git a/include/net.h b/include/net.h
index a180881..ab571eb 100644
--- a/include/net.h
+++ b/include/net.h
@@ -117,7 +117,7 @@ extern void eth_try_another(int first_restart);	/* Change the device */
 extern void eth_set_current(void);		/* set nterface to ethcur var */
 #endif
 extern struct eth_device *eth_get_dev(void);	/* get the current device MAC */
-extern struct eth_device *eth_get_dev_by_name(char *devname); /* get device */
+extern struct eth_device *eth_get_dev_by_name(const char *devname);
 extern struct eth_device *eth_get_dev_by_index(int index); /* get dev @ index */
 extern int eth_get_dev_index (void);		/* get the device index */
 extern void eth_parse_enetaddr(const char *addr, uchar *enetaddr);