diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:44 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:44 -0400 |
| commit | d68df028099235c5316eec1ed5f586f3744a8707 (patch) | |
| tree | d84182b69c8a1d8e6b3e1256d3a5323b9634ed35 /common | |
| parent | 692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2 (diff) | |
| parent | d5717e894497124fd44289a37f818ee301640c70 (diff) | |
Merge git://git.denx.de/u-boot-arc
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c index f7ffa54052..cb956b853c 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -47,7 +47,7 @@ #include <asm/errno.h> #include <asm/io.h> #include <asm/sections.h> -#ifdef CONFIG_X86 +#if defined(CONFIG_X86) || defined(CONFIG_ARC) #include <asm/init_helpers.h> #include <asm/relocate.h> #endif @@ -761,7 +761,7 @@ static int jump_to_copy(void) * similarly for all archs. When we do generic relocation, hopefully * we can make all archs enable the dcache prior to relocation. */ -#ifdef CONFIG_X86 +#if defined(CONFIG_X86) || defined(CONFIG_ARC) /* * SDRAM and console are now initialised. The final stack can now * be setup in SDRAM. Code execution will continue in Flash, but @@ -997,7 +997,7 @@ static init_fnc_t init_sequence_f[] = { INIT_FUNC_WATCHDOG_RESET reloc_fdt, setup_reloc, -#ifdef CONFIG_X86 +#if defined(CONFIG_X86) || defined(CONFIG_ARC) copy_uboot_to_ram, clear_bss, do_elf_reloc_fixups, @@ -1041,7 +1041,7 @@ void board_init_f(ulong boot_flags) #endif } -#ifdef CONFIG_X86 +#if defined(CONFIG_X86) || defined(CONFIG_ARC) /* * For now this code is only used on x86. * |