diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-08-07 20:33:06 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-08-07 20:33:06 (GMT) |
| commit | 3df4f46f3209c067dcadc969ed02d27c97fa3632 (patch) | |
| tree | 4639307e5e9120b0c80c62da8376be3e406e84fb /drivers | |
| parent | 9efac4a1eb99d9c5539aa6992025eeacab7980c6 (diff) | |
| parent | c519facc645812c6d174c2d5b60241d23e285642 (diff) | |
| download | u-boot-3df4f46f3209c067dcadc969ed02d27c97fa3632.tar.xz | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/cfi_flash.c | 2 | ||||
| -rw-r--r-- | drivers/net/mpc5xxx_fec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 3267c5d..2d09caf 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -1993,7 +1993,7 @@ unsigned long flash_init (void) #ifdef CONFIG_SYS_FLASH_PROTECTION /* read environment from EEPROM */ char s[64]; - getenv_r ("unlock", s, sizeof(s)); + getenv_f("unlock", s, sizeof(s)); #endif #define BANK_BASE(i) (((phys_addr_t [CFI_MAX_FLASH_BANKS])CONFIG_SYS_FLASH_BANKS_LIST)[i]) diff --git a/drivers/net/mpc5xxx_fec.c b/drivers/net/mpc5xxx_fec.c index 1681e26..4a1c8e6 100644 --- a/drivers/net/mpc5xxx_fec.c +++ b/drivers/net/mpc5xxx_fec.c @@ -913,7 +913,7 @@ int mpc5xxx_fec_initialize(bd_t * bis) dev->send = mpc5xxx_fec_send; dev->recv = mpc5xxx_fec_recv; - sprintf(dev->name, "FEC ETHERNET"); + sprintf(dev->name, "FEC"); eth_register(dev); #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) |