diff options
| author | wdenk <wdenk> | 2005-04-02 23:52:25 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-04-02 23:52:25 +0000 |
| commit | 400558b561e2bdb47f87b96b3510dda0881a3662 (patch) | |
| tree | 479fa3918e0031a95cdac9468cb8396e1f1a9b60 /cpu/at91rm9200 | |
| parent | 414eec35e3832f4f9ce8a25ace7ead638be1f76f (diff) | |
Prepare for SoC rework of ARM code:
- rename CONFIG_BOOTBINFUNC into CONFIG_INIT_CRITICAL
- rename memsetup into lowlevel_init (function name and source files)
Diffstat (limited to 'cpu/at91rm9200')
| -rw-r--r-- | cpu/at91rm9200/lowlevel.S | 4 | ||||
| -rw-r--r-- | cpu/at91rm9200/start.S | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/cpu/at91rm9200/lowlevel.S b/cpu/at91rm9200/lowlevel.S index 030f9e194..c8af7a602 100644 --- a/cpu/at91rm9200/lowlevel.S +++ b/cpu/at91rm9200/lowlevel.S @@ -30,7 +30,7 @@ #include <config.h> #include <version.h> -#ifdef CONFIG_BOOTBINFUNC +#ifdef CONFIG_INIT_CRITICAL /* * some parameters for the board * @@ -197,4 +197,4 @@ SMRDATA1: .word SDRAM .word SDRAM_VAL /* SMRDATA1 is 176 bytes long */ -#endif /* CONFIG_BOOTBINFUNC */ +#endif /* CONFIG_INIT_CRITICAL */ diff --git a/cpu/at91rm9200/start.S b/cpu/at91rm9200/start.S index 0dbc0094a..e897e6b9c 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_BOOTBINFUNC +#ifdef CONFIG_INIT_CRITICAL /* 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_BOOTBINFUNC */ +#endif /* CONFIG_INIT_CRITICAL */ /* * relocate exeception table */ @@ -160,9 +160,7 @@ copyex: */ #ifdef CONFIG_INIT_CRITICAL bl cpu_init_crit -#endif -#ifdef CONFIG_BOOTBINFUNC 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 */ @@ -179,7 +177,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_BOOTBINFUNC */ +#endif /* CONFIG_INIT_CRITICAL */ /* Set up the stack */ stack_setup: |