drivers: qe: Move CONFIG_U_QE to Kconfig

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
[York S: revised subject line and removed commit message]
Reviewed-by: York Sun <york.sun@nxp.com>

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 56536c4b19150e325e2494f36078f859959d42c4..884a945a194ded7f454967c37481741906143290 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -74,6 +74,8 @@ source "drivers/power/Kconfig"
 
 source "drivers/pwm/Kconfig"
 
+source "drivers/qe/Kconfig"
+
 source "drivers/ram/Kconfig"
 
 source "drivers/remoteproc/Kconfig"

diff --git a/drivers/qe/Kconfig b/drivers/qe/Kconfig
new file mode 100644 (file)
index 0000000..49a6e32
--- /dev/null
+++ b/drivers/qe/Kconfig
@@ -0,0 +1,12 @@
+#
+# QUICC Engine Drivers
+#
+config U_QE
+       bool "Enable support for U QUICC Engine"
+       default y if (ARCH_LS1021A && !SD_BOOT && !NAND_BOOT && !QSPI_BOOT) \
+               || (TARGET_T1024QDS) \
+               || (TARGET_T1024RDB) \
+               || (TARGET_T1040QDS && !NOBQFMAN) \
+               || (TARGET_LS1043ARDB && !SPL_NO_QE && !NAND_BOOT && !QSPI_BOOT)
+       help
+         Choose this option to add support for U QUICC Engine.

diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index 8a38c5e19c1c3db9c910f6bbd61b9d2313feb15f..191616b8b0af4dc5303db8cce9282c4ae733870a 100644 (file)
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -659,7 +659,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DPAA_FMAN
 
 #define CONFIG_QE
-#define CONFIG_U_QE
 /* Default address of microcode for the Linux FMan driver */
 #if defined(CONFIG_SPIFLASH)
 /*

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index f7a54f7a9733ef4288cf15e9fc1e1d27f9899474..ac5de8d1644ac525c33fd41a3a2ecce7f0832df6 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -669,7 +669,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_TARGET_T1024RDB
 #define CONFIG_QE
-#define CONFIG_U_QE
 #endif
 /* Default address of microcode for the Linux FMan driver */
 #if defined(CONFIG_SPIFLASH)

diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h
index e890860b7e58e3f5239c1b214d5af564e428dc91..25615be40ece12649d1c55856f60d214e30ef858 100644 (file)
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -549,7 +549,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_DPAA_PME
 
 #define CONFIG_QE
-#define CONFIG_U_QE
 /* Default address of microcode for the Linux Fman driver */
 #if defined(CONFIG_SPIFLASH)
 /*

diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h
index 994e6ca362c4fe4a935fdaf155a0f99c566f77bc..7f7ffdede1c84c8c850390852030154b0cb619a1 100644 (file)
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -107,7 +107,6 @@ unsigned long get_board_ddr_clk(void);
 
 #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
        !defined(CONFIG_QSPI_BOOT)
-#define CONFIG_U_QE
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
 #endif
 

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 75b2e2fbbde03fe655524b6140cb748bb4b72e19..ddd024e8c08e8d062bff72659a23fb19fdeed206 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -106,7 +106,6 @@
 
 #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
        !defined(CONFIG_QSPI_BOOT)
-#define CONFIG_U_QE
 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
 #endif
 

diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h
index bc639e586f1634663a4d3aefe7f74713bdcb150f..ffd92dbb43a66b22b9b811e1b8ca7c4cf4321a9f 100644 (file)
--- a/include/configs/ls1043ardb.h
+++ b/include/configs/ls1043ardb.h
@@ -268,13 +268,6 @@
 #endif
 #endif
 
-/* QE */
-#ifndef SPL_NO_QE
-#if !defined(CONFIG_NAND_BOOT) && !defined(CONFIG_QSPI_BOOT)
-#define CONFIG_U_QE
-#endif
-#endif
-
 /* SATA */
 #ifndef SPL_NO_SATA
 #ifndef CONFIG_CMD_EXT2

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 94953d87380290504b5d3af1b60ed15c8fe7979f..cf97b64296167cf3ca2c13b5bc5de859b44b9103 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4635,7 +4635,6 @@ CONFIG_USE_SPIFLASH
 CONFIG_UTBIPAR_INIT_TBIPA
 CONFIG_U_BOOT_HDR_ADDR
 CONFIG_U_BOOT_HDR_SIZE
-CONFIG_U_QE
 CONFIG_VAL
 CONFIG_VAR_SIZE_SPL
 CONFIG_VCT_NOR