WLANファームの認証用の鍵を内部持ちするビルドスイッチを追加。

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

build/libraries_sysmenu/sysmenu/ARM9/src/sysmenu_lib.c

@@ -28,6 +28,7 @@
 extern void LCFG_VerifyAndRecoveryNTRSettings( void );
 
 // function's prototype-------------------------------------------------------
+void _start_AutoloadDoneCallback(void* argv[]);
 static void SYSMi_CopyLCFGData( u32 dst_addr );
 static TitleProperty *SYSMi_CheckDebuggerBannerViewModeBoot( void );
 static TitleProperty *SYSMi_CheckShortcutBoot1( void );
@@ -60,6 +61,17 @@ static TitleProperty s_bootTitleBuf;
 //
 // ============================================================================
 
+#if 0
+// AutoloadDoneCallbackを利用して鍵を引き渡す
+void _start_AutoloadDoneCallback(void* argv[])
+{
+#pragma unused(argv)
+    // ARM7で使用する分の鍵を渡す
+    SYSMi_SendKeysToARM7();
+}
+#endif
+
+
 // SystemMenuの初期化
 void SYSM_Init( void *(*pAlloc)(u32), void (*pFree)(void*) )
 {
@@ -67,7 +79,7 @@ void SYSM_Init( void *(*pAlloc)(u32), void (*pFree)(void*) )
     pSysm = SYSMi_GetWork();
     pRomHeader = (ROM_Header_Short *)0x027fc000;
 #endif /* SYSM_DEBUG_ */
-	
+
     // ARM7で使用する分の鍵を渡す
     SYSMi_SendKeysToARM7();
 
@@ -430,7 +442,7 @@ static TitleProperty *SYSMi_CheckShortcutBoot2( void )
 		isSetArgument = TRUE;
 		isBootMSET    = TRUE;
 	}
-
+	
     //-----------------------------------------------------
     // TWL設定データ未設定時の初回起動シーケンス起動
     //-----------------------------------------------------

build/systemMenu_RED/Launcher/ARM9/Makefile

@@ -43,6 +43,9 @@ WRAM_MAP_FILE			=	$(COMPONENT_DIR)/wram_regs/wram_regs.rbin
 include $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/Launcher/ARM9/commondefs.launcher
 
 
+# MAKEROM SWITCH ※最終ROM作成時は、全てFALSEにセットする
+USE_WLANFIRM_LOCAL_PUBKEY		?=	TRUE
+
 # MAKEROM SWITCH ※最終ROM作成時は、全てTRUEにセットする
 DISABLE_DEBUG					?=	FALSE
 
@@ -151,6 +154,10 @@ ifeq ($(DEFAULT_COMP_ARM7),hyena)
 MACRO_FLAGS += -DUSE_HYENA_COMPONENT
 endif
 
+ifeq ($(USE_WLANFIRM_LOCAL_PUBKEY),TRUE)
+MACRO_FLAGS += -DUSE_WLANFIRM_LOCAL_PUBKEY
+endif
+
 #----------------------------------------------------------------------------
 
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs

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

@@ -212,7 +212,7 @@ s32 ReadFirmwareBinary(char *path, u32 offset, u8 *buffer, s32 bufSize)
 }
 
 //#define USE_LOCAL_PUBKEY
-#ifdef USE_LOCAL_PUBKEY
+#ifdef USE_WLANFIRM_LOCAL_PUBKEY
 static const u8 s_pubkey9_1[ 0x80 ] = {
 	0xb6, 0x18, 0xd8, 0x61, 0x28, 0xcb, 0x5c, 0x6f, 0x05, 0xfc, 0xd7, 0x09, 0x18, 0x3f, 0xb2, 0xd0, 
 	0x6b, 0x7d, 0xee, 0xd9, 0x98, 0xdc, 0x4f, 0xdd, 0xc1, 0xa8, 0x59, 0x18, 0xfb, 0xb0, 0x65, 0xbd, 
@@ -242,7 +242,7 @@ BOOL VerifyWlanfirmSignature(u8* buffer, u32 length)
     OSTick vstart = OS_GetTick();
 #endif
 
-#ifdef USE_LOCAL_PUBKEY
+#ifdef USE_WLANFIRM_LOCAL_PUBKEY
 	// ランチャー経由でのデバッガ起動では、鍵情報を受け取ることができない。
 	// よってリリースビルドの時は、デバッグ動作を優先して鍵を自分で持つ。
 	pPubkey = (u8 *)s_pubkey9_1;

build/systemMenu_tools/SystemUpdater/Makefile

@@ -42,17 +42,18 @@ SUBDIRS =	$(LAUNCHER_DIR) \
 
 # COMPILE SWITCH for build SystemMenu
 
-export UPDATER_RELEASE		=	TRUE
+export UPDATER_RELEASE				=	TRUE
 
-export DO_NOT_SHOW_LAUNCHER	=	TRUE
+export DO_NOT_SHOW_LAUNCHER			=	TRUE
-export DISABLE_WDS_SCAN		=	TRUE
+export DISABLE_WDS_SCAN				=	TRUE
-export IGNORE_WLFIRM_SIGNCHECK	=	FALSE
+export IGNORE_WLFIRM_SIGNCHECK		=	FALSE
-export DISABLE_WLFIRM_LOAD	=	FALSE
+export DISABLE_WLFIRM_LOAD			=	FALSE
-export DISABLE_INITIAL_SETTINGS	=	TRUE
+export DISABLE_INITIAL_SETTINGS		=	TRUE
-export SYSM_OUTSIDE_UI		=	TRUE
+export SYSM_OUTSIDE_UI				=	TRUE
 
 # MAKEROM SWITCH for build SystemMenu
-export DISABLE_DEBUG		=	TRUE
+export DISABLE_DEBUG				=	TRUE
+export USE_WLANFIRM_LOCAL_PUBKEY	=	FALSE
 
 
 #----------------------------------------------------------------------------