From 683d8a881a5a3096449c17a8355f07a90c21af54 Mon Sep 17 00:00:00 2001 From: nakasima Date: Wed, 10 Dec 2008 09:31:08 +0000 Subject: [PATCH] =?UTF-8?q?BROM=5FDEV=5FEARLY=5FRELEASE=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=80=82=20=E3=82=BB=E3=82=AD=E3=83=A5=E3=82=A2ROM=E5=88=87?= =?UTF-8?q?=E3=82=8A=E9=9B=A2=E3=81=97=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=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@98 b871894f-2f95-9b40-918c-086798483c85 --- trunk/bootrom/build/bootrom/teg-dev/ARM11/main.c | 2 ++ trunk/bootrom/build/bootrom/teg-dev/ARM9/main.c | 2 ++ trunk/bootrom/build/libraries/init/ARM11/crt0.c | 2 +- trunk/bootrom/include/brom/brom_defs.h | 7 ++----- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/trunk/bootrom/build/bootrom/teg-dev/ARM11/main.c b/trunk/bootrom/build/bootrom/teg-dev/ARM11/main.c index cb8864c..4fcdfa9 100644 --- a/trunk/bootrom/build/bootrom/teg-dev/ARM11/main.c +++ b/trunk/bootrom/build/bootrom/teg-dev/ARM11/main.c @@ -18,6 +18,8 @@ void BromMain( void ) { +#ifndef BROM_DEV_EARLY_RELEASE osInitBROM(); +#endif // BROM_DEV_EARLY_RELEASE } diff --git a/trunk/bootrom/build/bootrom/teg-dev/ARM9/main.c b/trunk/bootrom/build/bootrom/teg-dev/ARM9/main.c index da560b3..6e6a5df 100644 --- a/trunk/bootrom/build/bootrom/teg-dev/ARM9/main.c +++ b/trunk/bootrom/build/bootrom/teg-dev/ARM9/main.c @@ -18,6 +18,8 @@ void BromSpMain( void ) { +#ifndef BROM_DEV_EARLY_RELEASE osInitBROM(); +#endif // BROM_DEV_EARLY_RELEASE } diff --git a/trunk/bootrom/build/libraries/init/ARM11/crt0.c b/trunk/bootrom/build/libraries/init/ARM11/crt0.c index 2545f7c..2aa2163 100644 --- a/trunk/bootrom/build/libraries/init/ARM11/crt0.c +++ b/trunk/bootrom/build/libraries/init/ARM11/crt0.c @@ -69,7 +69,7 @@ stupStartHandlerVeneer // NULLデータアボート無効時はセキュアROM切り離しチェック ldr r12, [r12] cmp r12, #0 - cmpeq r12, #~0 + cmpne r12, #~0 LSYM(1) beq BSYM(1) //---- check CPU-ID diff --git a/trunk/bootrom/include/brom/brom_defs.h b/trunk/bootrom/include/brom/brom_defs.h index 2c8ee45..9bf26cb 100644 --- a/trunk/bootrom/include/brom/brom_defs.h +++ b/trunk/bootrom/include/brom/brom_defs.h @@ -17,12 +17,9 @@ #ifndef BROM_DEFS_H_ #define BROM_DEFS_H_ -//#define BROM_SYSRV_LOWVEC +//#define BROM_DEV_EARLY_RELEASE + //#define BROM_ENABLE_BOOTROM_WRITE -//#define BROM_ENABLE_INITIAL_STACKHEAP -//#define BROM_ENABLE_WRAMEMU -//#define BROM_FOR_DSP_DEV -//#define BROM_FORCE_DEBUGGER /* BROM_DEFS_H_ */ #endif