summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTrevor Woerner <twoerner@gmail.com>2020-05-06 15:02:38 +0300
committerTom Rini <trini@konsulko.com>2020-05-15 21:47:35 +0300
commitb16a331697820d1f36ee8ccb793ae12eb501ad42 (patch)
tree6d4190d6c83916c2a4f5346ffdf0a794ff2618e3 /drivers
parent9bffc54996bc36c87efdd36a6b1345609e33d795 (diff)
downloadu-boot-b16a331697820d1f36ee8ccb793ae12eb501ad42.tar.xz
rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
Have this symbol follow the pattern of all other such symbols. This patch removes a TODO from the code. Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/mvsata_ide.c2
-rw-r--r--drivers/i2c/mvtwsi.c2
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/mvgbe.c2
-rw-r--r--drivers/usb/host/Kconfig2
-rw-r--r--drivers/usb/host/ehci-marvell.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c
index 38181235af..9ac16555d6 100644
--- a/drivers/ata/mvsata_ide.c
+++ b/drivers/ata/mvsata_ide.c
@@ -8,7 +8,7 @@
#include <common.h>
#include <asm/io.h>
-#if defined(CONFIG_ORION5X)
+#if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
#elif defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h>
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 382cf4b304..77fe35a42b 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
*/
#ifndef CONFIG_DM_I2C
-#if defined(CONFIG_ORION5X)
+#if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
#elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU))
#include <asm/arch/soc.h>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 38f2bd6637..4d6716fdb8 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -309,7 +309,7 @@ config FSLDMAFEC
config MVGBE
bool "Marvell Orion5x/Kirkwood network interface support"
- depends on KIRKWOOD || ORION5X
+ depends on KIRKWOOD || ARCH_ORION5X
select PHYLIB if DM_ETH
help
This driver supports the network interface units in the
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 037e59ec6e..b0b8d349a8 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -26,7 +26,7 @@
#if defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h>
-#elif defined(CONFIG_ORION5X)
+#elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
#endif
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 2f381dc958..cc9646d40a 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -135,7 +135,7 @@ config USB_EHCI_ATMEL
config USB_EHCI_MARVELL
bool "Support for Marvell on-chip EHCI USB controller"
- depends on ARCH_MVEBU || KIRKWOOD || ORION5X
+ depends on ARCH_MVEBU || KIRKWOOD || ARCH_ORION5X
default y
---help---
Enables support for the on-chip EHCI controller on MVEBU SoCs.
diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c
index 8efe6b63b9..3b10cdfc58 100644
--- a/drivers/usb/host/ehci-marvell.c
+++ b/drivers/usb/host/ehci-marvell.c
@@ -15,7 +15,7 @@
#if defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h>
-#elif defined(CONFIG_ORION5X)
+#elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h>
#endif