From dfc42c52ddd7d3da2c3a05748e606f9692b0aa54 Mon Sep 17 00:00:00 2001
From: yutaka <yutaka@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 31 Mar 2008 04:06:26 +0000
Subject: [PATCH] =?UTF-8?q?AES=E9=8D=B5=E8=A8=AD=E5=AE=9A=E3=81=AE?=
 =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E3=80=81TS=5FVERSION>200=E3=81=AE=E3=81=A8=E3=81=8D=E3=81=AFPM?=
 =?UTF-8?q?=5FInitFIRM=E3=82=92=E5=91=BC=E3=81=B0=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F(=E4=BD=95?=
 =?UTF-8?q?=E3=82=82=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=81=AE?=
 =?UTF-8?q?=E3=81=A7)?=
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@1004 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/gcdfirm/sdmc-launcher/ARM7/main.c  |  2 ++
 build/nandfirm/menu-launcher/ARM7/main.c | 18 +++++++++---------
 build/nandfirm/sdmc-launcher/ARM7/main.c | 18 +++++++++---------
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/build/gcdfirm/sdmc-launcher/ARM7/main.c b/build/gcdfirm/sdmc-launcher/ARM7/main.c
index aae2d83e..98835880 100644
--- a/build/gcdfirm/sdmc-launcher/ARM7/main.c
+++ b/build/gcdfirm/sdmc-launcher/ARM7/main.c
@@ -143,8 +143,10 @@ static void PreInit(void)
 ***************************************************************/
 static void PostInit(void)
 {
+#if SDK_TS_VERSION <= 200
     // PMICの設定 for old version
     PM_InitFIRM();
+#endif
     // AESの初期化
     AES_Init(); // for encrypted NAND
     // マウント情報の初期化
diff --git a/build/nandfirm/menu-launcher/ARM7/main.c b/build/nandfirm/menu-launcher/ARM7/main.c
index 13e16368..d581c863 100644
--- a/build/nandfirm/menu-launcher/ARM7/main.c
+++ b/build/nandfirm/menu-launcher/ARM7/main.c
@@ -122,15 +122,6 @@ static void PreInit(void)
     {
         OS_Terminate();
     }
-    /*
-        AES関連 (NAND暗号化の鍵変更を含む)
-    */
-#ifndef SDK_FINALROM
-    if ( !*(u8*)HW_TWL_RED_LAUNCHER_VER )
-#endif
-    {
-        AESi_PreInitKeys();
-    }
     /*
         リセットパラメータ(1バイト)を共有領域(1バイト)にコピー
     */
@@ -152,8 +143,17 @@ static void PreInit(void)
 ***************************************************************/
 static void PostInit(void)
 {
+#if SDK_TS_VERSION <= 200
     // PMICの設定 for old version
     PM_InitFIRM();
+#endif
+    /*
+        AES関連 (NAND暗号化の鍵変更を含む)
+    */
+    if ( !*(u8*)HW_TWL_RED_LAUNCHER_VER )
+    {
+        AESi_PreInitKeys();
+    }
     // AESの初期化
     AES_Init(); // for encrypted NAND
     // マウント情報の初期化
diff --git a/build/nandfirm/sdmc-launcher/ARM7/main.c b/build/nandfirm/sdmc-launcher/ARM7/main.c
index fe92f161..a38a9a09 100644
--- a/build/nandfirm/sdmc-launcher/ARM7/main.c
+++ b/build/nandfirm/sdmc-launcher/ARM7/main.c
@@ -122,15 +122,6 @@ static void PreInit(void)
     {
         OS_Terminate();
     }
-    /*
-        AES関連 (NAND暗号化の鍵変更を含む)
-    */
-#ifndef SDK_FINALROM
-    if ( !*(u8*)HW_TWL_RED_LAUNCHER_VER )
-#endif
-    {
-        AESi_PreInitKeys();
-    }
     /*
         リセットパラメータ(1バイト)を共有領域(1バイト)にコピー
     */
@@ -152,8 +143,17 @@ static void PreInit(void)
 ***************************************************************/
 static void PostInit(void)
 {
+#if SDK_TS_VERSION <= 200
     // PMICの設定 for old version
     PM_InitFIRM();
+#endif
+    /*
+        AES関連 (NAND暗号化の鍵変更を含む)
+    */
+    if ( !*(u8*)HW_TWL_RED_LAUNCHER_VER )
+    {
+        AESi_PreInitKeys();
+    }
     // AESの初期化
     AES_Init(); // for encrypted NAND
     // マウント情報の初期化