diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-10 08:05:57 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-10 08:05:57 -0500 |
| commit | 084edbb6892b3712e2f9fd3abd5871652492fc42 (patch) | |
| tree | 1f26fd21cc86177d6ba76cb88ca60c1772d8c5f9 /drivers | |
| parent | ec75fab302a8b2ddf291cc1b7219b0333cea1a4d (diff) | |
| parent | 0a05bf42b462c0fd0299c768560c5ad532cdf619 (diff) | |
| download | u-boot-084edbb6892b3712e2f9fd3abd5871652492fc42.zip u-boot-084edbb6892b3712e2f9fd3abd5871652492fc42.tar.gz u-boot-084edbb6892b3712e2f9fd3abd5871652492fc42.tar.bz2 | |
Merge git://git.denx.de/u-boot-marvell
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/pinctrl/mvebu/Kconfig | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index d42d915..ee1cc3a 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -160,12 +160,12 @@ config FTMAC100 This MAC is present in Andestech SoCs. config MVNETA - bool "Marvell Armada 385 network interface support" - depends on ARMADA_XP || ARMADA_38X + bool "Marvell Armada XP/385/3700 network interface support" + depends on ARMADA_XP || ARMADA_38X || ARMADA_3700 select PHYLIB help This driver supports the network interface units in the - Marvell ARMADA XP and 38X SoCs + Marvell ARMADA XP, ARMADA 38X and ARMADA 3700 SoCs config MVPP2 bool "Marvell Armada 375/7K/8K network interface support" diff --git a/drivers/pinctrl/mvebu/Kconfig b/drivers/pinctrl/mvebu/Kconfig index a9388ff..07d4f3e 100644 --- a/drivers/pinctrl/mvebu/Kconfig +++ b/drivers/pinctrl/mvebu/Kconfig @@ -1,14 +1,14 @@ if ARCH_MVEBU config PINCTRL_ARMADA_37XX - depends on ARMADA_3700 + depends on ARMADA_3700 && PINCTRL_FULL bool "Armada 37xx pin control driver" help Support pin multiplexing and pin configuration control on Marvell's Armada-37xx SoC. config PINCTRL_ARMADA_8K - depends on ARMADA_8K + depends on ARMADA_8K && PINCTRL_FULL bool "Armada 7k/8k pin control driver" help Support pin multiplexing and pin configuration control on |