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

[karo-tx-uboot.git] / include / e500.h

diff --git a/include/e500.h b/include/e500.h
index 84b580de1f4cc09feb5cd8aef7592e2f3deca23e..e1708b9dc956f01573da0e71c2bf0f4b9a56c628 100644 (file)
--- a/include/e500.h
+++ b/include/e500.h
@@ -8,17 +8,19 @@
 
 #ifndef __ASSEMBLY__
 
-#ifndef CONFIG_NUM_CPUS
-#define CONFIG_NUM_CPUS 1
-#endif
-
 typedef struct
 {
-  unsigned long freqProcessor[CONFIG_NUM_CPUS];
+  unsigned long freqProcessor[CONFIG_MAX_CPUS];
   unsigned long freqSystemBus;
   unsigned long freqDDRBus;
   unsigned long freqLocalBus;
   unsigned long freqQE;
+#ifdef CONFIG_SYS_DPAA_FMAN
+  unsigned long freqFMan[CONFIG_SYS_NUM_FMAN];
+#endif
+#ifdef CONFIG_SYS_DPAA_PME
+  unsigned long freqPME;
+#endif
 } MPC85xx_SYS_INFO;
 
 #endif  /* _ASMLANGUAGE */