From b4410ec5630be06ee4d0dcf6f4a92b427b662403 Mon Sep 17 00:00:00 2001
From: N1277 <N1277@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 31 Aug 2010 07:43:41 +0000
Subject: [PATCH] =?UTF-8?q?HW=E6=83=85=E5=A0=B1=E3=82=92CTR=E3=83=A1?=
 =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=8B=E3=82=89=E5=8F=97=E3=81=91?=
 =?UTF-8?q?=E5=8F=96=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=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@2966 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c | 7 ++++++-
 build/systemMenu_RED/Launcher/ARM9/commondefs.launcher | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
index ae294afc..4ab0197d 100644
--- a/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
+++ b/build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c
@@ -189,6 +189,10 @@ TitleProperty *SYSM_ReadParameters( void )
     //-----------------------------------------------------
     // HW情報のリード
     //-----------------------------------------------------
+#ifdef SYSM_NO_HWINFO
+    MI_CpuCopyFast( (void *)HW_PARAM_TWL_HW_NORMAL_INFO, LCFGi_GetHWN(), sizeof(LCFGTWLHWNormalInfo) );
+    MI_CpuCopyFast( (void *)HW_HW_SECURE_INFO, LCFGi_GetHWS(), HW_HW_SECURE_INFO_END - HW_HW_SECURE_INFO );
+#else // SYSM_NO_HWINFO
     // ノーマル情報リード
     if( !LCFG_ReadHWNormalInfo() ) {
 #ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
@@ -203,6 +207,7 @@ TitleProperty *SYSM_ReadParameters( void )
         UTL_SetFatalError( FATAL_ERROR_HWINFO_SECURE );
 #endif // SYSM_BUILD_FOR_PRODUCTION_TEST
     }
+#endif // SYSM_NO_HWINFO
 
     //-----------------------------------------------------
     // システム領域にHWInfoをコピー
@@ -390,8 +395,8 @@ static void SYSMi_CopyLCFGDataHWInfo( u32 dst_addr )
     *(u32 *)HW_PRELOAD_PARAMETER_ADDR = dst_addr;
 
     // HWノーマル情報、HWセキュア情報をメモリに展開しておく
-#ifndef SYSM_NO_HWINFO
     MI_CpuCopyFast( LCFGi_GetHWN(), (void *)HW_PARAM_TWL_HW_NORMAL_INFO, sizeof(LCFGTWLHWNormalInfo) );
+#ifndef SYSM_NO_HWINFO
     MI_CpuCopyFast( LCFGi_GetHWS(), (void *)HW_HW_SECURE_INFO, HW_HW_SECURE_INFO_END - HW_HW_SECURE_INFO );
 #endif // SYSM_NO_HWINFO
 }
diff --git a/build/systemMenu_RED/Launcher/ARM9/commondefs.launcher b/build/systemMenu_RED/Launcher/ARM9/commondefs.launcher
index 9ea96f1c..1295dd5a 100644
--- a/build/systemMenu_RED/Launcher/ARM9/commondefs.launcher
+++ b/build/systemMenu_RED/Launcher/ARM9/commondefs.launcher
@@ -24,7 +24,7 @@ export SYSM_NO_LOAD = TRUE
 export SYSM_NO_ES = TRUE
 export SYSM_NO_WLFIRM = TRUE
 export SYSM_NO_SETTINGFILE = TRUE
-# export SYSM_NO_HWINFO = TRUE
+export SYSM_NO_HWINFO = TRUE
 
 # COMPILE SWITCH　※最終ROM作成時は、全てFALSEにセットする。SUBDIRのビルド時にも影響するようexportで環境変数設定する。
 export SYSM_DO_NOT_SHOW_LAUNCHER		=	FALSE