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/arch/arm/Kconfig b/arch/arm/Kconfig
index bd802b3be938071b760b11c3c50fd4b18f481ca5..586464620c79c53d3e729830296ee2b7bc7d5442 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -576,7 +576,7 @@ config TARGET_APF27
        select CPU_ARM926EJS
        select SUPPORT_SPL
 
-config ORION5X
+config ARCH_ORION5X
        bool "Marvell Orion"
        select CPU_ARM926EJS
 

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5d32dec29cc2932035717a9ceae11034c6fcfc34..2b44ffb4936baf79a61e1ea974e4abe234cd93d8 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -67,8 +67,7 @@ machine-$(CONFIG_ARCH_MEDIATEK)               += mediatek
 machine-$(CONFIG_ARCH_MESON)           += meson
 machine-$(CONFIG_ARCH_MVEBU)           += mvebu
 machine-$(CONFIG_ARCH_OMAP2PLUS)       += omap2
-# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X
-machine-$(CONFIG_ORION5X)              += orion5x
+machine-$(CONFIG_ARCH_ORION5X)         += orion5x
 machine-$(CONFIG_ARCH_OWL)             += owl
 machine-$(CONFIG_ARCH_RMOBILE)         += rmobile
 machine-$(CONFIG_ARCH_ROCKCHIP)                += rockchip

diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig
index 7644b8dc854b3ac5086bfc7cce41c8f95b6528ca..5baa6fb935ae4260f2daee452a938e3352596a6e 100644 (file)
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -1,4 +1,4 @@
-if ORION5X
+if ARCH_ORION5X
 
 choice
        prompt "Marvell Orion board select"

diff --git a/configs/edminiv2_defconfig b/configs/edminiv2_defconfig
index b9a68a9263aa53398f3383b7953bf6155ff85aa6..d06f83db04d129c377a8b1fa7843c092aa14f06c 100644 (file)
--- a/configs/edminiv2_defconfig
+++ b/configs/edminiv2_defconfig
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
-CONFIG_ORION5X=y
+CONFIG_ARCH_ORION5X=y
 CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y

diff --git a/drivers/ata/mvsata_ide.c b/drivers/ata/mvsata_ide.c
index 38181235afa6625867385ad92e00cdfccb8dd03d..9ac16555d6cde1169cbabb4829236f0af88ba66f 100644 (file)
--- 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 382cf4b30413a3379e454c83c71bc47d94560d3c..77fe35a42bd762468f0ee47473f4fea4c5e58ee3 100644 (file)
--- 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 38f2bd6637decc0e7e178dc1d14c57509a1cbe16..4d6716fdb80b850ee731e6c87a1b01688017fa9a 100644 (file)
--- 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 037e59ec6e3ccdfd3169de17ccb4d56e889525ba..b0b8d349a8d61b6a053fd3519256c4738efdedd0 100644 (file)
--- 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 2f381dc9580c37794d86efeddca63e6dc2eac18d..cc9646d40aa5b9116debfddebf35e4fd5dced0c6 100644 (file)
--- 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 8efe6b63b9766b30128b0cbfa8885d6570f2d28d..3b10cdfc58ba2645db89a27061ea203ab95c8de8 100644 (file)
--- 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