projects / kernel / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2148d0e)
Don't relocate the u-boot code at IPL
authorKyungmin Park <kyungmin.park@samsung.com>
Sat, 5 Jun 2010 01:51:31 +0000 (10:51 +0900)
committerKyungmin Park <kyungmin.park@samsung.com>
Sat, 5 Jun 2010 01:51:31 +0000 (10:51 +0900)
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
arch/arm/cpu/arm926ejs/start.S patch | blob | history

diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S
index 6544b46..bb4a5c8 100644 (file)
--- a/arch/arm/cpu/arm926ejs/start.S
+++ b/arch/arm/cpu/arm926ejs/start.S
@@ -166,7 +166,7 @@ reset:
        bl      cpu_init_crit
 #endif
 
-#ifndef CONFIG_SKIP_RELOCATE_UBOOT
+#if !defined(CONFIG_SKIP_RELOCATE_UBOOT) || !defined(CONFIG_ONENAND_IPL)
 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 */
Domain: System / Kernel;