summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authormiao.yan@windriver.com <miao.yan@windriver.com>2013-12-27 16:01:50 +0800
committerTom Rini <trini@ti.com>2014-01-14 09:01:05 -0500
commit68b15e831c9a0a2da276b0c6f67569af997ad099 (patch)
tree9c9aedfcef8bd01dea3266e952ac09ed83f803f5 /common
parent9b438946c995c80afb47c4cef6b03ae845098698 (diff)
downloadu-boot-imx-68b15e831c9a0a2da276b0c6f67569af997ad099.zip
u-boot-imx-68b15e831c9a0a2da276b0c6f67569af997ad099.tar.gz
u-boot-imx-68b15e831c9a0a2da276b0c6f67569af997ad099.tar.bz2
common/image.c: move VxWorks header string out of CONFIG_CMD_ELF
Otherwise, when booting VxWorks kernel, the incorrect message will be seen: ARM Unknown OS Kernel Image (uncompressed) Signed-off-by: Miao Yan <miao.yan@windriver.com>
Diffstat (limited to 'common')
-rw-r--r--common/image.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/image.c b/common/image.c
index 4145354..ae95c3f 100644
--- a/common/image.c
+++ b/common/image.c
@@ -96,9 +96,9 @@ static const table_entry_t uimage_os[] = {
{ IH_OS_PLAN9, "plan9", "Plan 9", },
{ IH_OS_RTEMS, "rtems", "RTEMS", },
{ IH_OS_U_BOOT, "u-boot", "U-Boot", },
+ { IH_OS_VXWORKS, "vxworks", "VxWorks", },
#if defined(CONFIG_CMD_ELF) || defined(USE_HOSTCC)
{ IH_OS_QNX, "qnx", "QNX", },
- { IH_OS_VXWORKS, "vxworks", "VxWorks", },
#endif
#if defined(CONFIG_INTEGRITY) || defined(USE_HOSTCC)
{ IH_OS_INTEGRITY,"integrity", "INTEGRITY", },