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 /include/image.h | |
| parent | 35269d3fca60b5f73113b0443c8e40070749c1d9 (diff) | |
| parent | 1117cbf2adac59050af1751af6c6a524afa5c3ef (diff) | |
Merge branch 'next' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'include/image.h')
| -rw-r--r-- | include/image.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/image.h b/include/image.h index 541cac97fe1..294eba5094b 100644 --- a/include/image.h +++ b/include/image.h @@ -100,7 +100,6 @@ #define IH_ARCH_SPARC 10 /* Sparc */ #define IH_ARCH_SPARC64 11 /* Sparc 64 Bit */ #define IH_ARCH_M68K 12 /* M68K */ -#define IH_ARCH_NIOS 13 /* Nios-32 */ #define IH_ARCH_MICROBLAZE 14 /* MicroBlaze */ #define IH_ARCH_NIOS2 15 /* Nios-II */ #define IH_ARCH_BLACKFIN 16 /* Blackfin */ @@ -493,8 +492,6 @@ static inline int image_check_target_arch (const image_header_t *hdr) if (!image_check_arch (hdr, IH_ARCH_MICROBLAZE)) #elif defined(__mips__) if (!image_check_arch (hdr, IH_ARCH_MIPS)) -#elif defined(__nios__) - if (!image_check_arch (hdr, IH_ARCH_NIOS)) #elif defined(__nios2__) if (!image_check_arch (hdr, IH_ARCH_NIOS2)) #elif defined(__PPC__) @@ -647,8 +644,6 @@ static inline int fit_image_check_target_arch (const void *fdt, int node) if (!fit_image_check_arch (fdt, node, IH_ARCH_MICROBLAZE)) #elif defined(__mips__) if (!fit_image_check_arch (fdt, node, IH_ARCH_MIPS)) -#elif defined(__nios__) - if (!fit_image_check_arch (fdt, node, IH_ARCH_NIOS)) #elif defined(__nios2__) if (!fit_image_check_arch (fdt, node, IH_ARCH_NIOS2)) #elif defined(__PPC__) |