Commit 9dd0b194 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Nicolas Pitre
Browse files

Orion: orion -> orion5x rename 



Do a global s/orion/orion5x/ of the Orion 5x-specific bits (i.e.
not the plat-orion bits.)

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
Reviewed-by: default avatarTzachi Perelstein <tzachi@marvell.com>
Acked-by: default avatarSaeed Bishara <saeed@marvell.com>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
parent 159ffb3a

arch/arm/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ config ARCH_MXC 
	help

	  Support for Freescale MXC/iMX-based family of processors



config ARCH_ORION

config ARCH_ORION5X

	bool "Marvell Orion"

	depends on MMU

	select PCI
@@ -386,7 +386,8 @@ config ARCH_ORION 
	select GENERIC_CLOCKEVENTS

	select PLAT_ORION

	help

	  Support for Marvell Orion System on Chip family.

	  Support for the following Marvell Orion 5x series SoCs:

	  Orion-1 (5181), Orion-NAS (5182), Orion-2 (5281.)



config ARCH_PNX4008

	bool "Philips Nexperia PNX4008 Mobile"
@@ -517,7 +518,7 @@ source "arch/arm/mach-omap1/Kconfig" 


source "arch/arm/mach-omap2/Kconfig"



source "arch/arm/mach-orion/Kconfig"

source "arch/arm/mach-orion5x/Kconfig"



source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s3c/Kconfig"

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ endif 
 machine-$(CONFIG_ARCH_KS8695)     := ks8695

  incdir-$(CONFIG_ARCH_MXC)	   := mxc

 machine-$(CONFIG_ARCH_MX3)	   := mx3

 machine-$(CONFIG_ARCH_ORION)	   := orion

 machine-$(CONFIG_ARCH_ORION5X)	   := orion5x

 machine-$(CONFIG_ARCH_MSM7X00A)   := msm



ifeq ($(CONFIG_ARCH_EBSA110),y)

arch/arm/configs/orion_defconfig→arch/arm/configs/orion5x_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ CONFIG_CLASSIC_RCU=y 
# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_MXC is not set

CONFIG_ARCH_ORION=y

CONFIG_ARCH_ORION5X=y

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set

arch/arm/mach-orion/Kconfig→arch/arm/mach-orion5x/Kconfig

+1 −1
Original line number Diff line number Diff line 
if ARCH_ORION

if ARCH_ORION5X



menu "Orion Implementations"

CRA Git | Maintained and supported by SUSTech CRA and CCSE