diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-08 15:10:33 +0100 |
| commit | 9b223555aa390e9a33ee8d4bbd2865fd1fbae9f7 (patch) | |
| tree | c9ef5f250ec76cda491b1dd6704d317448df3958 /common | |
| parent | ecde8243a8351725ff598f42c88ded154f8a0f1e (diff) | |
| parent | 0fc52948bda0734431cb528ee4fd82f1dec8c7b5 (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 4 | ||||
| -rw-r--r-- | common/cmd_i2c.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 401bf27d1..e16552ec3 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -453,8 +453,8 @@ cmd_tbl_t cmd_bootm_sub[] = { #ifdef CONFIG_OF_LIBFDT U_BOOT_CMD_MKENT(fdt, 0, 1, (void *)BOOTM_STATE_FDT, "", ""), #endif - U_BOOT_CMD_MKENT(bdt, 0, 1, (void *)BOOTM_STATE_OS_BD_T, "", ""), U_BOOT_CMD_MKENT(cmdline, 0, 1, (void *)BOOTM_STATE_OS_CMDLINE, "", ""), + U_BOOT_CMD_MKENT(bdt, 0, 1, (void *)BOOTM_STATE_OS_BD_T, "", ""), U_BOOT_CMD_MKENT(prep, 0, 1, (void *)BOOTM_STATE_OS_PREP, "", ""), U_BOOT_CMD_MKENT(go, 0, 1, (void *)BOOTM_STATE_OS_GO, "", ""), }; @@ -1000,8 +1000,8 @@ U_BOOT_CMD( #if defined(CONFIG_OF_LIBFDT) "\tfdt - relocate flat device tree\n" #endif - "\tbdt - OS specific bd_t processing\n" "\tcmdline - OS specific command line processing/setup\n" + "\tbdt - OS specific bd_t processing\n" "\tprep - OS specific prep before relocation or go\n" "\tgo - start OS" ); diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index 8d6feda27..62cbd335e 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -315,10 +315,6 @@ int do_i2c_mw ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /* * Wait for the write to complete. The write can take * up to 10mSec (we allow a little more time). - * - * On some chips, while the write is in progress, the - * chip doesn't respond. This apparently isn't a - * universal feature so we don't take advantage of it. */ /* * No write delay with FRAM devices. |