diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-12 12:08:32 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-12 12:08:32 -0500 |
| commit | f3177d02f33472352b022adbaf5c47cceebc930d (patch) | |
| tree | 950c05fbb1414a3b975420b01131706ca51d23e3 /arch | |
| parent | 278b90ce786f73faf29aa522d5d101e1da006378 (diff) | |
| parent | ee3556bcafbb05e59aabdc31368984e76acaabc4 (diff) | |
| download | u-boot-f3177d02f33472352b022adbaf5c47cceebc930d.zip u-boot-f3177d02f33472352b022adbaf5c47cceebc930d.tar.gz u-boot-f3177d02f33472352b022adbaf5c47cceebc930d.tar.bz2 | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 14 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/config.h | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index cefbdfe..7b59dc9 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -3,6 +3,8 @@ config ARCH_LS1012A select ARMV8_SET_SMPEN select ARM_ERRATA_855873 select FSL_LSCH2 + select SYS_FSL_SRDS_1 + select SYS_HAS_SERDES select SYS_FSL_DDR_BE select SYS_FSL_MMDC select SYS_FSL_ERRATUM_A010315 @@ -19,6 +21,8 @@ config ARCH_LS1043A select ARMV8_SET_SMPEN select ARM_ERRATA_855873 select FSL_LSCH2 + select SYS_FSL_SRDS_1 + select SYS_HAS_SERDES select SYS_FSL_DDR select SYS_FSL_DDR_BE select SYS_FSL_DDR_VER_50 @@ -45,6 +49,8 @@ config ARCH_LS1046A bool select ARMV8_SET_SMPEN select FSL_LSCH2 + select SYS_FSL_SRDS_1 + select SYS_HAS_SERDES select SYS_FSL_DDR select SYS_FSL_DDR_BE select SYS_FSL_DDR_VER_50 @@ -72,6 +78,8 @@ config ARCH_LS1088A select ARMV8_SET_SMPEN select ARM_ERRATA_855873 select FSL_LSCH3 + select SYS_FSL_SRDS_1 + select SYS_HAS_SERDES select SYS_FSL_DDR select SYS_FSL_DDR_LE select SYS_FSL_DDR_VER_50 @@ -105,6 +113,8 @@ config ARCH_LS2080A select ARM_ERRATA_829520 select ARM_ERRATA_833471 select FSL_LSCH3 + select SYS_FSL_SRDS_1 + select SYS_HAS_SERDES select SYS_FSL_DDR select SYS_FSL_DDR_LE select SYS_FSL_DDR_VER_50 @@ -142,13 +152,9 @@ config FSL_LSCH2 select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_5 select SYS_FSL_SEC_BE - select SYS_FSL_SRDS_1 - select SYS_HAS_SERDES config FSL_LSCH3 bool - select SYS_FSL_SRDS_1 - select SYS_HAS_SERDES config FSL_MC_ENET bool "Management Complex network" diff --git a/arch/powerpc/include/asm/config.h b/arch/powerpc/include/asm/config.h index 67e4b48..39eeb39 100644 --- a/arch/powerpc/include/asm/config.h +++ b/arch/powerpc/include/asm/config.h @@ -70,11 +70,9 @@ #endif /* The TSEC driver uses the PHYLIB infrastructure */ -#ifndef CONFIG_PHYLIB -#if defined(CONFIG_TSEC_ENET) +#if defined(CONFIG_TSEC_ENET) && defined(CONFIG_PHYLIB) #include <config_phylib_all_drivers.h> #endif /* TSEC_ENET */ -#endif /* !CONFIG_PHYLIB */ /* The FMAN driver uses the PHYLIB infrastructure */ |