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