Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[platform/kernel/u-boot.git] / include / mpc86xx.h

diff --git a/include/mpc86xx.h b/include/mpc86xx.h
index 9fd349a..a6fdea3 100644 (file)
--- a/include/mpc86xx.h
+++ b/include/mpc86xx.h
@@ -7,6 +7,8 @@
 #ifndef        __MPC86xx_H__
 #define __MPC86xx_H__
 
+#include <asm/fsl_lbc.h>
+
 #define EXC_OFF_SYS_RESET      0x0100  /* System reset offset */
 #define _START_OFFSET          EXC_OFF_SYS_RESET
 
@@ -14,9 +16,9 @@
  * platform register addresses
  */
 
-#define GUTS_SVR       (CFG_CCSRBAR + 0xE00A4)
-#define MCM_ABCR       (CFG_CCSRBAR + 0x01000)
-#define MCM_DBCR       (CFG_CCSRBAR + 0x01008)
+#define GUTS_SVR       (CONFIG_SYS_CCSRBAR + 0xE00A4)
+#define MCM_ABCR       (CONFIG_SYS_CCSRBAR + 0x01000)
+#define MCM_DBCR       (CONFIG_SYS_CCSRBAR + 0x01008)
 
 /*
  * l2cr values.  Look in config_<BOARD>.h for the actual setup
@@ -82,6 +84,7 @@
 typedef struct {
        unsigned long freqProcessor;
        unsigned long freqSystemBus;
+       unsigned long freqLocalBus;
 } MPC86xx_SYS_INFO;
 
 #define l1icache_enable        icache_enable