From a16c96d8cfa5074deb15de3e5fa333fc32404331 Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 23 Jun 2008 07:11:28 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=BBHW=E6=83=85=E5=A0=B1=E3=81=AE=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4=E3=81=8C=E3=80=81HW=5FPARAM=5FTWL=5FHW=5FNORMAL=5FINF?=
 =?UTF-8?q?O,=20HW=5FPARAM=5FTWL=5FHW=5FSECURE=5FINFO=E3=81=AB=20=E3=80=80?=
 =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4=E3=80=82=20?=
 =?UTF-8?q?=E3=83=BBHW=E3=82=BB=E3=82=AD=E3=83=A5=E3=82=A2=E6=83=85?=
 =?UTF-8?q?=E5=A0=B1=E3=83=A9=E3=82=A4=E3=83=88=E3=81=AB=E8=A8=80=E8=AA=9E?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=81=8C=E4=BC=B4=E3=81=A3=E3=81=9F=E6=99=82?=
 =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=81=8C=E3=81=86=E3=81=BE=E3=81=8F?=
 =?UTF-8?q?=E3=81=84=E3=81=A3=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3?=
 =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=82=92=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@1672 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c   | 12 ++++++------
 .../ARM7.TWL/src/crt0.SCFG_NOLOCK.c                  |  8 ++++++++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c b/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c
index 35be896b..bd508b01 100644
--- a/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c
+++ b/build/systemMenu_tools/HWInfoWriter/ARM9/src/hwi.c
@@ -271,12 +271,6 @@ BOOL HWI_ModifyLanguage( u8 region )
 	u8  freeSoftBoxCount;
 	BOOL result = TRUE;
 
-	if (!ReadTWLSettings())
-	{
-		result = FALSE;
-        OS_TPrintf( "Read TWLSettings failed.\n" );
-	}
-
     if( langBitmap & ( 0x0001 << nowLanguage ) ) {
         OS_TPrintf( "Language no change.\n" );
     }else {
@@ -370,6 +364,9 @@ BOOL HWI_WriteHWNormalInfoFile( void )
         return FALSE;
     }
 
+	// MMEMのシステム領域にセット
+	MI_CpuCopyFast( LCFGi_GetHWN(), (void *)HW_PARAM_TWL_HW_NORMAL_INFO, sizeof(LCFGTWLHWNormalInfo) );
+
     return TRUE;
 }
 
@@ -525,6 +522,9 @@ BOOL HWI_WriteHWSecureInfoFile( u8 region, const u8 *pSerialNo, BOOL isDisableWi
         OS_TPrintf( "HW Secure Info Write failed.\n" );
     }
 
+	// MMEMのシステム領域にセット
+	MI_CpuCopyFast( LCFGi_GetHWS(), (void *)HW_HW_SECURE_INFO, HW_HW_SECURE_INFO_END - HW_HW_SECURE_INFO );
+
     return isWrite;
 }
 
diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/crt0.SCFG_NOLOCK.c b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/crt0.SCFG_NOLOCK.c
index 9d5e531b..84ea2ede 100644
--- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/crt0.SCFG_NOLOCK.c
+++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/src/crt0.SCFG_NOLOCK.c
@@ -184,6 +184,13 @@ _start(void)
         /* SCFG 設定を確認 */
         bl          INITi_CheckSysConfig
 
+        /* プリロードパラメータアドレスが格納されていない場合は、デフォルト値をセット */
+		ldr				r0, =HW_PRELOAD_PARAMETER_ADDR
+		ldr				r1, [r0]
+		cmp				r1, #0
+		ldreq			r1, =HW_PARAM_TWL_SETTINGS_DATA_DEFAULT
+		streq			r1, [r0]
+
         /* ランチャーから渡された情報を退避 */
         ldr         r3, =SDK_WRAM_ARENA_LO
         sub         r2, r3, #0x40
@@ -194,6 +201,7 @@ _start(void)
         strlt       r0, [r2], #4
         blt         @001
 
+			
         /* ハンドシェイク用マイクロコードを専用 WRAM にコピー */
         ldr         r1, =microcode_ShakeHand
         ldr         r2, =HW_PRV_WRAM