summaryrefslogtreecommitdiff
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorPoonam Aggrwal <poonam.aggrwal@freescale.com>2009-07-31 12:08:14 +0530
committerKumar Gala <galak@kernel.crashing.org>2009-08-28 17:12:38 -0500
commit0e870980a64584a591af775bb9c9fe9450124df9 (patch)
tree627bfb5272eb2508ff8ed9027e00d86897af7fee /include/asm-ppc
parent18bacc2027f8531d8dec15ba8da3242dfb4e63f3 (diff)
downloadu-boot-imx-0e870980a64584a591af775bb9c9fe9450124df9.zip
u-boot-imx-0e870980a64584a591af775bb9c9fe9450124df9.tar.gz
u-boot-imx-0e870980a64584a591af775bb9c9fe9450124df9.tar.bz2
8xxx: Removed CONFIG_NUM_CPUS from 85xx/86xx
The number of CPUs are getting detected dynamically by checking the processor SVR value. Also removed CONFIG_NUM_CPUS references from all the platforms with 85xx/86xx processors. This can help to use the same u-boot image across the platforms. Also revamped and corrected few Freescale Copyright messages. Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/config.h7
-rw-r--r--include/asm-ppc/global_data.h1
-rw-r--r--include/asm-ppc/processor.h5
3 files changed, 11 insertions, 2 deletions
diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index c9ba805..fd7961c 100644
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -38,4 +38,11 @@
#endif
#endif
+#if defined(CONFIG_MPC8572) || defined(CONFIG_P2020) \
+ || defined(CONFIG_MPC8641)
+#define CONFIG_MAX_CPUS 2
+#else
+#define CONFIG_MAX_CPUS 1
+#endif
+
#endif /* _ASM_CONFIG_H_ */
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index 244c161..a5747e1 100644
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -91,6 +91,7 @@ typedef struct global_data {
#endif
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
u32 lbc_clk;
+ void *cpu;
#endif /* CONFIG_MPC85xx || CONFIG_MPC86xx */
#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
u32 i2c1_clk;
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index 2841104..a079b2d 100644
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -1065,13 +1065,14 @@ n:
struct cpu_type {
char name[15];
u32 soc_ver;
+ u32 num_cores;
};
struct cpu_type *identify_cpu(u32 ver);
#if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
-#define CPU_TYPE_ENTRY(n, v) \
- { .name = #n, .soc_ver = SVR_##v, }
+#define CPU_TYPE_ENTRY(n, v, nc) \
+ { .name = #n, .soc_ver = SVR_##v, .num_cores = (nc), }
#else
#if defined(CONFIG_MPC83xx)
#define CPU_TYPE_ENTRY(x) {#x, SPR_##x}