powerpc/B4: Merge B4420 and B4860 in config_mpc85xx.h
authorPoonam Aggrwal <poonam.aggrwal@freescale.com>
Mon, 25 Mar 2013 07:40:20 +0000 (07:40 +0000)
committerAndy Fleming <afleming@freescale.com>
Fri, 24 May 2013 21:54:14 +0000 (16:54 -0500)
commit8fa0102bcfd67203e44b656fb478bc358e102ee2
tree3357b8f2c72620c412c698aaf31867463c1cf577
parent1bfb9f156aa66cca6bb9c773867a1f02a84b14be
powerpc/B4: Merge B4420 and B4860 in config_mpc85xx.h

B4420 is a subset of B4860. Merge them in config_mpc85xx.h to simplify
the defines.
- Removed #define CONFIG_SYS_FSL_NUM_CLUSTERS as this is used nowhere.
- defined CONFIG_SYS_NUM_FM1_10GEC to 0 for B4420 as it does not have 10G.

Also move CONFIG_E6500 out of B4860QDSds.h into config_mpc85xx.h.

Signed-off-by: Poonam Aggrwal <poonam.aggrwal@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
arch/powerpc/include/asm/config_mpc85xx.h
include/configs/B4860QDS.h