V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

common/cmd_bootm.c: seperate do_bootm_vxworks related code from CONFIG_CMD_ELF. 

do_bootm_vxworks now is available under the configuration option
CONFIG_BOOTM_VXWORKS, thus aligned with other operating systems
that supported by bootm command. The bootvx command still depneds
on CONFIG_CMD_ELF.

Signed-off-by: Miao Yan <miao.yan@windriver.com>
This commit is contained in:
Miao Yan 2013-11-28 17:51:36 +08:00 committed by Tom Rini
parent 878a095e44
commit 17ab52fef1
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/cmd_bootm.c
View File

@ -120,8 +120,10 @@ static boot_os_fn do_bootm_ose;
#if defined(CONFIG_BOOTM_PLAN9) #if defined(CONFIG_BOOTM_PLAN9)
static boot_os_fn do_bootm_plan9; static boot_os_fn do_bootm_plan9;
#endif #endif
#if defined(CONFIG_CMD_ELF) #if defined(CONFIG_BOOTM_VXWORKS)
static boot_os_fn do_bootm_vxworks; static boot_os_fn do_bootm_vxworks;
#endif
#if defined(CONFIG_CMD_ELF)
static boot_os_fn do_bootm_qnxelf; static boot_os_fn do_bootm_qnxelf;
int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
@ -149,8 +151,10 @@ static boot_os_fn *boot_os[] = {
#if defined(CONFIG_BOOTM_PLAN9) #if defined(CONFIG_BOOTM_PLAN9)
[IH_OS_PLAN9] = do_bootm_plan9, [IH_OS_PLAN9] = do_bootm_plan9,
#endif #endif
#if defined(CONFIG_CMD_ELF) #if defined(CONFIG_BOOTM_VXWORKS)
[IH_OS_VXWORKS] = do_bootm_vxworks, [IH_OS_VXWORKS] = do_bootm_vxworks,
#endif
#if defined(CONFIG_CMD_ELF)
[IH_OS_QNX] = do_bootm_qnxelf, [IH_OS_QNX] = do_bootm_qnxelf,
#endif #endif
#ifdef CONFIG_INTEGRITY #ifdef CONFIG_INTEGRITY
@ -1678,7 +1682,7 @@ static int do_bootm_plan9(int flag, int argc, char * const argv[],
} }
#endif /* CONFIG_BOOTM_PLAN9 */ #endif /* CONFIG_BOOTM_PLAN9 */
#if defined(CONFIG_CMD_ELF) #if defined(CONFIG_BOOTM_VXWORKS)
static int do_bootm_vxworks(int flag, int argc, char * const argv[], static int do_bootm_vxworks(int flag, int argc, char * const argv[],
bootm_headers_t *images) bootm_headers_t *images)
{ {
@ -1696,11 +1700,16 @@ static int do_bootm_vxworks(int flag, int argc, char * const argv[],
sprintf(str, "%lx", images->ep); /* write entry-point into string */ sprintf(str, "%lx", images->ep); /* write entry-point into string */
setenv("loadaddr", str); setenv("loadaddr", str);
#if defined(CONFIG_CMD_ELF)
do_bootvx(NULL, 0, 0, NULL); do_bootvx(NULL, 0, 0, NULL);
#endif
return 1; return 1;
} }
#endif
#if defined(CONFIG_CMD_ELF)
static int do_bootm_qnxelf(int flag, int argc, char * const argv[], static int do_bootm_qnxelf(int flag, int argc, char * const argv[],
bootm_headers_t *images) bootm_headers_t *images)
{ {