From 79420c07537fe86da539f072986984873b399b83 Mon Sep 17 00:00:00 2001
From: nakasima <nakasima@b871894f-2f95-9b40-918c-086798483c85>
Date: Tue, 13 Jan 2009 05:37:11 +0000
Subject: [PATCH] =?UTF-8?q?ARM9=E3=81=AE=E3=83=AA=E3=83=B3=E3=82=AF?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@164 b871894f-2f95-9b40-918c-086798483c85
---
 trunk/bootrom/build/bootrom/thread/ARM9/Makefile    |  2 +-
 trunk/bootrom/build/buildtools/commondefs.config    |  2 ++
 .../bootrom/build/libraries/init/common/crt0_excp.c | 13 +++++--------
 trunk/include/readme.txt                            |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/trunk/bootrom/build/bootrom/thread/ARM9/Makefile b/trunk/bootrom/build/bootrom/thread/ARM9/Makefile
index 1bb6b22..bedac83 100644
--- a/trunk/bootrom/build/bootrom/thread/ARM9/Makefile
+++ b/trunk/bootrom/build/bootrom/thread/ARM9/Makefile
@@ -17,7 +17,7 @@
 #----------------------------------------------------------------------------
 
 
-BROM_DEF_LINK_SCATLD = TRUE
+#BROM_DEF_LINK_SCATLD = TRUE
 
 BROM_PROC		= ARM9
 
diff --git a/trunk/bootrom/build/buildtools/commondefs.config b/trunk/bootrom/build/buildtools/commondefs.config
index 3d7fe07..914ac62 100644
--- a/trunk/bootrom/build/buildtools/commondefs.config
+++ b/trunk/bootrom/build/buildtools/commondefs.config
@@ -33,8 +33,10 @@ ifdef BROM_DEF_LINK_SCATLD
 MACRO_FLAGS	+= -DBROM_DEF_LINK_SCATLD
 endif
 ifdef BROM_ENABLE_SCATLD_VFP
+ifeq ($(CODEGEN_PROC),ARM11)
 MACRO_FLAGS	+= -DBROM_ENABLE_SCATLD_VFP
 endif
+endif
 
 #----------------------------------------------------------------------------
 endif	# BROM_COMMONDEFS_CONFIG_
diff --git a/trunk/bootrom/build/libraries/init/common/crt0_excp.c b/trunk/bootrom/build/libraries/init/common/crt0_excp.c
index 2f1211d..0d06131 100644
--- a/trunk/bootrom/build/libraries/init/common/crt0_excp.c
+++ b/trunk/bootrom/build/libraries/init/common/crt0_excp.c
@@ -45,14 +45,6 @@ LSYM(0)
         fmrx    r12, fpexc
         bic     r12, r12, #HW_FPEXC_VFP_ENABLE
         fmxr    fpexc, r12
-
-#ifdef BROM_ENABLE_SCATLD_VFP
-        // set undef inst handler
-        INASM_EXTERN( i_osUndefInstHandler )
-        ldr     r3, =HW_UDEF_VECTOR_BUF
-        ldr     r0, =i_osUndefInstHandler
-        str     r0, [r3]
-#endif // BROM_ENABLE_SCATLD_VFP
 #endif // SDK_ARM11
 
         bx      lr
@@ -61,7 +53,12 @@ i_stupExcpVennerCode
         DCD     i_stupExcpTerminateCode  // IRQ
         DCD     i_stupExcpTerminateCode  // FIQ
         DCD     i_stupSwiVeneerCode      // SWI    osInit前にprint文を出したい可能性があるためここで設定
+#ifdef BROM_ENABLE_SCATLD_VFP
+        INASM_EXTERN( i_osUndefInstHandler )
+        DCD     i_osUndefInstHandler     // UNDEF
+#else // BROM_ENABLE_SCATLD_VFP
         DCD     i_stupExcpTerminateCode  // UNDEF
+#endif // BROM_ENABLE_SCATLD_VFP
         DCD     i_stupIAbtTerminateCode  // IABT   命令アボートとデータアボートを区別するため別関数に
         DCD     i_stupExcpTerminateCode  // DABT
 
diff --git a/trunk/include/readme.txt b/trunk/include/readme.txt
index e4d9ee1..1416aca 100644
--- a/trunk/include/readme.txt
+++ b/trunk/include/readme.txt
@@ -1,4 +1,4 @@
 include/ctr:   ハードウェアとしての共通定義とアプリケーションがブートROMと共有する定義を格納したヘッダファイル。
                つまりアプリケーション向けの公開ヘッダファイル。
 include/firm:  ファームウェアがブートROMと共有する定義を格納したヘッダファイル。
-               つまりファームウェア向けの公開ヘッダファイル。
+               つまりファームウェア限定の公開ヘッダファイル。