From: miao.yan@windriver.com <miao.yan@windriver.com>
Date: Fri, 27 Dec 2013 08:01:50 +0000 (+0800)
Subject: common/image.c: move VxWorks header string out of CONFIG_CMD_ELF
X-Git-Tag: v2014.01~29
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68b15e831c9a0a2da276b0c6f67569af997ad099;p=u-boot

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>
---

diff --git a/common/image.c b/common/image.c
index 41453540f2..ae95c3f18a 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",		},