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>
diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c
index 3818123..9ac1655 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 382cf4b..77fe35a 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -25,7 +25,7 @@
*/
#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 38f2bd6..4d6716f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -309,7 +309,7 @@
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 037e59e..b0b8d34 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 2f381dc..cc9646d 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -135,7 +135,7 @@
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 8efe6b6..3b10cdf 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