From e42624bbe063c1f5da57b0a71ee67468bc2b4c68 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Fri, 7 Oct 2011 08:33:16 +0200
Subject: [PATCH] common/image.c: remove duplicated IH_TYPE entries.
Also rearrange IH_TYPE table slightly.
Signed-off-by: Wolfgang Denk <wd@denx.de>
---
common/image.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/common/image.c b/common/image.c
index d38ce4ad74..ed6b26bd2a 100644
--- 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, "", "", },
};
--
2.39.5