From 45f1e0f5f53757c167180788068435db2a6efce8 Mon Sep 17 00:00:00 2001
From: N1277 <N1277@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 30 Jul 2010 05:11:46 +0000
Subject: [PATCH] =?UTF-8?q?=E3=82=BB=E3=82=AD=E3=83=A5=E3=82=A2=E9=A0=98?=
 =?UTF-8?q?=E5=9F=9F=E3=81=AE=E5=86=8D=E9=85=8D=E7=BD=AE=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/branches/20100611_RedLauncher_Remodel@2951 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
index 28d81df5..eaba76e2 100644
--- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
@@ -168,8 +168,17 @@ static void BOOTi_RebootCallback( void** entryp, void* mem_list_v, REBOOTTarget*
 			MI_CpuCopyFast( (void*)SYSM_CARD_ROM_HEADER_BAK, (void*)HW_TWL_CARD_ROM_HEADER_BUF, HW_TWL_CARD_ROM_HEADER_BUF_SIZE );
         }
 #ifdef SYSM_NO_LOAD
-		// セキュア領域をテンポラリから常駐モジュールへコピー
-		MI_CpuCopyFast( (void*)SYSM_CARD_NTR_SECURE_BUF, dh->s.main_ram_address, SECURE_AREA_SIZE );
+        // セキュア領域をテンポラリから常駐モジュールへコピー
+        {
+            u32 *dst = dh->s.main_ram_address;
+            u32 *src = (void*)SYSMi_GetWork()->romRelocateInfo[0].src;
+            // 再配置がある場合は再配置前アドレスへコピー
+            if ( src )
+            {
+                dst = src;
+            }
+            MI_CpuCopyFast( (void*)SYSM_CARD_NTR_SECURE_BUF, dst, SECURE_AREA_SIZE );
+        }
 #endif
 
         // デバッガによるROMエミュレーション時はNTR-ROMヘッダバッファの