From c1a11c19ecbfb390c09ad1ef9800412235ec1708 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 3 Apr 2005 21:11:16 +0000
Subject: [PATCH] * 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.
---
CHANGELOG | 6 ++++++
common/cmd_bootm.c | 2 ++
tools/mkimage.c | 2 ++
3 files changed, 10 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index a78daa6c85a..71683dd2f08 100644
--- 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 356a2a4f9f9..cdb0c19b0b8 100644
--- 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 d35abc99e6c..fbc1a12549c 100644
--- 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", },
--
GitLab