Drop code for CRISv10 CPU simulator

[~andy/linux] / arch / cris / arch-v10 / kernel / head.S

diff --git a/arch/cris/arch-v10/kernel/head.S b/arch/cris/arch-v10/kernel/head.S
index 137bf52a55963b0e65783b16dcf745aea48105fd..4a146e1749c93ce2b2e9d35cec6c167bf4815232 100644 (file)
--- a/arch/cris/arch-v10/kernel/head.S
+++ b/arch/cris/arch-v10/kernel/head.S
@@ -168,13 +168,11 @@ _inflash:
 #endif
 
        ;; Set up waitstates etc according to kernel configuration.
-#ifndef CONFIG_SVINTO_SIM
        move.d   CONFIG_ETRAX_DEF_R_WAITSTATES, $r0
        move.d   $r0, [R_WAITSTATES]
 
        move.d   CONFIG_ETRAX_DEF_R_BUS_CONFIG, $r0
        move.d   $r0, [R_BUS_CONFIG]
-#endif
 
        ;; We need to initialze DRAM registers before we start using the DRAM
 
@@ -466,7 +464,6 @@ no_command_line:
 
        move.d  $r0,[genconfig_shadow] ; init a shadow register of R_GEN_CONFIG
 
-#ifndef CONFIG_SVINTO_SIM
        move.d  $r0,[R_GEN_CONFIG]
 
 #if 0
@@ -701,8 +698,6 @@ no_command_line:
        move.b  $r0,[R_SERIAL3_TR_CTRL]
 #endif
 
-#endif /* CONFIG_SVINTO_SIM */
-
        jump    start_kernel    ; jump into the C-function start_kernel in init/main.c
 
        .data