summaryrefslogtreecommitdiffstats
path: root/arch/cris/arch-v32/boot/compressed/head.S
diff options
context:
space:
mode:
Diffstat (limited to 'arch/cris/arch-v32/boot/compressed/head.S')
-rw-r--r--arch/cris/arch-v32/boot/compressed/head.S16
1 files changed, 14 insertions, 2 deletions
diff --git a/arch/cris/arch-v32/boot/compressed/head.S b/arch/cris/arch-v32/boot/compressed/head.S
index ea3012993b0..a4a65c5c669 100644
--- a/arch/cris/arch-v32/boot/compressed/head.S
+++ b/arch/cris/arch-v32/boot/compressed/head.S
@@ -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