diff options
author | Wolfgang Denk <wd@denx.de> | 2010-08-12 23:08:05 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-08-12 23:08:05 +0200 |
commit | ae37a0704a8a27e47471f541a68b88370cd14aa8 (patch) | |
tree | e591e61ff80c3ea1961b37c96e3ad161c8a1f0af /board | |
parent | 18a056a18f6294a88c34105efcabf4c0638a946b (diff) | |
parent | dc41b8bf3df2b2c3bd833f871d88ff5ef40a19f3 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-ti
Diffstat (limited to 'board')
-rw-r--r-- | board/esd/ar405/config.mk | 9 | ||||
-rw-r--r-- | board/esd/canbt/config.mk | 8 | ||||
-rw-r--r-- | board/esd/pmc440/config.mk | 2 | ||||
-rw-r--r-- | board/evb64260/eth.c | 6 | ||||
-rw-r--r-- | board/freescale/mpc8560ads/mpc8560ads.c | 2 | ||||
-rw-r--r-- | board/funkwerk/vovpn-gw/vovpn-gw.c | 2 | ||||
-rw-r--r-- | board/keymile/common/keymile_hdlc_enet.c | 4 | ||||
-rw-r--r-- | board/keymile/km8xx/km8xx_hdlc_enet.c | 2 | ||||
-rw-r--r-- | board/motionpro/motionpro.c | 4 | ||||
-rw-r--r-- | board/prodrive/p3mx/mv_eth.c | 8 | ||||
-rw-r--r-- | board/sbc8560/sbc8560.c | 2 | ||||
-rw-r--r-- | board/sc3/config.mk | 2 | ||||
-rw-r--r-- | board/stx/stxgp3/stxgp3.c | 2 | ||||
-rw-r--r-- | board/stx/stxssa/stxssa.c | 2 | ||||
-rw-r--r-- | board/stx/stxxtc/stxxtc.c | 6 | ||||
-rw-r--r-- | board/tqc/tqm8xx/tqm8xx.c | 4 |
16 files changed, 26 insertions, 39 deletions
diff --git a/board/esd/ar405/config.mk b/board/esd/ar405/config.mk index 3e8baf65637..da7c10728f8 100644 --- a/board/esd/ar405/config.mk +++ b/board/esd/ar405/config.mk @@ -20,11 +20,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # - -# -# esd AR405 boards -# - -#TEXT_BASE = 0xFFFE0000 -#TEXT_BASE = 0xFFFD0000 -TEXT_BASE = 0xFFFC0000 +TEXT_BASE = 0xFFFA0000 diff --git a/board/esd/canbt/config.mk b/board/esd/canbt/config.mk index 80076cd9430..ae855dc057f 100644 --- a/board/esd/canbt/config.mk +++ b/board/esd/canbt/config.mk @@ -20,10 +20,4 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, # MA 02111-1307 USA # - -# -# esd ADCIOP boards -# - -TEXT_BASE = 0xFFFE0000 -#TEXT_BASE = 0xFFFD0000 +TEXT_BASE = 0xFFFC0000 diff --git a/board/esd/pmc440/config.mk b/board/esd/pmc440/config.mk index 91e65ec8a98..6e9f735f42b 100644 --- a/board/esd/pmc440/config.mk +++ b/board/esd/pmc440/config.mk @@ -23,7 +23,7 @@ sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE -TEXT_BASE = 0xFFFA0000 +TEXT_BASE = 0xFFF90000 endif PLATFORM_CPPFLAGS += -DCONFIG_440=1 diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c index 8d1b606213a..a96e65590f9 100644 --- a/board/evb64260/eth.c +++ b/board/evb64260/eth.c @@ -89,7 +89,7 @@ static const char ether_port_phy_addr[3]={4,5,6}; /* MII PHY access routines are common for all i/f, use gal_ent0 */ #define GT6426x_MII_DEVNAME "gal_enet0" -int gt6426x_miiphy_read(char *devname, unsigned char phy, +int gt6426x_miiphy_read(const char *devname, unsigned char phy, unsigned char reg, unsigned short *val); static inline unsigned short @@ -345,7 +345,7 @@ gt6426x_eth_disable(void *v) MII utilities - write: write to an MII register via SMI ***************************************************************************/ int -gt6426x_miiphy_write(char *devname, unsigned char phy, +gt6426x_miiphy_write(const char *devname, unsigned char phy, unsigned char reg, unsigned short data) { unsigned int temp= (reg<<21) | (phy<<16) | data; @@ -360,7 +360,7 @@ gt6426x_miiphy_write(char *devname, unsigned char phy, MII utilities - read: read from an MII register via SMI ***************************************************************************/ int -gt6426x_miiphy_read(char *devname, unsigned char phy, +gt6426x_miiphy_read(const char *devname, unsigned char phy, unsigned char reg, unsigned short *val) { unsigned int temp= (reg<<21) | (phy<<16) | 1<<26; diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c index 489f90b14be..423e9d72a76 100644 --- a/board/freescale/mpc8560ads/mpc8560ads.c +++ b/board/freescale/mpc8560ads/mpc8560ads.c @@ -236,7 +236,7 @@ void reset_phy (void) #endif #if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC) /* reset PHY */ - miiphy_reset("FCC1 ETHERNET", 0x0); + miiphy_reset("FCC1", 0x0); /* change PHY address to 0x02 */ bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028); diff --git a/board/funkwerk/vovpn-gw/vovpn-gw.c b/board/funkwerk/vovpn-gw/vovpn-gw.c index 889ba3f0744..e856adaee50 100644 --- a/board/funkwerk/vovpn-gw/vovpn-gw.c +++ b/board/funkwerk/vovpn-gw/vovpn-gw.c @@ -198,7 +198,7 @@ void reset_phy (void) iop->pdat |= 0x00080000; for (i=0; i<100; i++) { udelay(20000); - if (bb_miiphy_read("FCC1 ETHERNET", CONFIG_SYS_PHY_ADDR,2,&val ) == 0) { + if (bb_miiphy_read("FCC1", CONFIG_SYS_PHY_ADDR,2,&val ) == 0) { break; } } diff --git a/board/keymile/common/keymile_hdlc_enet.c b/board/keymile/common/keymile_hdlc_enet.c index ce5e4d6a45e..a545211d194 100644 --- a/board/keymile/common/keymile_hdlc_enet.c +++ b/board/keymile/common/keymile_hdlc_enet.c @@ -40,7 +40,7 @@ extern char keymile_slot; /* our slot number in the backplane */ #define TOUT_LOOP 50000 /* - * Since, except during initialization, ethact is always HDLC ETHERNET + * Since, except during initialization, ethact is always HDLC * while we're in the driver, just use serial_printf() everywhere for * output. This avoids possible conflicts when netconsole is being * used. @@ -124,7 +124,7 @@ int keymile_hdlc_enet_initialize(bd_t *bis) seth = dev; #endif - sprintf(dev->name, "HDLC ETHERNET"); + sprintf(dev->name, "HDLC"); dev->init = keymile_hdlc_enet_init; dev->halt = keymile_hdlc_enet_halt; dev->send = keymile_hdlc_enet_send; diff --git a/board/keymile/km8xx/km8xx_hdlc_enet.c b/board/keymile/km8xx/km8xx_hdlc_enet.c index 04782884e43..ca00576925c 100644 --- a/board/keymile/km8xx/km8xx_hdlc_enet.c +++ b/board/keymile/km8xx/km8xx_hdlc_enet.c @@ -34,7 +34,7 @@ char keymile_slot; /* our slot number in the backplane */ /* - * Since, except during initialization, ethact is always HDLC ETHERNET + * Since, except during initialization, ethact is always HDLC * while we're in the driver, just use serial_printf() everywhere for * output. This avoids possible conflicts when netconsole is being * used. diff --git a/board/motionpro/motionpro.c b/board/motionpro/motionpro.c index b3692190b99..47ef6e53eda 100644 --- a/board/motionpro/motionpro.c +++ b/board/motionpro/motionpro.c @@ -90,8 +90,8 @@ void reset_phy(void) { unsigned short mode_control; - miiphy_read("FEC ETHERNET", CONFIG_PHY_ADDR, 0x15, &mode_control); - miiphy_write("FEC ETHERNET", CONFIG_PHY_ADDR, 0x15, + miiphy_read("FEC", CONFIG_PHY_ADDR, 0x15, &mode_control); + miiphy_write("FEC", CONFIG_PHY_ADDR, 0x15, mode_control & 0xfffe); return; } diff --git a/board/prodrive/p3mx/mv_eth.c b/board/prodrive/p3mx/mv_eth.c index e67596bd1a3..567ae99d06d 100644 --- a/board/prodrive/p3mx/mv_eth.c +++ b/board/prodrive/p3mx/mv_eth.c @@ -99,9 +99,9 @@ int mv64460_eth_receive (struct eth_device *dev); int mv64460_eth_xmit (struct eth_device *, volatile void *packet, int length); -int mv_miiphy_read(char *devname, unsigned char phy_addr, +int mv_miiphy_read(const char *devname, unsigned char phy_addr, unsigned char phy_reg, unsigned short *value); -int mv_miiphy_write(char *devname, unsigned char phy_addr, +int mv_miiphy_write(const char *devname, unsigned char phy_addr, unsigned char phy_reg, unsigned short value); int phy_setup_aneg (char *devname, unsigned char addr); @@ -2544,7 +2544,7 @@ static bool eth_port_read_smi_reg (ETH_PORT eth_port_num, return true; } -int mv_miiphy_read(char *devname, unsigned char phy_addr, +int mv_miiphy_read(const char *devname, unsigned char phy_addr, unsigned char phy_reg, unsigned short *value) { unsigned int reg_value; @@ -2629,7 +2629,7 @@ static bool eth_port_write_smi_reg (ETH_PORT eth_port_num, return true; } -int mv_miiphy_write(char *devname, unsigned char phy_addr, +int mv_miiphy_write(const char *devname, unsigned char phy_addr, unsigned char phy_reg, unsigned short value) { unsigned int reg_value; diff --git a/board/sbc8560/sbc8560.c b/board/sbc8560/sbc8560.c index 10ba62fa493..77abde5d41d 100644 --- a/board/sbc8560/sbc8560.c +++ b/board/sbc8560/sbc8560.c @@ -225,7 +225,7 @@ void reset_phy (void) #endif #if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC) /* reset PHY */ - miiphy_reset("FCC1 ETHERNET", 0x0); + miiphy_reset("FCC1", 0x0); /* change PHY address to 0x02 */ bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028); diff --git a/board/sc3/config.mk b/board/sc3/config.mk index 1bdf5e4fcf3..a46b1972492 100644 --- a/board/sc3/config.mk +++ b/board/sc3/config.mk @@ -21,4 +21,4 @@ # MA 02111-1307 USA # -TEXT_BASE = 0xFFFC0000 +TEXT_BASE = 0xFFFA0000 diff --git a/board/stx/stxgp3/stxgp3.c b/board/stx/stxgp3/stxgp3.c index 3804fe08004..25d52117009 100644 --- a/board/stx/stxgp3/stxgp3.c +++ b/board/stx/stxgp3/stxgp3.c @@ -239,7 +239,7 @@ reset_phy(void) #endif #if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC) /* reset PHY */ - miiphy_reset("FCC1 ETHERNET", 0x0); + miiphy_reset("FCC1", 0x0); /* change PHY address to 0x02 */ bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028); diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c index 0b2584c6b1c..1e0acab5464 100644 --- a/board/stx/stxssa/stxssa.c +++ b/board/stx/stxssa/stxssa.c @@ -238,7 +238,7 @@ reset_phy(void) #endif #if defined(CONFIG_MII) && defined(CONFIG_ETHER_ON_FCC) /* reset PHY */ - miiphy_reset("FCC1 ETHERNET", 0x0); + miiphy_reset("FCC1", 0x0); /* change PHY address to 0x02 */ bb_miiphy_write(NULL, 0, PHY_MIPSCR, 0xf028); diff --git a/board/stx/stxxtc/stxxtc.c b/board/stx/stxxtc/stxxtc.c index 717dbe20846..6693a7051b2 100644 --- a/board/stx/stxxtc/stxxtc.c +++ b/board/stx/stxxtc/stxxtc.c @@ -481,12 +481,12 @@ void reset_phys(void) mii_init(); for (phyno = 0; phyno < 32; ++phyno) { - miiphy_read("FEC ETHERNET", phyno, PHY_PHYIDR1, &v); + miiphy_read("FEC", phyno, PHY_PHYIDR1, &v); if (v == 0xFFFF) continue; - miiphy_write("FEC ETHERNET", phyno, PHY_BMCR, PHY_BMCR_POWD); + miiphy_write("FEC", phyno, PHY_BMCR, PHY_BMCR_POWD); udelay(10000); - miiphy_write("FEC ETHERNET", phyno, PHY_BMCR, PHY_BMCR_RESET | PHY_BMCR_AUTON); + miiphy_write("FEC", phyno, PHY_BMCR, PHY_BMCR_RESET | PHY_BMCR_AUTON); udelay(10000); } } diff --git a/board/tqc/tqm8xx/tqm8xx.c b/board/tqc/tqm8xx/tqm8xx.c index 53f79e8b80f..cde780b2df1 100644 --- a/board/tqc/tqm8xx/tqm8xx.c +++ b/board/tqc/tqm8xx/tqm8xx.c @@ -745,13 +745,13 @@ int last_stage_init(void) return 0; for (i = 0; i < 2; i++) { - ret = miiphy_read("FEC ETHERNET", phy[i], PHY_BMCR, ®); + ret = miiphy_read("FEC", phy[i], PHY_BMCR, ®); if (ret) { printf("Cannot read BMCR on PHY %d\n", phy[i]); return 0; } /* Auto-negotiation off, hard set full duplex, 100Mbps */ - ret = miiphy_write("FEC ETHERNET", phy[i], + ret = miiphy_write("FEC", phy[i], PHY_BMCR, (reg | PHY_BMCR_100MB | PHY_BMCR_DPLX) & ~PHY_BMCR_AUTON); if (ret) { |