diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
tree | f59185b71c8059941de79143f71178453599b8f1 /arch/cris/arch-v32/boot/compressed/head.S | |
parent | ftrace, kbuild: condense recordmcount.pl parameter code (diff) | |
parent | Linux v2.6.28-rc3 (diff) | |
download | linux-dev-36609469c8278554b046aa4cc9a5fa9ccea35306.tar.xz linux-dev-36609469c8278554b046aa4cc9a5fa9ccea35306.zip |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'arch/cris/arch-v32/boot/compressed/head.S')
-rw-r--r-- | arch/cris/arch-v32/boot/compressed/head.S | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/boot/compressed/head.S b/arch/cris/arch-v32/boot/compressed/head.S index f86208caf32d..a4a65c5c669e 100644 --- a/arch/cris/arch-v32/boot/compressed/head.S +++ b/arch/cris/arch-v32/boot/compressed/head.S @@ -7,7 +7,7 @@ #define ASSEMBLER_MACROS_ONLY #include <hwregs/asm/reg_map_asm.h> -#include <asm/arch/mach/startup.inc> +#include <mach/startup.inc> #define RAM_INIT_MAGIC 0x56902387 #define COMMAND_LINE_MAGIC 0x87109563 @@ -17,7 +17,7 @@ .globl input_data .text -start: +_start: di ;; Start clocks for used blocks. @@ -28,7 +28,13 @@ start: beq dram_init_finished nop -#include "../../mach/dram_init.S" +#if defined CONFIG_ETRAXFS +#include "../../mach-fs/dram_init.S" +#elif defined CONFIG_CRIS_MACH_ARTPEC3 +#include "../../mach-a3/dram_init.S" +#else +#error Only ETRAXFS and ARTPEC-3 supported! +#endif dram_init_finished: @@ -130,4 +136,10 @@ _cmd_line_addr: _boot_source: .dword 0 -#include "../../mach/hw_settings.S" +#if defined CONFIG_ETRAXFS +#include "../../mach-fs/hw_settings.S" +#elif defined CONFIG_CRIS_MACH_ARTPEC3 +#include "../../mach-a3/hw_settings.S" +#else +#error Only ETRAXFS and ARTPEC-3 supported! +#endif |