From 7957510b590b8e59a8930f3ad24037a2a42ed142 Mon Sep 17 00:00:00 2001
From: N1277 <N1277@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Fri, 24 Sep 2010 10:01:12 +0000
Subject: [PATCH] =?UTF-8?q?CTR=E3=83=93=E3=83=AB=E3=83=89=E6=99=82?=
 =?UTF-8?q?=E3=81=AF=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0=E3=82=92=E4=BA=92?=
 =?UTF-8?q?=E6=8F=9B=E3=82=AB=E3=83=BC=E3=83=8D=E3=83=AB=E3=81=AB=E5=86=85?=
 =?UTF-8?q?=E5=8C=85=E3=81=95=E3=81=9B=E3=82=8B=E3=81=9F=E3=82=81=E8=A3=BD?=
 =?UTF-8?q?=E5=93=81=E3=81=A7=E3=82=82=E3=83=95=E3=82=A1=E3=83=BC=E3=83=A0?=
 =?UTF-8?q?=E9=96=8B=E7=99=BA=E9=8D=B5=E3=82=92=E4=BD=BF=E7=94=A8=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E3=81=AB=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/branches/20100611_RedLauncher_Remodel@2969 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries/os/common/os_boot.c             | 3 +++
 build/libraries/os/common/os_init_firm.c        | 3 +++
 build/nandfirm/menu-launcher/wram_regs/Makefile | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/libraries/os/common/os_boot.c b/build/libraries/os/common/os_boot.c
index 55265c3c..30496753 100644
--- a/build/libraries/os/common/os_boot.c
+++ b/build/libraries/os/common/os_boot.c
@@ -113,6 +113,8 @@ void OS_BootWithRomHeaderFromFIRM( ROM_Header* rom_header )
 #endif
     mem_list[i++] = NULL;
     SDK_ASSERT(i <= sizeof(mem_list)/sizeof(mem_list[0]));
+#ifndef FIRM_FOR_CTR
+    // CTRでは互換カーネルへ内包させるため開発鍵を許可
 #ifndef FIRM_USE_PRODUCT_KEYS
     // 開発鍵を使っている時は量産用CPUではブートしない
 #ifdef SDK_ARM9
@@ -131,6 +133,7 @@ void OS_BootWithRomHeaderFromFIRM( ROM_Header* rom_header )
     {
         OS_Terminate();
     }
+#endif // FIRM_FOR_CTR
     REBOOTi_EnableCtrFirm();
     REBOOT_Execute(entry, wram_reg, mem_list, code_buf, stack_top, target, scfg, set_jtag, forbid_jtag, psram_4mb);
     OS_Terminate();
diff --git a/build/libraries/os/common/os_init_firm.c b/build/libraries/os/common/os_init_firm.c
index 3e2763a6..6e93ec89 100644
--- a/build/libraries/os/common/os_init_firm.c
+++ b/build/libraries/os/common/os_init_firm.c
@@ -167,6 +167,8 @@ void OS_InitFIRM(void)
 
 #endif // SDK_ARM9
 
+#ifndef FIRM_FOR_CTR
+    // CTRでは互換カーネルへ内包させるため開発鍵を許可
 #ifndef FIRM_USE_PRODUCT_KEYS
     // 開発鍵を使っている時は量産用CPUでは起動しない
 #ifdef SDK_ARM9
@@ -185,6 +187,7 @@ void OS_InitFIRM(void)
     {
         OS_Terminate();
     }
+#endif // FIRM_FOR_CTR
 }
 
 #pragma profile reset
diff --git a/build/nandfirm/menu-launcher/wram_regs/Makefile b/build/nandfirm/menu-launcher/wram_regs/Makefile
index 76342425..8944f863 100644
--- a/build/nandfirm/menu-launcher/wram_regs/Makefile
+++ b/build/nandfirm/menu-launcher/wram_regs/Makefile
@@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------
 
 override TARGET_PLATFORM	:= TWL
-override TARGET_CODEGEN		:= ARM
+override TARGET_CODEGEN		:= ALL
 override TWL_ARCHGEN		:= LIMITED
 
 override TARGET_FINALROM	:= TRUE