ARM: imx5: drop option MACH_IMX51_DT

Since i.MX51 becomes DT only now, we can drop option MACH_IMX51_DT and
just use SOC_IMX51 instead.  While at it, rename imx51-dt.c to
mach-imx51.c to align with the name schema of other IMX DT only
platforms.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
This commit is contained in:
Shawn Guo 2014-05-19 13:47:43 +08:00
parent 50e177cae2
commit 1ecdde9d6f
5 changed files with 6 additions and 10 deletions

View File

@ -31,7 +31,7 @@ CONFIG_MACH_IMX35_DT=y
CONFIG_MACH_PCM043=y
CONFIG_MACH_MX35_3DS=y
CONFIG_MACH_VPR200=y
CONFIG_MACH_IMX51_DT=y
CONFIG_SOC_IMX51=y
CONFIG_SOC_IMX50=y
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y

View File

@ -27,7 +27,7 @@ CONFIG_ARCH_HIGHBANK=y
CONFIG_ARCH_HI3xxx=y
CONFIG_ARCH_KEYSTONE=y
CONFIG_ARCH_MXC=y
CONFIG_MACH_IMX51_DT=y
CONFIG_SOC_IMX51=y
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
CONFIG_SOC_IMX6SL=y

View File

@ -694,11 +694,6 @@ config SOC_IMX5
select HAVE_IMX_SRC
select MXC_TZIC
config SOC_IMX51
bool
select PINCTRL_IMX51
select SOC_IMX5
config SOC_IMX50
bool "i.MX50 support"
select PINCTRL_IMX50
@ -707,9 +702,10 @@ config SOC_IMX50
help
This enables support for Freescale i.MX50 processor.
config MACH_IMX51_DT
config SOC_IMX51
bool "i.MX51 support"
select SOC_IMX51
select PINCTRL_IMX51
select SOC_IMX5
help
This enables support for Freescale i.MX51 processor

View File

@ -109,8 +109,8 @@ obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
endif
obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o
obj-$(CONFIG_SOC_IMX50) += mach-imx50.o
obj-$(CONFIG_SOC_IMX51) += mach-imx51.o
obj-$(CONFIG_SOC_IMX53) += mach-imx53.o
obj-$(CONFIG_SOC_VF610) += clk-vf610.o mach-vf610.o