summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPoonam Aggrwal <poonam.aggrwal@freescale.com>2013-03-25 07:40:20 +0000
committerAndy Fleming <afleming@freescale.com>2013-05-24 16:54:14 -0500
commit8fa0102bcfd67203e44b656fb478bc358e102ee2 (patch)
tree3357b8f2c72620c412c698aaf31867463c1cf577 /include
parent1bfb9f156aa66cca6bb9c773867a1f02a84b14be (diff)
downloadu-boot-imx-8fa0102bcfd67203e44b656fb478bc358e102ee2.zip
u-boot-imx-8fa0102bcfd67203e44b656fb478bc358e102ee2.tar.gz
u-boot-imx-8fa0102bcfd67203e44b656fb478bc358e102ee2.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/B4860QDS.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h
index cfab1e8..65f8a22 100644
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -36,7 +36,6 @@
/* High Level Configuration Options */
#define CONFIG_BOOKE
-#define CONFIG_E6500
#define CONFIG_E500 /* BOOKE e500 family */
#define CONFIG_E500MC /* BOOKE e500mc family */
#define CONFIG_SYS_BOOK3E_HV /* Category E.HV supported */