Merge branch 'evk1100-prep'
[oweals/u-boot.git] / board / amcc / acadia / cmd_acadia.c
index fb7ea3595454ad31be0e04216980acbf10392197..d47cf1af5742856b00b85341b191c0f0f37f830a 100644 (file)
@@ -45,7 +45,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        int cpu_freq;
 
        if (argc < 3) {
-               printf("Usage:\n%s\n", cmdtp->usage);
+               cmd_usage(cmdtp);
                return 1;
        }
 
@@ -84,7 +84,7 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        if (i2c_write(chip, 0, 1, buf, 16) != 0)
                printf("Error writing to EEPROM at address 0x%x\n", chip);
-       udelay(CFG_EEPROM_PAGE_WRITE_DELAY_MS * 1000);
+       udelay(CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS * 1000);
        if (i2c_write(chip, 0x10, 1, buf+16, 4) != 0)
                printf("Error2 writing to EEPROM at address 0x%x\n", chip);
 
@@ -96,6 +96,6 @@ static int do_bootstrap(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        bootstrap,      3,      0,      do_bootstrap,
-       "bootstrap - program the I2C bootstrap EEPROM\n",
+       "program the I2C bootstrap EEPROM",
        "<cpu-freq> <nor|nand> - program the I2C bootstrap EEPROM\n"
        );