diff options
| author | wdenk <wdenk> | 2005-04-03 21:11:16 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-04-03 21:11:16 +0000 |
| commit | c1a11c19ecbfb390c09ad1ef9800412235ec1708 (patch) | |
| tree | d5a2eb1c5aec4a922ea4b9393258410ce1f20b9a | |
| parent | 6315349202ead02aec4774f6ede5d2ae490eae63 (diff) | |
* 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.
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 2 | ||||
| -rw-r--r-- | tools/mkimage.c | 2 |
3 files changed, 10 insertions, 0 deletions
@@ -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 356a2a4f9f..cdb0c19b0b 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 d35abc99e6..fbc1a12549 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", }, |