rev.2105の変更をマージ。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@2116 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yosiokat 2008-08-06 02:09:54 +00:00
parent 9d2724a984
commit fdd147227a
2 changed files with 6 additions and 6 deletions

View File

@ -186,17 +186,17 @@ TitleProperty *SYSM_ReadParameters( void )
//-----------------------------------------------------
// ノーマル情報リード
if( !LCFG_ReadHWNormalInfo() ) {
#ifndef SYSM_IGNORE_RESULT_HWINFO
#ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
OS_TPrintf( "HW Normal Info Broken!\n" );
UTL_SetFatalError( FATAL_ERROR_HWINFO_NORMAL );
#endif // SYSM_IGNORE_RESULT_HWINFO
#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
}
// セキュア情報リード
if( !LCFG_ReadHWSecureInfo() ) {
#ifndef SYSM_IGNORE_RESULT_HWINFO
#ifndef SYSM_BUILD_FOR_PRODUCTION_TEST
OS_TPrintf( "HW Secure Info Broken!\n" );
UTL_SetFatalError( FATAL_ERROR_HWINFO_SECURE );
#endif // SYSM_IGNORE_RESULT_HWINFO
#endif // SYSM_BUILD_FOR_PRODUCTION_TEST
}
//-----------------------------------------------------

View File

@ -376,12 +376,12 @@ BOOL InstallWlanFirmware( BOOL isHotStartWLFirm )
u8 *pSecBuf = NULL;
u8 *pHdrBuf = NULL;
ROM_Header_Short *header = ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF;
#if defined(SYSM_DISABLE_WLFIRM_LOAD) || defined(SYSM_BUILD_FOR_PRODUCTION_TEST)
return TRUE;
#endif // SYSM_DISABLE_WLFIRM_LOAD || SYSM_BUILD_FOR_PRODUCTION_TEST
ROM_Header_Short *header = ( ROM_Header_Short *)HW_TWL_ROM_HEADER_BUF;
if( header->titleID_Lo[3] == '4' )
{
OS_TPrintf("[Wlan Firm] This is DEV_UIG_Launcher. Wireless firmware download skipped.\n");