[U-Boot] [PATCH 09/24] powerpc: T1040QDS: Remove macro CONFIG_T1040QDS

York Sun
2016-12-28T16:43:35Z

Use TARGET_T1040QDS from Kconfig instead.

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

arch/powerpc/include/asm/fsl_secure_boot.h | 2 +-
include/configs/T1040QDS.h | 1 -
scripts/config_whitelist.txt | 1 -
3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h
index 808adae..6949ee8 100644
--- a/arch/powerpc/include/asm/fsl_secure_boot.h
+++ b/arch/powerpc/include/asm/fsl_secure_boot.h
@@ -31,7 +31,7 @@
defined(CONFIG_TARGET_T4240QDS) || \
defined(CONFIG_T2080QDS) || \
defined(CONFIG_T2080RDB) || \
- defined(CONFIG_T1040QDS) || \
+ defined(CONFIG_TARGET_T1040QDS) || \
defined(CONFIG_T104xD4QDS) || \
defined(CONFIG_TARGET_T1040RDB) || \
defined(CONFIG_TARGET_T1040D4RDB) || \
diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index 8e13f3b..dc8d86a 100644
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -26,7 +26,6 @@
/*
* T1040 QDS board configuration file
*/
-#define CONFIG_T1040QDS

#ifdef CONFIG_RAMBOOT_PBL
#define CONFIG_RAMBOOT_TEXT_BASE CONFIG_SYS_TEXT_BASE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ff7f3d1..304a341 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -7794,7 +7794,6 @@ CONFIG_SYS_XWAY_EBU_BOOTCFG
CONFIG_SYS_ZYNQ_QSPI_WAIT
CONFIG_SYS_ZYNQ_SPI_WAIT
CONFIG_SYS_i2C_FSL
-CONFIG_T1040QDS
CONFIG_T2080QDS
CONFIG_T2080RDB
CONFIG_T2081QDS
--
2.7.4