diff options
author | Wolfgang Denk <wd@denx.de> | 2010-05-28 20:34:39 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-05-28 20:34:39 +0200 |
commit | bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc (patch) | |
tree | 8c0d3886a19dfd82551588928b448198ac5274ce /common/image.c | |
parent | 35269d3fca60b5f73113b0443c8e40070749c1d9 (diff) | |
parent | 1117cbf2adac59050af1751af6c6a524afa5c3ef (diff) | |
download | u-boot-imx-bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc.zip u-boot-imx-bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc.tar.gz u-boot-imx-bd7bb6f8a3278caff0ac6eeaf08b188b9bb05dfc.tar.bz2 |
Merge branch 'next' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'common/image.c')
-rw-r--r-- | common/image.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/image.c b/common/image.c index 8d4be14..2b6007e 100644 --- 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", }, |