From 03ddd782c53bd913de9fb69e61da8427eee482c9 Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@b871894f-2f95-9b40-918c-086798483c85> Date: Tue, 3 Feb 2009 11:32:31 +0000 Subject: [PATCH] =?UTF-8?q?Palladium=E5=8B=95=E4=BD=9C=E6=99=82=E3=81=AF?= =?UTF-8?q?=E3=83=81=E3=83=83=E3=82=AF=E3=82=921/256=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4=E3=83=83?= =?UTF-8?q?=E3=83=81=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82=20Palladium?= =?UTF-8?q?=E7=94=A8=E3=83=AD=E3=83=BC=E3=83=89=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E5=A4=89=E6=8F=9B=E3=83=84=E3=83=BC=E3=83=AB=E3=81=A7?= =?UTF-8?q?=E3=81=AE=E3=83=87=E3=83=BC=E3=82=BF=E3=81=AE=E4=B8=A6=E3=81=B3?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82=20thread=E3=83=87=E3=83=A2?= =?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@248 b871894f-2f95-9b40-918c-086798483c85 --- trunk/bootrom/build/buildtools/commondefs.config | 6 ++++++ trunk/bootrom/build/tests/thread/ARM11/main.c | 2 +- trunk/bootrom/include/brom/os/common/tick.h | 8 ++++++++ trunk/bootrom/tools/bin/bin2palladium.pl | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/trunk/bootrom/build/buildtools/commondefs.config b/trunk/bootrom/build/buildtools/commondefs.config index 695507e..e2db950 100644 --- a/trunk/bootrom/build/buildtools/commondefs.config +++ b/trunk/bootrom/build/buildtools/commondefs.config @@ -23,6 +23,7 @@ BROM_COMMONDEFS_CONFIG_ = TRUE #BROM_DEF_LINK_SCATLD = TRUE BROM_ENABLE_SCATLD_VFP = TRUE #BROM_ENABLE_SMP_CODE = TRUE +BROM_RUN_ON_PALLADIUM = TRUE ifdef BROM_ENABLE_BOOTROM_WRITE MACRO_FLAGS += -DBROM_ENABLE_BOOTROM_WRITE @@ -41,6 +42,11 @@ endif ifdef BROM_ENABLE_SMP_CODE MACRO_FLAGS += -DBROM_ENABLE_SMP_CODE endif +ifdef BROM_RUN_ON_PALLADIUM +ifeq ($(BROM_PLATFORM),TEG) +MACRO_FLAGS += -DBROM_RUN_ON_PALLADIUM +endif +endif #---------------------------------------------------------------------------- endif # BROM_COMMONDEFS_CONFIG_ diff --git a/trunk/bootrom/build/tests/thread/ARM11/main.c b/trunk/bootrom/build/tests/thread/ARM11/main.c index 94e38ed..04fd2d7 100644 --- a/trunk/bootrom/build/tests/thread/ARM11/main.c +++ b/trunk/bootrom/build/tests/thread/ARM11/main.c @@ -32,7 +32,7 @@ void BromMain( void ) tick = osGetTick() - tick; pmon = osGetPerfMonitor(OS_MONITOR_1) - pmon; osTPrintf( "sleep tick = %llu msec\n", OS_TICK_TO_MSEC(tick) ); - osTPrintf( "sleep mon = %llu msec\n", OS_PMON_TO_MSEC(pmon) ); + osTPrintf( "sleep pmon = %llu msec\n", OS_PMON_TO_MSEC(pmon) ); } } diff --git a/trunk/bootrom/include/brom/os/common/tick.h b/trunk/bootrom/include/brom/os/common/tick.h index c4ace78..cac1169 100644 --- a/trunk/bootrom/include/brom/os/common/tick.h +++ b/trunk/bootrom/include/brom/os/common/tick.h @@ -63,7 +63,11 @@ extern void i_osSetTick( u64 ); //---- conversion tick count <-> real time count #ifdef SDK_ARM11 +#ifndef BROM_RUN_ON_PALLADIUM #define OS_TICK_CLOCK HW_CPU_CLOCK +#else // BROM_RUN_ON_PALLADIUM +#define OS_TICK_CLOCK (HW_CPU_CLOCK/256) +#endif // BROM_RUN_ON_PALLADIUM #define OS_TICK_PRESCALE 2 #define OS_TICK_HI_SHIFT 28 // ő32 #define OS_TICK_LO_MASK ((u32)(OS_TICK_HI_LSB-1)) @@ -71,7 +75,11 @@ extern void i_osSetTick( u64 ); #define OS_TICK_HI_LSB (1ULL<