From 21a6aae60b0fcb1dafa8257b0881c3578b942138 Mon Sep 17 00:00:00 2001
From: yutaka <yutaka@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 12 Nov 2007 07:36:34 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0=E3=81=AETwlSDK=E3=81=AB?=
 =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=81=9F?=
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@148 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/libraries/init/ARM7/crt0_firm.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/build/libraries/init/ARM7/crt0_firm.c b/build/libraries/init/ARM7/crt0_firm.c
index 537fc70b..b9dfa7a2 100644
--- a/build/libraries/init/ARM7/crt0_firm.c
+++ b/build/libraries/init/ARM7/crt0_firm.c
@@ -432,7 +432,9 @@ _start_AutoloadDoneCallback(void* argv[])
   Returns:      None.
  *---------------------------------------------------------------------------*/
 #define OSi_IMAGE_DIFFERENCE  0x400000
-#define OSi_IMAGE_DIFFERENCE2 0xb00000
+#define OSi_IMAGE_DIFFERENCE2 0xb000000
+#define OSi_DETECT_NITRO_MASK  (REG_SND_SMX_CNT_E_MASK | REG_SND_SMX_CNT_FSEL_MASK)
+#define OSi_DETECT_NITRO_VAL   (REG_SND_SMX_CNT_E_MASK)
 
 static asm void detect_main_memory_size( void )
 {
@@ -453,11 +455,12 @@ static asm void detect_main_memory_size( void )
         bne     @1
 
         //---- 4MB
-        // check SMX_CNT
-        ldr     r2, =REG_SMX_CNT_ADDR
-        ldrh    r1, [r2]
-        tst     r1, #0
-        orrne   r0, r0, #OS_CHIPTYPE_SMX_MASK
+        //---- check SMX_CNT
+        ldr     r3, =REG_SMX_CNT_ADDR
+        ldrh    r1, [r3]
+        and     r1, r1, #OSi_DETECT_NITRO_MASK
+        cmp     r1, #OSi_DETECT_NITRO_VAL
+        orreq   r0, r0, #OS_CHIPTYPE_SMX_MASK
         b       @4
 
         //---- 8MB or 16MB or 32MB