Merge branch 'u-boot/master' into 'u-boot-arm/master'

[karo-tx-uboot.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 7f7ca5ef3451a6020ba0db65e9643585097b4fd6..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
@@ -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