Merge branch 'master' into next

[oweals/u-boot.git] / board / amcc / taihu / update.c

diff --git a/board/amcc/taihu/update.c b/board/amcc/taihu/update.c
index 55ad535c8cba788f72fd7104c37e1ff54d38877b..f9c31b3927b4eefd503d03edf200889a4b22184a 100644 (file)
--- a/board/amcc/taihu/update.c
+++ b/board/amcc/taihu/update.c
@@ -101,7 +101,7 @@ static uchar buf_66[] =
 static int update_boot_eeprom(cmd_tbl_t* cmdtp, int flag, int argc, char *argv[])
 {
        ulong len = 0x20;
-       uchar chip = CFG_I2C_EEPROM_ADDR;
+       uchar chip = CONFIG_SYS_I2C_EEPROM_ADDR;
        uchar *pbuf;
        uchar base;
        int i;
@@ -127,6 +127,6 @@ static int update_boot_eeprom(cmd_tbl_t* cmdtp, int flag, int argc, char *argv[]
 
 U_BOOT_CMD (
        update_boot_eeprom, 1, 1, update_boot_eeprom,
-       "update_boot_eeprom  - update boot eeprom content\n",
-       NULL
-       );
+       "update boot eeprom content",
+       ""
+);