Commit 247058b9b4b60a9d67aefd3d3e930fcd3ba9c7c3

Authored by Ran Wang
Committed by York Sun
1 parent db947fa038

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>

Showing 9 changed files with 14 additions and 13 deletions Side-by-side Diff

... ... @@ -74,6 +74,8 @@
74 74  
75 75 source "drivers/pwm/Kconfig"
76 76  
  77 +source "drivers/qe/Kconfig"
  78 +
77 79 source "drivers/ram/Kconfig"
78 80  
79 81 source "drivers/remoteproc/Kconfig"
  1 +#
  2 +# QUICC Engine Drivers
  3 +#
  4 +config U_QE
  5 + bool "Enable support for U QUICC Engine"
  6 + default y if (ARCH_LS1021A && !SD_BOOT && !NAND_BOOT && !QSPI_BOOT) \
  7 + || (TARGET_T1024QDS) \
  8 + || (TARGET_T1024RDB) \
  9 + || (TARGET_T1040QDS && !NOBQFMAN) \
  10 + || (TARGET_LS1043ARDB && !SPL_NO_QE && !NAND_BOOT && !QSPI_BOOT)
  11 + help
  12 + Choose this option to add support for U QUICC Engine.
include/configs/T102xQDS.h
... ... @@ -659,7 +659,6 @@
659 659 #define CONFIG_SYS_DPAA_FMAN
660 660  
661 661 #define CONFIG_QE
662   -#define CONFIG_U_QE
663 662 /* Default address of microcode for the Linux FMan driver */
664 663 #if defined(CONFIG_SPIFLASH)
665 664 /*
include/configs/T102xRDB.h
... ... @@ -669,7 +669,6 @@
669 669  
670 670 #ifdef CONFIG_TARGET_T1024RDB
671 671 #define CONFIG_QE
672   -#define CONFIG_U_QE
673 672 #endif
674 673 /* Default address of microcode for the Linux FMan driver */
675 674 #if defined(CONFIG_SPIFLASH)
include/configs/T1040QDS.h
... ... @@ -549,7 +549,6 @@
549 549 #define CONFIG_SYS_DPAA_PME
550 550  
551 551 #define CONFIG_QE
552   -#define CONFIG_U_QE
553 552 /* Default address of microcode for the Linux Fman driver */
554 553 #if defined(CONFIG_SPIFLASH)
555 554 /*
include/configs/ls1021aqds.h
... ... @@ -107,7 +107,6 @@
107 107  
108 108 #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
109 109 !defined(CONFIG_QSPI_BOOT)
110   -#define CONFIG_U_QE
111 110 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
112 111 #endif
113 112  
include/configs/ls1021atwr.h
... ... @@ -106,7 +106,6 @@
106 106  
107 107 #if !defined(CONFIG_SD_BOOT) && !defined(CONFIG_NAND_BOOT) && \
108 108 !defined(CONFIG_QSPI_BOOT)
109   -#define CONFIG_U_QE
110 109 #define CONFIG_SYS_QE_FMAN_FW_IN_NOR
111 110 #endif
112 111  
include/configs/ls1043ardb.h
... ... @@ -268,13 +268,6 @@
268 268 #endif
269 269 #endif
270 270  
271   -/* QE */
272   -#ifndef SPL_NO_QE
273   -#if !defined(CONFIG_NAND_BOOT) && !defined(CONFIG_QSPI_BOOT)
274   -#define CONFIG_U_QE
275   -#endif
276   -#endif
277   -
278 271 /* SATA */
279 272 #ifndef SPL_NO_SATA
280 273 #ifndef CONFIG_CMD_EXT2
scripts/config_whitelist.txt
... ... @@ -4635,7 +4635,6 @@
4635 4635 CONFIG_UTBIPAR_INIT_TBIPA
4636 4636 CONFIG_U_BOOT_HDR_ADDR
4637 4637 CONFIG_U_BOOT_HDR_SIZE
4638   -CONFIG_U_QE
4639 4638 CONFIG_VAL
4640 4639 CONFIG_VAR_SIZE_SPL
4641 4640 CONFIG_VCT_NOR