powerpc: T4240QDS: Remove macro CONFIG_T4240QDS

Use CONFIG_TARGET_T4240QDS instead. Signed-off-by: York Sun <york.sun@nxp.com>
8 years ago · 673c01c708
parent 9c21d06c67
commit 673c01c708
5 changed files with 3 additions and 6 deletions
--- a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
+++ b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
@ -391,7 +391,7 @@ const char *serdes_clock_to_string(u32 clock)
 	case SRDS_PLLCR0_RFCK_SEL_161_13:
 		return "161.1328123";
 	default:
-#if defined(CONFIG_T4240QDS) || defined(CONFIG_TARGET_T4160QDS)
+#if defined(CONFIG_TARGET_T4240QDS) || defined(CONFIG_TARGET_T4160QDS)
 		return "???";
 #else
 		return "122.88";
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@ -28,7 +28,7 @@
 #if defined(CONFIG_TARGET_B4860QDS) || \
 	defined(CONFIG_TARGET_B4420QDS) || \
 	defined(CONFIG_TARGET_T4160QDS) || \
-	defined(CONFIG_T4240QDS) || \
+	defined(CONFIG_TARGET_T4240QDS) || \
 	defined(CONFIG_T2080QDS) || \
 	defined(CONFIG_T2080RDB) || \
 	defined(CONFIG_T1040QDS) || \
--- a/board/freescale/t4qds/Makefile
+++ b/board/freescale/t4qds/Makefile
@ -8,7 +8,7 @@ ifdef CONFIG_SPL_BUILD
 obj-y	+= spl.o
 else
 obj-$(CONFIG_TARGET_T4160QDS)	+= t4240qds.o eth.o
-obj-$(CONFIG_T4240QDS)	+= t4240qds.o eth.o
+obj-$(CONFIG_TARGET_T4240QDS)	+= t4240qds.o eth.o
 obj-$(CONFIG_PCI)	+= pci.o
 endif

--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@ -10,8 +10,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H

-#define CONFIG_T4240QDS
-
 #define CONFIG_FSL_SATA_V2
 #define CONFIG_PCIE4
 #define CONFIG_FSL_CAAM			/* Enable SEC/CAAM */
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -7828,7 +7828,6 @@ CONFIG_T1040QDS
 CONFIG_T2080QDS
 CONFIG_T2080RDB
 CONFIG_T2081QDS
-CONFIG_T4240QDS
 CONFIG_T4240RDB
 CONFIG_TAM3517_SETTINGS
 CONFIG_TAM3517_SW3_SETTINGS