From 5caba8b332446a714cfb705eb632fa285bdf93cd Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 30 Nov 2007 12:56:55 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E3=81=AE=E3=83=AA=E3=83=96?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E9=96=A2=E6=95=B0=E3=81=AB=E5=AF=BE=E5=BF=9C?=
 =?UTF-8?q?=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@298 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 15 +++++++++++----
 build/libraries_sysmenu/boot/ARM9/src/bootAPI.c | 15 +++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
index 5e075943..ea3f4ffb 100644
--- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
@@ -61,9 +61,10 @@ BOOL BOOT_WaitStart( void )
 		
 		// SDK共通リブート
 		{
-			// メモリクリアリストの設定
-			static u32 clr_list[] = 
+			// メモリリストの設定
+			static u32 mem_list[] = 
 			{
+                // pre clear
 				SYSM_OWN_ARM7_MMEM_ADDR, SYSM_OWN_ARM7_MMEM_ADDR_END - SYSM_OWN_ARM7_MMEM_ADDR,
 				SYSM_OWN_ARM9_MMEM_ADDR, SYSM_OWN_ARM9_MMEM_ADDR_END - SYSM_OWN_ARM9_MMEM_ADDR,
 				SYSM_OWN_ARM7_WRAM_ADDR, SYSM_OWN_ARM7_WRAM_ADDR_END - SYSM_OWN_ARM7_WRAM_ADDR,
@@ -75,7 +76,13 @@ BOOL BOOT_WaitStart( void )
 				HW_MAIN_MEM_SHARED, HW_RED_RESERVED - HW_MAIN_MEM_SHARED,
 				HW_ARENA_INFO_BUF, HW_ROM_HEADER_BUF - HW_ARENA_INFO_BUF,
 				HW_PXI_SIGNAL_PARAM_ARM9, HW_MAIN_MEM_SYSTEM_END - HW_PXI_SIGNAL_PARAM_ARM9,
-				NULL
+				NULL,
+                // copy forward
+				NULL,
+                // copy backward
+				NULL,
+                // post clear
+				NULL,
 			};
 
 /*
@@ -138,7 +145,7 @@ BOOL BOOT_WaitStart( void )
 			}
 
 			// [TODO]起動するターゲットの種類を指定する必要あり
-			OS_Boot( (void *)*(u32 *)(HW_TWL_ROM_HEADER_BUF + 0x34), clr_list, REBOOT_TARGET_TWL_SYSTEM );
+			OS_Boot( (void *)*(u32 *)(HW_TWL_ROM_HEADER_BUF + 0x34), mem_list, REBOOT_TARGET_TWL_SYSTEM );
 		}
 	}
 	return FALSE;
diff --git a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
index 947c117d..658487d9 100644
--- a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
@@ -95,12 +95,19 @@ void BOOT_Ready( void )
 	
     // SDK共通リブート
 	{
-	    // メモリクリアリストの設定
-	    static u32 clr_list[] =
+	    // メモリリストの設定
+	    static u32 mem_list[] =
 	    {
+            // pre clear
 	        HW_ITCM, HW_ITCM_SIZE,
 	        //HW_DTCM, HW_DTCM_SIZE,
-	        NULL
+	        NULL,
+            // copy forward
+	        NULL,
+            // copy backward
+	        NULL,
+            // post clear
+	        NULL,
 	    };
 	    
 	    // [TODO]再配置リストの作成と設定（ほぼARM7側でやるのでこちらは空）
@@ -110,7 +117,7 @@ void BOOT_Ready( void )
 		};
 	    
 		// 起動するターゲットの種類を指定する必要あり
-	    OS_Boot( (void *)*(u32 *)(HW_TWL_ROM_HEADER_BUF + 0x24), clr_list, REBOOT_TARGET_TWL_SYSTEM );
+	    OS_Boot( (void *)*(u32 *)(HW_TWL_ROM_HEADER_BUF + 0x24), mem_list, REBOOT_TARGET_TWL_SYSTEM );
 	}
 }