rvtr/TwlIPL
1
Fork 0
mirror of https://github.com/rvtr/TwlIPL.git synced 2025-10-31 06:01:12 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

AESキー設定をsysmenuライブラリでするように変更、

Browse Source 
X2基板用設定の削除

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1214 b08762b0-b915-fc4b-9d8c-17b2551a87ff
This commit is contained in:
yutaka 2008-04-22 07:03:09 +00:00
parent a55fffc95a
commit ac69e2d8ac
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/nandfirm/sdmc-launcher/ARM7/Makefile
View File

@ -12,8 +12,8 @@
# in whole or in part, without the prior written consent of Nintendo. # in whole or in part, without the prior written consent of Nintendo.
# #
# $Date:: $ # $Date:: $
# $Rev:$ # $Rev$
# $Author:$ # $Author$
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
TWL_PROC = ARM7 TWL_PROC = ARM7
@ -35,6 +35,8 @@ CRT0_O = crt0_firm.o
#SRCDIR = # using default #SRCDIR = # using default
#LCFILE = # using default #LCFILE = # using default
LLIBRARIES += libsysmenu_sp.TWL$(ARCHGEN_TYPE).a
include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037c0000' MAKELCF_FLAGS += -DADDRESS_LTDWRAM='0x037c0000'

35
build/nandfirm/sdmc-launcher/ARM7/main.c
View File

@ -35,6 +35,11 @@
*/ */
//#define PRINT_MEMORY_ADDR 0x02FFC800 //#define PRINT_MEMORY_ADDR 0x02FFC800
/*
AESŒ®<EFBFBD>Ý’èAPI
*/
extern void SYSMi_SetAESKeysForAccessControl( BOOL isNtrMode, ROM_Header *pROMH );
#ifdef PROFILE_ENABLE #ifdef PROFILE_ENABLE
#define PROFILE_MAX 16 #define PROFILE_MAX 16
@ -103,16 +108,7 @@ static void PreInit(void)
リセットパラメータ(1バイト)を共有領域(1バイト)にコピー リセットパラメータ(1バイト)を共有領域(1バイト)にコピー
*/ */
#define HOTSTART_FLAG_ENABLE 0x80 #define HOTSTART_FLAG_ENABLE 0x80
#if SDK_TS_VERSION <= 200 *(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCUi_ReadRegister( (u16)(MCU_REG_TEMP_ADDR + OS_MCU_RESET_VALUE_OFS) ) | HOTSTART_FLAG_ENABLE);
if ( MCU_GetVerInfo() < 0x20 ) // MCU旧バージョン対策
{
*(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCUi_ReadRegister( (u16)(MCU_OLD_REG_TEMP_ADDR + OS_MCU_RESET_VALUE_OFS) ) | HOTSTART_FLAG_ENABLE);
}
else
#endif
{
*(u8 *)HW_NAND_FIRM_HOTSTART_FLAG = (u8)(MCUi_ReadRegister( (u16)(MCU_REG_TEMP_ADDR + OS_MCU_RESET_VALUE_OFS) ) | HOTSTART_FLAG_ENABLE);
}
} }
/*************************************************************** /***************************************************************
@ -122,10 +118,6 @@ static void PreInit(void)
***************************************************************/ ***************************************************************/
static void PostInit(void) static void PostInit(void)
{ {
#if SDK_TS_VERSION <= 200
// PMICの設定 for old version
PM_InitFIRM();
#endif
/* /*
AES関連 (NAND暗号化の鍵変更を含む) AES関連 (NAND暗号化の鍵変更を含む)
*/ */
@ -143,16 +135,15 @@ static void PostInit(void)
バッテリー残量チェック バッテリー残量チェック
*/ */
MCUi_WriteRegister( MCU_REG_MODE_ADDR, MCU_SYSTEMMODE_FIRMWARE ); // change battery level only MCUi_WriteRegister( MCU_REG_MODE_ADDR, MCU_SYSTEMMODE_FIRMWARE ); // change battery level only
if ( MCU_GetVerInfo() >= 0x20 ) // MCU旧バージョン対策 PUSH_PROFILE();
SetDebugLED(++step); // 0x87
if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 )
{ {
if ( (MCUi_ReadRegister( MCU_REG_POWER_INFO_ADDR ) & MCU_REG_POWER_INFO_LEVEL_MASK) == 0 )
{
#ifndef SDK_FINALROM #ifndef SDK_FINALROM
OS_TPanic("Battery is empty.\n"); OS_TPanic("Battery is empty.\n");
#else #else
PM_Shutdown(); PM_Shutdown();
#endif #endif
}
} }
} }
@ -304,9 +295,7 @@ void TwlSpMain( void )
#endif #endif
PM_BackLightOn( TRUE ); PM_BackLightOn( TRUE );
AESi_ResetAesKeyA(); SYSMi_SetAESKeysForAccessControl(FALSE, rh);
AESi_ResetAesKeyB();
AESi_ResetAesKeyC();
MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) ); MI_CpuClearFast( OSi_GetFromFirmAddr(), sizeof(OSFromFirmBuf) );
FS_SetMountInfoForSrl(); FS_SetMountInfoForSrl();
OS_BootFromFIRM(); OS_BootFromFIRM();