arm: Finish migration of HAS_FSL_XHCI_USB

This symbol was largely migrated, except for one case.  Update it.

Cc: Priyanka Jain <priyanka.jain@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
index 9c58f69dbd0dd5a9d62d6986a12e309b66a5019d..9cef363fbaabd3e7fb7651313ace7f73c72fa6cd 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
+++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig
@@ -58,6 +58,7 @@ config ARCH_LS1043A
        select ARM_ERRATA_855873 if !TFABOOT
        select FSL_LAYERSCAPE
        select FSL_LSCH2
+       select HAS_FSL_XHCI_USB if USB_HOST
        select SYS_FSL_SRDS_1
        select SYS_HAS_SERDES
        select SYS_FSL_DDR
@@ -89,6 +90,7 @@ config ARCH_LS1046A
        select ARMV8_SET_SMPEN
        select FSL_LAYERSCAPE
        select FSL_LSCH2
+       select HAS_FSL_XHCI_USB if USB_HOST
        select SYS_FSL_SRDS_1
        select SYS_HAS_SERDES
        select SYS_FSL_DDR
@@ -245,6 +247,7 @@ config ARCH_LX2160A
        bool
        select ARMV8_SET_SMPEN
        select FSL_LSCH3
+       select HAS_FSL_XHCI_USB if USB_HOST
        select NXP_LSCH3_2
        select SYS_HAS_SERDES
        select SYS_FSL_SRDS_1
@@ -642,9 +645,8 @@ config SPL_LDSCRIPT
 
 config HAS_FSL_XHCI_USB
        bool
-       default y if ARCH_LS1043A || ARCH_LS1046A
        help
-         For some SoC(such as LS1043A and LS1046A), USB and QE-HDLC multiplex use
+         For some SoC (such as LS1043A and LS1046A), USB and QE-HDLC multiplex use
          pins, select it when the pins are assigned to USB.
 
 config SYS_FSL_BOOTROM_BASE

diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h
index 1338ee3cda3b9d008fa443333d6b05d0001a3a72..8977ee9de23a8be37107db06f4de0eab623906bd 100644 (file)
--- a/include/configs/lx2160a_common.h
+++ b/include/configs/lx2160a_common.h
@@ -143,7 +143,6 @@
 
 /* USB */
 #ifdef CONFIG_USB_HOST
-#define CONFIG_HAS_FSL_XHCI_USB
 #ifndef CONFIG_TARGET_LX2162AQDS
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif