From 3d2972feac4383f5c0f929996976d00f9c072339 Mon Sep 17 00:00:00 2001 From: York Sun Date: Mon, 25 Mar 2013 07:40:05 +0000 Subject: powerpc/T4160: Merge T4160 and T4240 in config_mpc85xx.h T4160 is a subset of T4240. Merge them in config_mpc85xx.h to simplify the defines. Also move CONFIG_E6500 out of t4qds.h into config_mpc85xx.h. Signed-off-by: York Sun Signed-off-by: Andy Fleming --- include/configs/t4qds.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/t4qds.h') diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 943bf6701f..fa1dcc3528 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -37,7 +37,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 */ -- cgit v1.2.1