common/image.c: remove duplicated IH_TYPE entries.

Also rearrange IH_TYPE table slightly.

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/common/image.c b/common/image.c
index d38ce4ad7491a5f238ad0ff6ea5600a08341890e..ed6b26bd2a7fc17542791cfc9d55e7b0b9c41db4 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -133,19 +133,16 @@ static const table_entry_t uimage_type[] = {
        {       IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image",   },
        {       IH_TYPE_FIRMWARE,   "firmware",   "Firmware",           },
        {       IH_TYPE_FLATDT,     "flat_dt",    "Flat Device Tree",   },
-       {       IH_TYPE_INVALID,    NULL,         "Invalid Image",      },
-       {       IH_TYPE_IMXIMAGE,   "imximage",   "Freescale i.MX Boot Image",},
        {       IH_TYPE_KERNEL,     "kernel",     "Kernel Image",       },
-       {       IH_TYPE_KWBIMAGE,   "kwbimage",   "Kirkwood Boot Image",},
        {       IH_TYPE_MULTI,      "multi",      "Multi-File Image",   },
-       {       IH_TYPE_OMAPIMAGE,  "omapimage",  "TI OMAP SPL With GP CH",},
        {       IH_TYPE_RAMDISK,    "ramdisk",    "RAMDisk Image",      },
        {       IH_TYPE_SCRIPT,     "script",     "Script",             },
        {       IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
-       {       IH_TYPE_FLATDT,     "flat_dt",    "Flat Device Tree",   },
-       {       IH_TYPE_KWBIMAGE,   "kwbimage",   "Kirkwood Boot Image",},
        {       IH_TYPE_IMXIMAGE,   "imximage",   "Freescale i.MX Boot Image",},
+       {       IH_TYPE_KWBIMAGE,   "kwbimage",   "Kirkwood Boot Image",},
+       {       IH_TYPE_OMAPIMAGE,  "omapimage",  "TI OMAP SPL With GP CH",},
        {       IH_TYPE_UBLIMAGE,   "ublimage",   "Davinci UBL image",},
+       {       IH_TYPE_INVALID,    NULL,         "Invalid Image",      },
        {       -1,                 "",           "",                   },
 };