powerpc: T4240QDS: Remove macro CONFIG_T4240QDS

Use CONFIG_TARGET_T4240QDS instead.

Signed-off-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c b/arch/powerpc/cpu/mpc85xx/fsl_corenet2_serdes.c
index 587736c433f44bcfdef9af480bead5e9c80adb41..677b062044b5947c3c511c9ee41ceb571424bf16 100644 (file)
--- 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";

diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index 6cfbbcddafaf7802a52edc55321d6ec126dab4e1..808adae82d62aa5849f4573af769657ad310e858 100644 (file)
--- 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) || \

diff --git a/board/freescale/t4qds/Makefile b/board/freescale/t4qds/Makefile
index 6c51c7409de4fbf495d9d760cf9dd642c2e20f37..1eacbcc016e8b79d37358737e59783fcba2f5ddd 100644 (file)
--- 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
 

diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h
index 6ba2a03f0c1deb3842da52e74fef63e2c78ff74a..1217cd0aefde94c2c64c5a8745a144f11ca15db2 100644 (file)
--- 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 */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3256df723188001043835f0a92e6cc2eaaf9b408..56992fc573aec404606d8429eac3d3b7a4ee9e78 100644 (file)
--- 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