From df1af835daf305f5553c1f396fd3ea2780085fb5 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Fri, 9 Apr 2010 10:54:14 +0900 Subject: [PATCH] recovery: BUGFIX: fix boot fail problem Signed-off-by: Minkyu Kang --- cpu/arm_cortexa8/start.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/arm_cortexa8/start.S b/cpu/arm_cortexa8/start.S index ce4f5db..45e7677 100644 --- a/cpu/arm_cortexa8/start.S +++ b/cpu/arm_cortexa8/start.S @@ -142,7 +142,7 @@ next: bl cpu_init_crit #endif -#if !defined(CONFIG_SKIP_RELOCATE_UBOOT) || !defined(CONFIG_ONENAND_IPL) || !defined(CONFIG_RECOVERY_BLOCK) +#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 @@ -164,7 +164,7 @@ copy_loop: @ copy 32 bytes at a time /* Set up the stack */ stack_setup: ldr r0, _TEXT_BASE @ upper 128 KiB: relocated uboot -#if defined(CONFIG_ONENAND_IPL) && defined(CONFIG_RECOVERY_BLOCK) +#if defined(CONFIG_ONENAND_IPL) || defined(CONFIG_RECOVERY_BLOCK) sub sp, r0, #128 @ leave 32 words for abort-stack #else sub r0, r0, #CONFIG_SYS_MALLOC_LEN @ malloc area -- 2.7.4