diff options
| author | Jon Loeliger <jdl@freescale.com> | 2006-07-28 10:00:33 -0500 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2006-07-28 10:00:33 -0500 |
| commit | 12d1ff4c18832d26d2bb8aaab240aaa06c2a83eb (patch) | |
| tree | 1378592e954a31908f8e7bcefdbe439403bf55cf | |
| parent | 5a8a5605b874278b95f0f373c1b7668089f10df8 (diff) | |
| parent | 492900b985439fbce1a118afde1e35def870db03 (diff) | |
Merge branch 'mpc86xx'
| -rw-r--r-- | cpu/mpc86xx/speed.c | 2 | ||||
| -rw-r--r-- | include/configs/MPC8641HPCN.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cpu/mpc86xx/speed.c b/cpu/mpc86xx/speed.c index 6775a11431..8088b870a4 100644 --- a/cpu/mpc86xx/speed.c +++ b/cpu/mpc86xx/speed.c @@ -30,6 +30,7 @@ #include <asm/processor.h> +#ifdef MPC8641HPCN /* * get_board_sys_clk * Reads the FPGA on board for CONFIG_SYS_CLK_FREQ @@ -93,6 +94,7 @@ unsigned long get_board_sys_clk(ulong dummy) return val; } +#endif void get_sys_info (sys_info_t *sysInfo) { diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 7e91e644b1..15e987139a 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -268,7 +268,7 @@ #define OF_CPU "PowerPC,8641@0" #define OF_SOC "soc8641@f8000000" -#define OF_TBCLK (bd->bi_busfreq / 8) +#define OF_TBCLK (bd->bi_busfreq / 4) #define OF_STDOUT_PATH "/soc8641@f8000000/serial@4500" #define CFG_64BIT_VSPRINTF 1 |