無線ファームの署名チェックを無視するビルドスイッチIGNORE_WLFIRM_SIGN_CHECKを追加。

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1231 b08762b0-b915-fc4b-9d8c-17b2551a87ff

build/systemMenu_RED/Launcher/ARM9/Makefile

@@ -32,10 +32,11 @@ SUBDIRS					=	\
 ifneq ($(UPDATER_RELEASE),TRUE)
 
 # COMPILE SWITCH　※最終ROM作成時は、全てFALSEにセットする。SUBDIRのビルド時にも影響するようexportで環境変数設定する。
-export DO_NOT_SHOW_LAUNCHER	=	FALSE
-export DISABLE_WDS_SCAN		=	TRUE
-export DISABLE_WLFIRM_LOAD	=	TRUE
-export DISABLE_SLEEP		=	TRUE
+export DO_NOT_SHOW_LAUNCHER		=	FALSE
+export DISABLE_WDS_SCAN			=	TRUE
+export DISABLE_WLFIRM_LOAD		=	TRUE
+export IGNORE_WLFIRM_SIGNCHECK	=	FALSE
+export DISABLE_SLEEP			=	TRUE
 
 # COMPILE SWITCH ※最終ROM作成時は、全てTRUEにセットする
 export LOAD_APP_VIA_WRAM	=	FALSE
@@ -115,6 +116,10 @@ ifeq ($(DISABLE_WLFIRM_LOAD),TRUE)
 MACRO_FLAGS += -DDISABLE_WLFIRM_LOAD
 endif
 
+ifeq ($(IGNORE_WLFIRM_SIGNCHECK),TRUE)
+MACRO_FLAGS += -DIGNORE_WLFIRM_SIGNCHECK
+endif
+
 ifeq ($(DISABLE_SLEEP),TRUE)
 MACRO_FLAGS += -DDISABLE_SLEEP
 endif

build/systemMenu_RED/Launcher/ARM9/src/loadWlanFirm.c

@@ -33,8 +33,6 @@
   definitions
  */
 
-#define IGNORE_SIGN_ERROR            0
-
 /* LCFGの無線ファームバージョンをタイトルＩＤとしてそのまま使う場合 */
 #define USE_LCFG_STRING              0
 
@@ -285,20 +283,14 @@ BOOL VerifyWlanfirmSignature(u8* buffer, u32 length)
     {
         OS_TPrintf("[Wlan Firm]  Wlan Firmware authentication has failed.\n");
 
-#if (IGNORE_SIGN_ERROR == 1)
-        
-        /* continue verifying process even though decryption fails
-           in the case of bonding option = 0x01 (support ARM9/ARM7) */
-        if (!( HWi_WSYS08_OP_OP0_MASK == SCFG_ReadBondingOption() ))
-        {
+#ifdef IGNORE_WLFIRM_SIGNCHECK
+        OS_TPrintf("[Wlan Firm]  But installation continues.\n");
+        if ( 0 )
 #endif
+        {
             SYSM_Free(signHeap);
             return FALSE;
-
-#if (IGNORE_SIGN_ERROR == 1)
         }
-        OS_TPrintf("[Wlan Firm]  But installation continues.\n");
-#endif
     }
 
     SYSM_Free(signHeap);