diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-07 22:47:17 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-07 22:47:17 +0100 |
| commit | 206c00f26f56af02686cb69bfe5c75e979063171 (patch) | |
| tree | 4e637df34f87762a2e70649e88f52ac973df1f00 /common | |
| parent | 39ff7d5f4cc547a2034a8bfc2a5b5f4b62fd5c20 (diff) | |
| parent | f8450829f921cf10667af98a8d08edfa3d998f04 (diff) | |
| download | blackbird-obmc-uboot-206c00f26f56af02686cb69bfe5c75e979063171.tar.gz blackbird-obmc-uboot-206c00f26f56af02686cb69bfe5c75e979063171.zip | |
Merge branch 'master' into next
Conflicts:
lib_generic/zlib.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index e0cb8695de..efd6aec0cf 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -475,8 +475,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, "", ""), }; @@ -1022,8 +1022,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" ); |
