random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 20:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename symbol: CONFIG_ORION5X -> CONFIG_ARCH_ORION5X

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

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

3
arch/arm/Makefile
View File

@ -67,8 +67,7 @@ machine-$(CONFIG_ARCH_MEDIATEK) += mediatek
machine-$(CONFIG_ARCH_MESON) += meson machine-$(CONFIG_ARCH_MESON) += meson
machine-$(CONFIG_ARCH_MVEBU) += mvebu machine-$(CONFIG_ARCH_MVEBU) += mvebu
machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
# TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ARCH_ORION5X) += orion5x
machine-$(CONFIG_ORION5X) += orion5x
machine-$(CONFIG_ARCH_OWL) += owl machine-$(CONFIG_ARCH_OWL) += owl
machine-$(CONFIG_ARCH_RMOBILE) += rmobile machine-$(CONFIG_ARCH_RMOBILE) += rmobile
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip

2
arch/arm/mach-orion5x/Kconfig
View File

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

2
configs/edminiv2_defconfig
View File

@ -1,6 +1,6 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_CPU_INIT=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_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds"
CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SYS_TEXT_BASE=0x00800000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y

2
drivers/ata/mvsata_ide.c
View File

@ -8,7 +8,7 @@
#include <common.h> #include <common.h>
#include <asm/io.h> #include <asm/io.h>
#if defined(CONFIG_ORION5X) #if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h> #include <asm/arch/orion5x.h>
#elif defined(CONFIG_KIRKWOOD) #elif defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h> #include <asm/arch/soc.h>

2
drivers/i2c/mvtwsi.c
View File

@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
*/ */
#ifndef CONFIG_DM_I2C #ifndef CONFIG_DM_I2C
#if defined(CONFIG_ORION5X) #if defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h> #include <asm/arch/orion5x.h>
#elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU)) #elif (defined(CONFIG_KIRKWOOD) || defined(CONFIG_ARCH_MVEBU))
#include <asm/arch/soc.h> #include <asm/arch/soc.h>

2
drivers/net/Kconfig
View File

@ -309,7 +309,7 @@ config FSLDMAFEC
config MVGBE config MVGBE
bool "Marvell Orion5x/Kirkwood network interface support" bool "Marvell Orion5x/Kirkwood network interface support"
depends on KIRKWOOD || ORION5X depends on KIRKWOOD || ARCH_ORION5X
select PHYLIB if DM_ETH select PHYLIB if DM_ETH
help help
This driver supports the network interface units in the This driver supports the network interface units in the

2
drivers/net/mvgbe.c
View File

@ -26,7 +26,7 @@
#if defined(CONFIG_KIRKWOOD) #if defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#elif defined(CONFIG_ORION5X) #elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h> #include <asm/arch/orion5x.h>
#endif #endif

2
drivers/usb/host/Kconfig
View File

@ -135,7 +135,7 @@ config USB_EHCI_ATMEL
config USB_EHCI_MARVELL config USB_EHCI_MARVELL
bool "Support for Marvell on-chip EHCI USB controller" bool "Support for Marvell on-chip EHCI USB controller"
depends on ARCH_MVEBU || KIRKWOOD || ORION5X depends on ARCH_MVEBU || KIRKWOOD || ARCH_ORION5X
default y default y
---help--- ---help---
Enables support for the on-chip EHCI controller on MVEBU SoCs. Enables support for the on-chip EHCI controller on MVEBU SoCs.

2
drivers/usb/host/ehci-marvell.c
View File

@ -15,7 +15,7 @@
#if defined(CONFIG_KIRKWOOD) #if defined(CONFIG_KIRKWOOD)
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#elif defined(CONFIG_ORION5X) #elif defined(CONFIG_ARCH_ORION5X)
#include <asm/arch/orion5x.h> #include <asm/arch/orion5x.h>
#endif #endif