ARM: rename STM arch to mxs
We never supported the sigmatel stm chips and probably never will. So do the first step and rename the architecture to mxs just like in the kernel. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
ca2cae2b1a
commit
e88d86a445
|
@ -39,8 +39,8 @@ config ARCH_IMX
|
|||
bool "Freescale iMX-based"
|
||||
select GENERIC_GPIO
|
||||
|
||||
config ARCH_STM
|
||||
bool "SigmaTel/FSL iMX-based"
|
||||
config ARCH_MXS
|
||||
bool "Freescale i.MX23/28 (mxs) based"
|
||||
select GENERIC_GPIO
|
||||
|
||||
config ARCH_NETX
|
||||
|
@ -71,7 +71,7 @@ source arch/arm/cpu/Kconfig
|
|||
source arch/arm/mach-at91/Kconfig
|
||||
source arch/arm/mach-ep93xx/Kconfig
|
||||
source arch/arm/mach-imx/Kconfig
|
||||
source arch/arm/mach-stm/Kconfig
|
||||
source arch/arm/mach-mxs/Kconfig
|
||||
source arch/arm/mach-netx/Kconfig
|
||||
source arch/arm/mach-nomadik/Kconfig
|
||||
source arch/arm/mach-omap/Kconfig
|
||||
|
|
|
@ -42,7 +42,7 @@ AFLAGS += -include asm/unified.h
|
|||
machine-$(CONFIG_ARCH_AT91) := at91
|
||||
machine-$(CONFIG_ARCH_EP93XX) := ep93xx
|
||||
machine-$(CONFIG_ARCH_IMX) := imx
|
||||
machine-$(CONFIG_ARCH_STM) := stm
|
||||
machine-$(CONFIG_ARCH_MXS) := mxs
|
||||
machine-$(CONFIG_ARCH_NOMADIK) := nomadik
|
||||
machine-$(CONFIG_ARCH_NETX) := netx
|
||||
machine-$(CONFIG_ARCH_OMAP) := omap
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
CONFIG_ARCH_STM=y
|
||||
CONFIG_ARCH_MXS=y
|
||||
CONFIG_MACH_CHUMBY=y
|
||||
CONFIG_AEABI=y
|
||||
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
CONFIG_ARCH_STM=y
|
||||
CONFIG_ARCH_MXS=y
|
||||
CONFIG_AEABI=y
|
||||
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
|
||||
CONFIG_BROKEN=y
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
CONFIG_ARCH_STM=y
|
||||
CONFIG_ARCH_MXS=y
|
||||
CONFIG_ARCH_IMX28=y
|
||||
CONFIG_AEABI=y
|
||||
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
if ARCH_STM
|
||||
if ARCH_MXS
|
||||
|
||||
config ARCH_TEXT_BASE
|
||||
hex
|
||||
|
@ -11,7 +11,7 @@ config BOARDINFO
|
|||
default "Chumby Falconwing" if MACH_CHUMBY
|
||||
default "Karo TX28" if MACH_TX28
|
||||
|
||||
comment "SigmaTel/Freescale i.MX System-on-Chip"
|
||||
comment "Freescale i.MX System-on-Chip"
|
||||
|
||||
choice
|
||||
prompt "Freescale i.MX Processor"
|
|
@ -29,7 +29,7 @@ comment "--- MCI host drivers ---"
|
|||
|
||||
config MCI_STM378X
|
||||
bool "i.MX23/i.MX28"
|
||||
depends on ARCH_STM
|
||||
depends on ARCH_MXS
|
||||
help
|
||||
Enable this entry to add support to read and write SD cards on a
|
||||
i.MX23/i.MX28 based system.
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <mach/imx-regs.h>
|
||||
#include <clock.h>
|
||||
#include <mach/clock.h>
|
||||
#ifndef CONFIG_ARCH_STM
|
||||
#ifndef CONFIG_ARCH_MXS
|
||||
# include <mach/iim.h>
|
||||
#endif
|
||||
#include <xfuncs.h>
|
||||
|
@ -269,7 +269,7 @@ static void fec_rbd_clean(int last, struct buffer_descriptor __iomem *pRbd)
|
|||
|
||||
static int fec_get_hwaddr(struct eth_device *dev, unsigned char *mac)
|
||||
{
|
||||
#ifdef CONFIG_ARCH_STM
|
||||
#ifdef CONFIG_ARCH_MXS
|
||||
return -1;
|
||||
#else
|
||||
return imx_iim_get_mac(mac);
|
||||
|
|
|
@ -19,7 +19,7 @@ config DRIVER_SERIAL_IMX
|
|||
bool "i.MX serial driver"
|
||||
|
||||
config DRIVER_SERIAL_STM378X
|
||||
depends on ARCH_STM
|
||||
depends on ARCH_MXS
|
||||
default y
|
||||
bool "i.MX23/i.MX28 serial driver"
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ config DRIVER_VIDEO_IMX_IPU
|
|||
|
||||
config DRIVER_VIDEO_STM
|
||||
bool "i.MX23/28 framebuffer driver"
|
||||
depends on ARCH_STM
|
||||
depends on ARCH_MXS
|
||||
help
|
||||
Say 'Y' here to enable framebuffer and splash screen support for
|
||||
i.MX23 and i.MX28 based systems.
|
||||
|
|
Loading…
Reference in New Issue