diff options
| author | wdenk <wdenk> | 2005-04-04 12:44:11 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-04-04 12:44:11 +0000 |
| commit | 8aa1a2d115420b1eb126f69f3547b54d275c3228 (patch) | |
| tree | 9167bf91193bcd6b15696a97180df29bc1524c83 /cpu/at91rm9200/start.S | |
| parent | 986ef4340e73c6912a26e0c165c9966ab98618d4 (diff) | |
Patch by Steven Scholz, 4 Apr 2005:
- remove all references to CONFIG_INIT_CRITICAL for ARM based boards
- introduce two new configuration options instead:
CONFIG_SKIP_LOWLEVEL_INIT and CONFIG_SKIP_RELOCATE_UBOOT
Diffstat (limited to 'cpu/at91rm9200/start.S')
| -rw-r--r-- | cpu/at91rm9200/start.S | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpu/at91rm9200/start.S b/cpu/at91rm9200/start.S index 89a0aa5dcb..62315fe119 100644 --- a/cpu/at91rm9200/start.S +++ b/cpu/at91rm9200/start.S @@ -115,7 +115,7 @@ reset: orr r0,r0,#0xd3 /* was 13 */ msr cpsr,r0 -#ifdef CONFIG_INIT_CRITICAL +#ifndef CONFIG_SKIP_LOWLEVEL_INIT /* scratch stack */ /**** ldr r1, =0x00204000 ****/ /* Insure word alignment */ @@ -141,7 +141,7 @@ reset: orr r0, r0, #0x00001000 @ set bit 12 (I) I-Cache orr r0, r0, #0xC0000000 @ set bits 31:30 (iA, nF) mcr p15, 0, r0, c1, c0, 0 @ write r0 in cp15 control register (cp15 r1) -#endif /* CONFIG_INIT_CRITICAL */ +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ /* * relocate exeception table */ @@ -158,9 +158,11 @@ copyex: * we do sys-critical inits only at reboot, * not when booting from ram! */ -#ifdef CONFIG_INIT_CRITICAL +#ifndef CONFIG_SKIP_LOWLEVEL_INIT bl cpu_init_crit +#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ +#ifndef CONFIG_SKIP_RELOCATE_UBOOT relocate: /* relocate U-Boot to RAM */ adr r0, _start /* r0 <- current position of code */ ldr r1, _TEXT_BASE /* test if we run from flash or RAM */ @@ -177,7 +179,7 @@ copy_loop: stmia r1!, {r3-r10} /* copy to target address [r1] */ cmp r0, r2 /* until source end addreee [r2] */ ble copy_loop -#endif /* CONFIG_INIT_CRITICAL */ +#endif /* CONFIG_SKIP_RELOCATE_UBOOT */ /* Set up the stack */ stack_setup: |