From e75d609052f2f2f8bbb32b609f601b07d240e871 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Fri, 9 Apr 2010 14:56:59 +0900 Subject: [PATCH] recovery: modify text base and load address Signed-off-by: Minkyu Kang --- include/configs/s5pc1xx_universal.h | 3 ++- recovery/board/samsung/universal/Makefile | 4 ++-- recovery/recovery.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/configs/s5pc1xx_universal.h b/include/configs/s5pc1xx_universal.h index 763b0e7..b94b211 100644 --- a/include/configs/s5pc1xx_universal.h +++ b/include/configs/s5pc1xx_universal.h @@ -281,7 +281,8 @@ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE /* memtest works on */ #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5000000) -#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4000000) +#define CONFIG_SYS_BOOT_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) #define CONFIG_SYS_HZ 1000 diff --git a/recovery/board/samsung/universal/Makefile b/recovery/board/samsung/universal/Makefile index 437f679..5894408 100644 --- a/recovery/board/samsung/universal/Makefile +++ b/recovery/board/samsung/universal/Makefile @@ -15,9 +15,9 @@ include $(TOPDIR)/config.mk # Recovery block' size should be 1 block (256K) # Recovery block includes the onenand_ipl(16K), so actual size is 240K -TEXT_BASE = 0x34800000 +TEXT_BASE = 0x34000000 # 256K - 16K(IPL Size) -TEXT_BASE_256K = 0x3483C000 +TEXT_BASE_256K = 0x3403C000 LDSCRIPT= $(TOPDIR)/recovery/board/$(BOARDDIR)/recovery.lds LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) diff --git a/recovery/recovery.c b/recovery/recovery.c index 786ac62..b509805 100644 --- a/recovery/recovery.c +++ b/recovery/recovery.c @@ -30,11 +30,11 @@ void start_recovery_boot(void) { uchar *buf; - buf = (uchar *)CONFIG_SYS_SDRAM_BASE; + buf = (uchar *)CONFIG_SYS_BOOT_ADDR; onenand_read_block(buf); - ((init_fnc_t *)CONFIG_SYS_SDRAM_BASE)(); + ((init_fnc_t *)CONFIG_SYS_BOOT_ADDR)(); /* should never come here */ } -- 2.7.4