Index: firmware/target/coldfire/system-coldfire.c =================================================================== --- firmware/target/coldfire/system-coldfire.c (revision 14937) +++ firmware/target/coldfire/system-coldfire.c (working copy) @@ -252,6 +252,10 @@ SPURVEC = 24; MPARK = 0x81; /* PARK[1,0]=10 + BCR24BIT */ + +#ifndef HAVE_ADJUSTABLE_CPU_FREQ + cf_set_cpu_frequency(CPUFREQ_DEFAULT); +#endif } void system_reboot (void) Index: firmware/target/coldfire/system-target.h =================================================================== --- firmware/target/coldfire/system-target.h (revision 14937) +++ firmware/target/coldfire/system-target.h (working copy) @@ -165,6 +165,10 @@ /* Set DATAINCONTROL without disturbing FIFO reset state */ void coldfire_set_dataincontrol(unsigned long value); +#ifndef HAVE_ADJUSTABLE_CPU_FREQ +extern void cf_set_cpu_frequency(long frequency); +#endif + /* 11.2896 MHz */ #define CPUFREQ_DEFAULT_MULT 1 #define CPUFREQ_DEFAULT (CPUFREQ_DEFAULT_MULT * CPU_FREQ) Index: firmware/target/coldfire/iriver/system-iriver.c =================================================================== --- firmware/target/coldfire/iriver/system-iriver.c (revision 14937) +++ firmware/target/coldfire/iriver/system-iriver.c (working copy) @@ -24,8 +24,6 @@ #include "timer.h" #include "pcf50606.h" -#ifdef HAVE_ADJUSTABLE_CPU_FREQ - /* Settings for all possible clock frequencies (with properly working timers) * NOTE: Some 5249 chips don't like having PLLDIV set to 0. We must avoid that! * @@ -73,8 +71,13 @@ #define BAUDRATE_DIV_MAX (CPUFREQ_MAX/(BAUD_RATE*32*2)) #endif +#ifdef HAVE_ADJUSTABLE_CPU_FREQ void set_cpu_frequency (long) __attribute__ ((section (".icode"))); void set_cpu_frequency(long frequency) +#else +void cf_set_cpu_frequency (long) __attribute__ ((section (".icode"))); +void cf_set_cpu_frequency(long frequency) +#endif { switch(frequency) { @@ -157,5 +160,3 @@ break; } } - -#endif /* HAVE_ADJUSTABLE_CPU_FREQ */ Index: firmware/target/coldfire/iaudio/system-iaudio.c =================================================================== --- firmware/target/coldfire/iaudio/system-iaudio.c (revision 14937) +++ firmware/target/coldfire/iaudio/system-iaudio.c (working copy) @@ -24,8 +24,6 @@ #include "timer.h" #include "pcf50606.h" -#ifdef HAVE_ADJUSTABLE_CPU_FREQ - /* Settings for all possible clock frequencies (with properly working timers) * * xxx_REFRESH_TIMER below @@ -55,8 +53,13 @@ #define RECALC_DELAYS(f) \ pcf50606_i2c_recalc_delay(f) +#ifdef HAVE_ADJUSTABLE_CPU_FREQ void set_cpu_frequency (long) __attribute__ ((section (".icode"))); void set_cpu_frequency(long frequency) +#else +void cf_set_cpu_frequency (long) __attribute__ ((section (".icode"))); +void cf_set_cpu_frequency(long frequency) +#endif { switch(frequency) { @@ -115,5 +118,3 @@ break; } } - -#endif /* HAVE_ADJUSTABLE_CPU_FREQ */