From 6bf4d3207cc004841cd1dfe2802ad634c2e23272 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 12 Mar 2008 04:37:12 +0000
Subject: [PATCH] =?UTF-8?q?bootAPI=E3=81=A7=E3=82=BB=E3=82=AD=E3=83=A5?=
 =?UTF-8?q?=E3=82=A2=E3=82=B7=E3=82=B9=E3=83=86=E3=83=A0=E4=BB=A5=E5=A4=96?=
 =?UTF-8?q?=E3=81=AF=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0=EF=BC=88=E5=85=83?=
 =?UTF-8?q?=E3=81=AF=E3=83=96=E3=83=BC=E3=83=88ROM=EF=BC=89=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E3=82=82=E3=82=89=E3=81=A3=E3=81=9F=E9=8D=B5=E9=A0=98?=
 =?UTF-8?q?=E5=9F=9F=E3=82=92=E6=B6=88=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F?=
 =?UTF-8?q?=EF=BC=88SD=E3=82=B3=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=81=AF=E6=AE=8B=E3=81=99=EF=BC=89=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/trunk@864 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries_sysmenu/boot/ARM7/src/bootAPI.c | 9 +++++++++
 build/libraries_sysmenu/boot/ARM9/src/bootAPI.c | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
index 4f8ffc80..1803e09a 100644
--- a/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM7/src/bootAPI.c
@@ -21,6 +21,8 @@
 #include <twl/aes/ARM7/lo.h>
 #include <sysmenu.h>
 #include <sysmenu/ds.h>
+#include <firm/hw/ARM7/mmap_firm.h>
+#include <firm/format/from_brom.h>
 #include <firm/aes/ARM7/aes_init.h>
 #include "reboot.h"
 
@@ -233,6 +235,13 @@ BOOL BOOT_WaitStart( void )
             }
 #endif // FIRM_USE_SDK_KEYS || SYSMENU_DISABLE_RETAIL_BOOT
 
+			// セキュアシステム以外は鍵を消しておく
+			if ( target != REBOOT_TARGET_TWL_SECURE_SYSTEM )
+			{
+				OSFromBrom7Buf* fromBrom = (void*)HW_FIRM_FROM_BROM_BUF;
+				MI_CpuClearFast(fromBrom, sizeof(OSFromBrom7Buf) - sizeof(fromBrom->SDNandContext));
+			}
+
 			// リブート
 			OS_Boot( dh->s.sub_entry_address, mem_list, target );
 		}
diff --git a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
index 264d6161..cca8e6f4 100644
--- a/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
+++ b/build/libraries_sysmenu/boot/ARM9/src/bootAPI.c
@@ -21,6 +21,8 @@
 #include <sysmenu.h>
 #include <sysmenu/ds.h>
 #include <firm/format/wram_regs.h>
+#include <firm/hw/ARM9/mmap_firm.h>
+#include <firm/format/from_brom.h>
 #include "reboot.h"
 
 
@@ -176,6 +178,12 @@ void BOOT_Ready( void )
         // ゲームコマンドパラメータをスクランブルOFF設定に書き換える
         dh->s.game_cmd_param = SYSMi_GetWork()->gameCommondParam;
 
+		// セキュアシステム以外は鍵を消しておく
+		if ( target != REBOOT_TARGET_TWL_SECURE_SYSTEM )
+		{
+			MI_CpuClearFast((void*)HW_FIRM_FROM_BROM_BUF, HW_FIRM_FROM_BROM_BUF_SIZE);
+		}
+
 		// 起動するターゲットの種類を指定する必要あり
 		OS_Boot( dh->s.main_entry_address, mem_list, target );
 	}