Merge branch 'mpc86xx'

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)
 {

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