summaryrefslogtreecommitdiff
path: root/common/cmd_bootm.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-10-03 14:50:33 +0000
committerWolfgang Denk <wd@denx.de>2011-10-05 22:22:15 +0200
commit476af299b04ef07117bbc3cdef07885e1089967e (patch)
tree35850ad55638bb36454cde8520af022f5ef4f15b /common/cmd_bootm.c
parentc13f47b0d77aee8e6c04ab104d79785ac110623d (diff)
downloadu-boot-476af299b04ef07117bbc3cdef07885e1089967e.tar.gz
u-boot-476af299b04ef07117bbc3cdef07885e1089967e.tar.bz2
u-boot-476af299b04ef07117bbc3cdef07885e1089967e.zip
image: push default arch values to arch headers
This pushes the ugly duplicated arch ifdef lists we maintain in various image related files out to the arch headers themselves. Acked-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Tested-by: Thomas Chou <thomas@wytron.com.tw> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/cmd_bootm.c')
-rw-r--r--common/cmd_bootm.c26
1 files changed, 1 insertions, 25 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 8909ee703d..c2e8038ee8 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -165,31 +165,7 @@ void __arch_preboot_os(void)
}
void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os")));
-#if defined(__ARM__)
- #define IH_INITRD_ARCH IH_ARCH_ARM
-#elif defined(__avr32__)
- #define IH_INITRD_ARCH IH_ARCH_AVR32
-#elif defined(__bfin__)
- #define IH_INITRD_ARCH IH_ARCH_BLACKFIN
-#elif defined(__I386__)
- #define IH_INITRD_ARCH IH_ARCH_I386
-#elif defined(__M68K__)
- #define IH_INITRD_ARCH IH_ARCH_M68K
-#elif defined(__microblaze__)
- #define IH_INITRD_ARCH IH_ARCH_MICROBLAZE
-#elif defined(__mips__)
- #define IH_INITRD_ARCH IH_ARCH_MIPS
-#elif defined(__nios2__)
- #define IH_INITRD_ARCH IH_ARCH_NIOS2
-#elif defined(__PPC__)
- #define IH_INITRD_ARCH IH_ARCH_PPC
-#elif defined(__sh__)
- #define IH_INITRD_ARCH IH_ARCH_SH
-#elif defined(__sparc__)
- #define IH_INITRD_ARCH IH_ARCH_SPARC
-#else
-# error Unknown CPU type
-#endif
+#define IH_INITRD_ARCH IH_ARCH_DEFAULT
static void bootm_start_lmb(void)
{