From 8154da169b8b489e786d0fbad60160015c6e80dc Mon Sep 17 00:00:00 2001 From: nakasima Date: Fri, 23 May 2008 07:48:46 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=A2=E3=83=AA=E3=83=9E=E3=83=83?= =?UTF-8?q?=E3=83=97=E5=A4=89=E6=9B=B4=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6?= =?UTF-8?q?NTR=E3=83=A2=E3=83=BC=E3=83=89=E6=99=82=E3=81=AEROM=E3=83=98?= =?UTF-8?q?=E3=83=83=E3=83=80=E3=81=8C=E6=B6=88=E5=8E=BB=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E4=B8=8D=E5=85=B7=E5=90=88=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=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/trunk@1493 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c index 3beaa7d5..8f3a692e 100644 --- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c +++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c @@ -35,6 +35,7 @@ #define PRE_CLEAR_NUM_MAX (6*2) #define COPY_NUM_MAX (6*3) +#define COPY_HEADER_NUM_MAX (1*3) #define POST_CLEAR_NUM_MAX (12 + 6*2) #define CLRLIST_REBOOT_STACK_PAD_SIZE_IDX (2*3+1) @@ -165,7 +166,7 @@ BOOL BOOT_WaitStart( void ) // メモリリストの設定 // [TODO:] ショップアプリで鍵を残す場合、NANDファーム引数の領域（WRAMにある）を消さないように注意。 // WRAMリマップ後の消し漏れやバッファオーバランの懸念回避のため不要な鍵はpre clearで消す。 - static u32 mem_list[PRE_CLEAR_NUM_MAX + 1 + COPY_NUM_MAX + 2 + POST_CLEAR_NUM_MAX + 1] = + static u32 mem_list[PRE_CLEAR_NUM_MAX + 1 + COPY_NUM_MAX + COPY_HEADER_NUM_MAX + 2 + POST_CLEAR_NUM_MAX + 1] = { // pre clear HW_WRAM_B_OR_C_MIRROR, SYSM_OWN_ARM7_WRAM_ADDR_END - HW_WRAM_B_OR_C_MIRROR, // SYSM_OWN_ARM7_WRAM_ADDRとHW_WRAM_Bをまとめてクリア @@ -214,6 +215,13 @@ BOOL BOOT_WaitStart( void ) mem_list[list_count++] = SYSMi_GetWork()->romRelocateInfo[l].length; } } + // NTRシステム領域コピー（pre clearの消去範囲へ含まれるようになったため） + if( isNtrMode ) + { + mem_list[list_count++] = HW_MAIN_MEM_SHARED; + mem_list[list_count++] = 0x02800000 - HW_MAIN_MEM_SHARED_SIZE; + mem_list[list_count++] = HW_MAIN_MEM_SHARED_SIZE; + } mem_list[list_count++] = NULL; // post clearリスト設定