Merge branch 'master' of git://git.denx.de/u-boot-sh into next

[karo-tx-uboot.git] / common / image.c

diff --git a/common/image.c b/common/image.c
index 8d4be140f69eb4273667778d05391ce32fd7d047..2b6007e9c6685c3080964e5935ba78aa307d7ffb 100644 (file)
--- a/common/image.c
+++ b/common/image.c
@@ -84,7 +84,6 @@ static table_entry_t uimage_arch[] = {
        {       IH_ARCH_MICROBLAZE,     "microblaze",   "MicroBlaze",   },
        {       IH_ARCH_MIPS,           "mips",         "MIPS",         },
        {       IH_ARCH_MIPS64,         "mips64",       "MIPS 64 Bit",  },
-       {       IH_ARCH_NIOS,           "nios",         "NIOS",         },
        {       IH_ARCH_NIOS2,          "nios2",        "NIOS II",      },
        {       IH_ARCH_PPC,            "powerpc",      "PowerPC",      },
        {       IH_ARCH_PPC,            "ppc",          "PowerPC",      },