Merge branch 'master' of git://git.denx.de/u-boot-samsung

[u-boot] / board / apollon / lowlevel_init.S

diff --git a/board/apollon/lowlevel_init.S b/board/apollon/lowlevel_init.S
index 8381feae086246457c5e13bedcb0d8ef9ecca873..f066fe44e771c60dffae927563ac5cd9521af68f 100644 (file)
--- a/board/apollon/lowlevel_init.S
+++ b/board/apollon/lowlevel_init.S
@@ -46,12 +46,12 @@
 #define SDRAM_BASE_ADDRESS     0x80008000
 
 _TEXT_BASE:
-       .word   TEXT_BASE       /* sdram load addr from config.mk */
+       .word   CONFIG_SYS_TEXT_BASE    /* sdram load addr from config.mk */
 
 .globl lowlevel_init
 lowlevel_init:
 
-#ifdef CFG_NOR_BOOT
+#ifdef CONFIG_SYS_NOR_BOOT
        /* Check running in SDRAM */
        mov     r0, pc, lsr #28
        cmp     r0, #8