ARM: mx28: Remove CONFIG_ARCH_CPU_INIT

[oweals/u-boot.git] / arch / arm / cpu / arm926ejs / at91 / lowlevel_init.S

diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
index 559c35c9ee78d69fad27df15984fc61046a44aee..d102195273a8716520f51aad5d4c8ca6f66c385c 100644 (file)
--- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
+++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S
@@ -35,7 +35,7 @@
 #include <asm/arch/at91sam9_sdramc.h>
 #include <asm/arch/at91sam9_smc.h>
 #include <asm/arch/at91_rstc.h>
-#ifdef CONFIG_AT91_LEGACY
+#ifdef CONFIG_ATMEL_LEGACY
 #include <asm/arch/at91sam9_matrix.h>
 #endif
 #ifndef CONFIG_SYS_MATRIX_EBICSA_VAL
@@ -43,7 +43,7 @@
 #endif
 
 _TEXT_BASE:
-       .word   TEXT_BASE
+       .word   CONFIG_SYS_TEXT_BASE
 
 .globl lowlevel_init
 .type lowlevel_init,function
@@ -54,7 +54,7 @@ POS1:
        ldr     r0, =POS1       /* r0 = POS1 compile */
        ldr     r2, _TEXT_BASE
        sub     r0, r0, r2      /* r0 = POS1-_TEXT_BASE (POS1 relative) */
-       sub     r5, r5, r0      /* r0 = TEXT_BASE-1 */
+       sub     r5, r5, r0      /* r0 = CONFIG_SYS_TEXT_BASE-1 */
        sub     r5, r5, #4      /* r1 = text base - current */
 
        /* memory control configuration 1 */
@@ -230,37 +230,37 @@ SMRDATA1:
        .word CONFIG_SYS_SDRC_MDR_VAL
        .word AT91_ASM_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL2
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL1
        .word AT91_ASM_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL3
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL2
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL3
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL4
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL5
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL6
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL7
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL8
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL9
        .word AT91_ASM_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL4
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL10
        .word AT91_ASM_SDRAMC_MR
        .word CONFIG_SYS_SDRC_MR_VAL5
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL11
        .word AT91_ASM_SDRAMC_TR
        .word CONFIG_SYS_SDRC_TR_VAL2
-       .word AT91_SDRAM_BASE
+       .word CONFIG_SYS_SDRAM_BASE
        .word CONFIG_SYS_SDRAM_VAL12
        /* User reset enable*/
        .word AT91_ASM_RSTC_MR