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>
This commit is contained in:
Trevor Woerner 2020-05-06 08:02:38 -04:00 committed by Tom Rini
parent 9bffc54996
commit b16a331697
10 changed files with 10 additions and 11 deletions

View File

@ -576,7 +576,7 @@ config TARGET_APF27
select CPU_ARM926EJS
select SUPPORT_SPL
config ORION5X
config ARCH_ORION5X
bool "Marvell Orion"
select CPU_ARM926EJS

View File

@ -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

View File

@ -1,4 +1,4 @@
if ORION5X
if ARCH_ORION5X
choice
prompt "Marvell Orion board select"

View File

@ -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

View File

@ -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>

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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.

View File

@ -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