]> git.sur5r.net Git - u-boot/commitdiff
common/image.c: move VxWorks header string out of CONFIG_CMD_ELF
authormiao.yan@windriver.com <miao.yan@windriver.com>
Fri, 27 Dec 2013 08:01:50 +0000 (16:01 +0800)
committerTom Rini <trini@ti.com>
Tue, 14 Jan 2014 14:01:05 +0000 (09:01 -0500)
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>
common/image.c

index 41453540f2604197f94e62221976c6debdcb236b..ae95c3f18aa24058bd92cf1c91c57ea5a710f91b 100644 (file)
@@ -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",            },