From 317b088aca6ee0ce17ab67429950004ad2bd6f0d Mon Sep 17 00:00:00 2001 From: yutaka Date: Fri, 25 Jan 2008 05:28:51 +0000 Subject: [PATCH] =?UTF-8?q?=E3=82=A2=E3=82=A4=E3=83=89=E3=83=AB=E3=82=B9?= =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=89=E3=82=92=E5=BF=85=E3=81=9A=E7=AB=8B?= =?UTF-8?q?=E3=81=A6=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= =?UTF-8?q?=20SD=E3=82=A2=E3=83=97=E3=83=AA=E3=81=AE=E9=8D=B5=E7=95=AA?= =?UTF-8?q?=E5=8F=B7=E5=A4=89=E6=9B=B4?= 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@516 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/gcdfirm/sdmc-launcher/ARM7/main.c | 9 --------- build/gcdfirm/sdmc-launcher/ARM9/main.c | 2 +- build/libraries/os/common/os_boot.c | 6 +++--- build/nandfirm/menu-launcher/ARM7/main.c | 9 --------- build/nandfirm/menu-launcher2/ARM7/main.c | 9 --------- build/nandfirm/sdmc-launcher/ARM7/main.c | 9 --------- build/nandfirm/sdmc-launcher/ARM9/main.c | 2 +- 7 files changed, 5 insertions(+), 41 deletions(-) diff --git a/build/gcdfirm/sdmc-launcher/ARM7/main.c b/build/gcdfirm/sdmc-launcher/ARM7/main.c index 3e169125..efe86b3c 100644 --- a/build/gcdfirm/sdmc-launcher/ARM7/main.c +++ b/build/gcdfirm/sdmc-launcher/ARM7/main.c @@ -35,11 +35,6 @@ */ #define PRINT_MEMORY_ADDR 0x02000600 -/* - 定義するとアイドルスレッドを作成します。 -*/ -//#define USE_IDLE_THREAD - #ifdef PROFILE_ENABLE #define PROFILE_MAX 16 @@ -73,7 +68,6 @@ extern void* SDNandContext; /* NAND static ROM_Header* const rh= (ROM_Header*)HW_TWL_ROM_HEADER_BUF; -#ifdef USE_IDLE_THREAD static OSThread idleThread; static u64 idleStack[32]; static void IdleThread(void* arg) @@ -90,7 +84,6 @@ static void CreateIdleThread(void) OS_CreateThread(&idleThread, IdleThread, NULL, &idleStack[32], sizeof(idleStack), OS_THREAD_PRIORITY_MAX); OS_WakeupThreadDirect(&idleThread); } -#endif /*************************************************************** PreInit @@ -137,10 +130,8 @@ static void PostInit(void) PM_InitFIRM(); // AESの初期化 AES_Init(); // for encrypted NAND -#ifdef USE_IDLE_THREAD // アイドルスレッドの作成 CreateIdleThread(); -#endif } /*************************************************************** diff --git a/build/gcdfirm/sdmc-launcher/ARM9/main.c b/build/gcdfirm/sdmc-launcher/ARM9/main.c index 246fac2d..98c166f5 100644 --- a/build/gcdfirm/sdmc-launcher/ARM9/main.c +++ b/build/gcdfirm/sdmc-launcher/ARM9/main.c @@ -17,7 +17,7 @@ #include #ifndef FIRM_USE_TWLSDK_KEYS -#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[2] // 鍵管理.xls参照 +#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[4] // 鍵管理.xls参照 #else #define RSA_KEY_ADDR rsa_key static const u8 rsa_key[128] = diff --git a/build/libraries/os/common/os_boot.c b/build/libraries/os/common/os_boot.c index b2c4bec4..d85087e5 100644 --- a/build/libraries/os/common/os_boot.c +++ b/build/libraries/os/common/os_boot.c @@ -62,7 +62,7 @@ void OS_BootWithRomHeaderFromFIRM( ROM_Header* rom_header ) /* 一部鍵バッファのクリア (鍵管理.xls参照) */ mem_list[i++] = (u32)OSi_GetFromFirmAddr()->rsa_pubkey[0]; mem_list[i++] = ACS_PUBKEY_LEN; - mem_list[i++] = (u32)OSi_GetFromFirmAddr()->rsa_pubkey[2]; + mem_list[i++] = (u32)OSi_GetFromFirmAddr()->rsa_pubkey[4]; mem_list[i++] = ACS_PUBKEY_LEN; #else // SDK_ARM7 { /* REBOOT_ExecuteのCODEとSTACKの隙間をクリア */ @@ -83,7 +83,7 @@ void OS_BootWithRomHeaderFromFIRM( ROM_Header* rom_header ) // post clear mem_list[i++] = NULL; SDK_ASSERT(i <= sizeof(mem_list)/sizeof(mem_list[0])); - +#if 0 #ifdef FIRM_USE_TWLSDK_KEYS // TwlSDK内の鍵を使っている時は量産用CPUではブートしない #ifdef SDK_ARM9 @@ -95,7 +95,7 @@ void OS_BootWithRomHeaderFromFIRM( ROM_Header* rom_header ) OS_Terminate(); } #endif // FIRM_USE_SDK_KEYS - +#endif REBOOT_Execute(entry, wram_reg, mem_list, code_buf, stack_top, target, scfg, jtag); OS_Terminate(); } diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c index d706c512..9c37d41f 100644 --- a/build/nandfirm/menu-launcher/ARM7/main.c +++ b/build/nandfirm/menu-launcher/ARM7/main.c @@ -35,11 +35,6 @@ */ #define PRINT_MEMORY_ADDR 0x02FFC800 -/* - 定義するとアイドルスレッドを作成します。 -*/ -//#define USE_IDLE_THREAD - #ifdef PROFILE_ENABLE #define PROFILE_MAX 16 @@ -73,7 +68,6 @@ extern void* SDNandContext; /* NAND static ROM_Header* const rh= (ROM_Header*)HW_TWL_ROM_HEADER_BUF; -#ifdef USE_IDLE_THREAD static OSThread idleThread; static u64 idleStack[32]; static void IdleThread(void* arg) @@ -90,7 +84,6 @@ static void CreateIdleThread(void) OS_CreateThread(&idleThread, IdleThread, NULL, &idleStack[32], sizeof(idleStack), OS_THREAD_PRIORITY_MAX); OS_WakeupThreadDirect(&idleThread); } -#endif /*************************************************************** PreInit @@ -136,10 +129,8 @@ static void PostInit(void) PM_InitFIRM(); // AESの初期化 AES_Init(); // for encrypted NAND -#ifdef USE_IDLE_THREAD // アイドルスレッドの作成 CreateIdleThread(); -#endif } /*************************************************************** diff --git a/build/nandfirm/menu-launcher2/ARM7/main.c b/build/nandfirm/menu-launcher2/ARM7/main.c index 2be74ced..ccb0a1d6 100644 --- a/build/nandfirm/menu-launcher2/ARM7/main.c +++ b/build/nandfirm/menu-launcher2/ARM7/main.c @@ -36,11 +36,6 @@ */ #define PRINT_MEMORY_ADDR 0x02FFC800 -/* - 定義するとアイドルスレッドを作成します。 -*/ -//#define USE_IDLE_THREAD - #ifdef PROFILE_ENABLE #define PROFILE_MAX 16 @@ -73,7 +68,6 @@ extern void* SDNandContext; /* NAND static ROM_Header* const rh= (ROM_Header*)HW_TWL_ROM_HEADER_BUF; -#ifdef USE_IDLE_THREAD static OSThread idleThread; static u64 idleStack[32]; static void IdleThread(void* arg) @@ -90,7 +84,6 @@ static void CreateIdleThread(void) OS_CreateThread(&idleThread, IdleThread, NULL, &idleStack[32], sizeof(idleStack), OS_THREAD_PRIORITY_MAX); OS_WakeupThreadDirect(&idleThread); } -#endif /*************************************************************** PreInit @@ -136,10 +129,8 @@ static void PostInit(void) PM_InitFIRM(); // AESの初期化 AES_Init(); // for encrypted NAND -#ifdef USE_IDLE_THREAD // アイドルスレッドの作成 CreateIdleThread(); -#endif } /*************************************************************** diff --git a/build/nandfirm/sdmc-launcher/ARM7/main.c b/build/nandfirm/sdmc-launcher/ARM7/main.c index 43406e2d..cc456bdd 100644 --- a/build/nandfirm/sdmc-launcher/ARM7/main.c +++ b/build/nandfirm/sdmc-launcher/ARM7/main.c @@ -35,11 +35,6 @@ */ #define PRINT_MEMORY_ADDR 0x02000600 -/* - 定義するとアイドルスレッドを作成します。 -*/ -//#define USE_IDLE_THREAD - #ifdef PROFILE_ENABLE #define PROFILE_MAX 16 @@ -73,7 +68,6 @@ extern void* SDNandContext; /* NAND static ROM_Header* const rh= (ROM_Header*)HW_TWL_ROM_HEADER_BUF; -#ifdef USE_IDLE_THREAD static OSThread idleThread; static u64 idleStack[32]; static void IdleThread(void* arg) @@ -90,7 +84,6 @@ static void CreateIdleThread(void) OS_CreateThread(&idleThread, IdleThread, NULL, &idleStack[32], sizeof(idleStack), OS_THREAD_PRIORITY_MAX); OS_WakeupThreadDirect(&idleThread); } -#endif /*************************************************************** PreInit @@ -136,10 +129,8 @@ static void PostInit(void) PM_InitFIRM(); // AESの初期化 AES_Init(); // for encrypted NAND -#ifdef USE_IDLE_THREAD // アイドルスレッドの作成 CreateIdleThread(); -#endif } /*************************************************************** diff --git a/build/nandfirm/sdmc-launcher/ARM9/main.c b/build/nandfirm/sdmc-launcher/ARM9/main.c index e0e7c09b..5d6f5a32 100644 --- a/build/nandfirm/sdmc-launcher/ARM9/main.c +++ b/build/nandfirm/sdmc-launcher/ARM9/main.c @@ -17,7 +17,7 @@ #include #ifndef FIRM_USE_TWLSDK_KEYS -#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[2] // 鍵管理.xls参照 +#define RSA_KEY_ADDR OSi_GetFromFirmAddr()->rsa_pubkey[4] // 鍵管理.xls参照 #else #define RSA_KEY_ADDR rsa_key static const u8 rsa_key[128] =