Merge branch 'mpc86xx'

diff --git a/cpu/mpc86xx/speed.c b/cpu/mpc86xx/speed.c
index 6775a11431ab8d6ece94e7126b33f049866c8508..8088b870a43a97d511b41649c5c8477e90ce5bde 100644 (file)
--- 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 7e91e644b1dfa1bf5b0db839e96469d3bce818b5..15e987139ad47143f1d6e0f41fdba999d29cdf92 100644 (file)
--- 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