* Rename SBC8560 into sbc8560 for consistency

* Patch by Daniel Poirot, 24 Jun 2004:
  Add support for Wind River's sbc8240 board

* Patches by Yasushi Shoji, 26 Jun 2004:
  - drivers/serial_xuartlite.c: fix "return 0" in void function
  - add microblaze support to mkimage tool

1 files changed, 32 insertions, 31 deletions

diff --git a/tools/mkimage.c b/tools/mkimage.c
index c32085d..b6e030e 100644
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -77,62 +77,63 @@ typedef struct table_entry {
 } table_entry_t;
 
 table_entry_t arch_name[] = {
-    {	IH_CPU_INVALID,	NULL,		"Invalid CPU",		},
-    {	IH_CPU_ALPHA,	"alpha",	"Alpha",		},
-    {	IH_CPU_ARM,	"arm",		"ARM",			},
-    {	IH_CPU_I386,	"x86",		"Intel x86",		},
-    {	IH_CPU_IA64,	"ia64",		"IA64",			},
-    {	IH_CPU_MIPS,	"mips",		"MIPS",			},
-    {	IH_CPU_MIPS64,	"mips64",	"MIPS 64 Bit",		},
-    {	IH_CPU_PPC,	"ppc",		"PowerPC",		},
-    {	IH_CPU_S390,	"s390",		"IBM S390",		},
-    {	IH_CPU_SH,	"sh",		"SuperH",		},
-    {	IH_CPU_SPARC,	"sparc",	"SPARC",		},
-    {	IH_CPU_SPARC64,	"sparc64",	"SPARC 64 Bit",		},
-    {	IH_CPU_M68K,	"m68k",		"MC68000",		},
-    {	-1,		"",		"",			},
+    {	IH_CPU_INVALID,		NULL,		"Invalid CPU",	},
+    {	IH_CPU_ALPHA,		"alpha",	"Alpha",	},
+    {	IH_CPU_ARM,		"arm",		"ARM",		},
+    {	IH_CPU_I386,		"x86",		"Intel x86",	},
+    {	IH_CPU_IA64,		"ia64",		"IA64",		},
+    {	IH_CPU_M68K,		"m68k",		"MC68000",	},
+    {	IH_CPU_MICROBLAZE,	"microblaze",	"MicroBlaze",	},
+    {	IH_CPU_MIPS,		"mips",		"MIPS",		},
+    {	IH_CPU_MIPS64,		"mips64",	"MIPS 64 Bit",	},
+    {	IH_CPU_PPC,		"ppc",		"PowerPC",	},
+    {	IH_CPU_S390,		"s390",		"IBM S390",	},
+    {	IH_CPU_SH,		"sh",		"SuperH",	},
+    {	IH_CPU_SPARC,		"sparc",	"SPARC",	},
+    {	IH_CPU_SPARC64,		"sparc64",	"SPARC 64 Bit",	},
+    {	-1,			"",		"",		},
 };
 
 table_entry_t os_name[] = {
     {	IH_OS_INVALID,	NULL,		"Invalid OS",		},
-    {	IH_OS_OPENBSD,	"openbsd",	"OpenBSD",		},
-    {	IH_OS_NETBSD,	"netbsd",	"NetBSD",		},
-    {	IH_OS_FREEBSD,	"freebsd",	"FreeBSD",		},
     {	IH_OS_4_4BSD,	"4_4bsd",	"4_4BSD",		},
-    {	IH_OS_LINUX,	"linux",	"Linux",		},
-    {	IH_OS_SVR4,	"svr4",		"SVR4",			},
+    {	IH_OS_ARTOS,	"artos",	"ARTOS",		},
+    {	IH_OS_DELL,	"dell",		"Dell",			},
     {	IH_OS_ESIX,	"esix",		"Esix",			},
-    {	IH_OS_SOLARIS,	"solaris",	"Solaris",		},
+    {	IH_OS_FREEBSD,	"freebsd",	"FreeBSD",		},
     {	IH_OS_IRIX,	"irix",		"Irix",			},
-    {	IH_OS_SCO,	"sco",		"SCO",			},
-    {	IH_OS_DELL,	"dell",		"Dell",			},
-    {	IH_OS_NCR,	"ncr",		"NCR",			},
+    {	IH_OS_LINUX,	"linux",	"Linux",		},
     {	IH_OS_LYNXOS,	"lynxos",	"LynxOS",		},
-    {	IH_OS_VXWORKS,	"vxworks",	"VxWorks",		},
+    {	IH_OS_NCR,	"ncr",		"NCR",			},
+    {	IH_OS_NETBSD,	"netbsd",	"NetBSD",		},
+    {	IH_OS_OPENBSD,	"openbsd",	"OpenBSD",		},
     {	IH_OS_PSOS,	"psos",		"pSOS",			},
     {	IH_OS_QNX,	"qnx",		"QNX",			},
-    {	IH_OS_U_BOOT,	"u-boot",	"U-Boot",		},
     {	IH_OS_RTEMS,	"rtems",	"RTEMS",		},
-    {	IH_OS_ARTOS,	"artos",	"ARTOS",		},
+    {	IH_OS_SCO,	"sco",		"SCO",			},
+    {	IH_OS_SOLARIS,	"solaris",	"Solaris",		},
+    {	IH_OS_SVR4,	"svr4",		"SVR4",			},
+    {	IH_OS_U_BOOT,	"u-boot",	"U-Boot",		},
+    {	IH_OS_VXWORKS,	"vxworks",	"VxWorks",		},
     {	-1,		"",		"",			},
 };
 
 table_entry_t type_name[] = {
     {	IH_TYPE_INVALID,    NULL,	  "Invalid Image",	},
-    {	IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
+    {	IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image",	},
+    {	IH_TYPE_FIRMWARE,   "firmware",	  "Firmware",		},
     {	IH_TYPE_KERNEL,	    "kernel",	  "Kernel Image",	},
-    {	IH_TYPE_RAMDISK,    "ramdisk",	  "RAMDisk Image",	},
     {	IH_TYPE_MULTI,	    "multi",	  "Multi-File Image",	},
-    {	IH_TYPE_FIRMWARE,   "firmware",	  "Firmware",		},
+    {	IH_TYPE_RAMDISK,    "ramdisk",	  "RAMDisk Image",	},
     {	IH_TYPE_SCRIPT,     "script",	  "Script",		},
-    {	IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image",	},
+    {	IH_TYPE_STANDALONE, "standalone", "Standalone Program", },
     {	-1,		    "",		  "",			},
 };
 
 table_entry_t comp_name[] = {
     {	IH_COMP_NONE,	"none",		"uncompressed",		},
-    {	IH_COMP_GZIP,	"gzip",		"gzip compressed",	},
     {	IH_COMP_BZIP2,	"bzip2",	"bzip2 compressed",	},
+    {	IH_COMP_GZIP,	"gzip",		"gzip compressed",	},
     {	-1,		"",		"",			},
 };