diff -Naurbx CVS u-boot-2004-10-20/common/cmd_bootm.c u-boot-work/common/cmd_bootm.c
--- u-boot-2004-10-20/common/cmd_bootm.c	2004-10-10 17:27:32.000000000 -0400
+++ u-boot-work/common/cmd_bootm.c	2004-11-01 19:14:59.000000000 -0500
@@ -1189,7 +1189,9 @@
 	case IH_CPU_SPARC:	arch = "SPARC";			break;
 	case IH_CPU_SPARC64:	arch = "SPARC 64 Bit";		break;
 	case IH_CPU_M68K:	arch = "M68K"; 			break;
+	case IH_CPU_NIOS:	arch = "Nios";			break;
 	case IH_CPU_MICROBLAZE:	arch = "Microblaze"; 		break;
+	case IH_CPU_NIOS2:	arch = "Nios-II";		break;
 	default:		arch = "Unknown Architecture";	break;
 	}
 

diff -Naurbx CVS u-boot-2004-10-20/tools/mkimage.c u-boot-work/tools/mkimage.c
--- u-boot-2004-10-20/tools/mkimage.c	2004-07-10 18:36:01.000000000 -0400
+++ u-boot-work/tools/mkimage.c	2004-11-01 19:18:06.000000000 -0500
@@ -86,6 +86,8 @@
     {	IH_CPU_MICROBLAZE,	"microblaze",	"MicroBlaze",	},
     {	IH_CPU_MIPS,		"mips",		"MIPS",		},
     {	IH_CPU_MIPS64,		"mips64",	"MIPS 64 Bit",	},
+    {	IH_CPU_NIOS,		"nios",		"Nios",		},
+    {	IH_CPU_NIOS2,		"nios2",	"Nios-II",	},
     {	IH_CPU_PPC,		"ppc",		"PowerPC",	},
     {	IH_CPU_S390,		"s390",		"IBM S390",	},
     {	IH_CPU_SH,		"sh",		"SuperH",	},