* Patch by Scott McNutt, 01 Nov 2004:

  Add missing NIOS/NIOS2 support for "iminfo" command

* Patch by Detlev Zundel, 29 Oct 2004:
  Add missing NIOS/NIOS2 support for "mkimage" tool.

diff --git a/CHANGELOG b/CHANGELOG
index a78daa6c85a2ad897b7217e676385fa1eeb12e1a..71683dd2f08ace020fc30ac3901f6fa716f60c84 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,12 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Patch by Scott McNutt, 01 Nov 2004:
+  Add missing NIOS/NIOS2 support for "iminfo" command
+
+* Patch by Detlev Zundel, 29 Oct 2004:
+  Add missing NIOS/NIOS2 support for "mkimage" tool.
+
 * Patch by David Adair, 27 Oct 2004:
   Add missing 440GX SDRAM Controller reset
 

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 356a2a4f9f9c520eeea74be0a7b2319d67600a49..cdb0c19b0b874f900ff91e93296526b64e604116 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -1197,6 +1197,8 @@ print_type (image_header_t *hdr)
        case IH_CPU_SPARC64:    arch = "SPARC 64 Bit";          break;
        case IH_CPU_M68K:       arch = "M68K";                  break;
        case IH_CPU_MICROBLAZE: arch = "Microblaze";            break;
+       case IH_CPU_NIOS:       arch = "Nios";                  break;
+       case IH_CPU_NIOS2:      arch = "Nios-II";               break;
        default:                arch = "Unknown Architecture";  break;
        }
 

diff --git a/tools/mkimage.c b/tools/mkimage.c
index d35abc99e6c5e218f84e4628903deaa03e533c90..fbc1a12549c06b446bb6bc085de7940188a334e6 100644 (file)
--- a/tools/mkimage.c
+++ b/tools/mkimage.c
@@ -86,6 +86,8 @@ table_entry_t arch_name[] = {
     {  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",       },