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<