Patchwork [U-Boot] common/image.c: remove duplicated IH_TYPE entries.

login
register
mail settings
Submitter Wolfgang Denk
Date Oct. 7, 2011, 6:36 a.m.
Message ID <1317969361-24887-1-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/118207/
State Accepted
Commit e42624bbe063c1f5da57b0a71ee67468bc2b4c68
Headers show

Comments

Wolfgang Denk - Oct. 7, 2011, 6:36 a.m.
Also rearrange IH_TYPE table slightly.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 common/image.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
Wolfgang Denk - Oct. 9, 2011, 8:24 p.m.
Dear Wolfgang Denk,

In message <1317969361-24887-1-git-send-email-wd@denx.de> you wrote:
> Also rearrange IH_TYPE table slightly.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  common/image.c |    9 +++------
>  1 files changed, 3 insertions(+), 6 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/common/image.c b/common/image.c
index d38ce4a..ed6b26b 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,		    "",		  "",			},
 };