Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11b05d60 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: mx25: Convert to a dt-only platform 



As there is no more mx25 board files, we can turn mx25 into a dt-only platform.

Rename imx25-dt.c to mach-imx25.c to be consistent with the other i.MX SoCs.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 3877942b

arch/arm/configs/imx_v4_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ CONFIG_MACH_APF9328=y 
CONFIG_MACH_MX21ADS=y

CONFIG_MACH_MX25_3DS=y

CONFIG_MACH_EUKREA_CPUIMX25SD=y

CONFIG_MACH_IMX25_DT=y

CONFIG_SOC_IMX25=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

arch/arm/configs/multi_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ CONFIG_ARCH_MVEBU=y 
CONFIG_MACH_KIRKWOOD=y

CONFIG_MACH_NETXBIG=y

CONFIG_ARCH_MXC=y

CONFIG_MACH_IMX25_DT=y

CONFIG_SOC_IMX25=y

CONFIG_MACH_IMX27_DT=y

CONFIG_ARCH_U300=y

CONFIG_PCI_MVEBU=y

arch/arm/mach-imx/Kconfig

+14 −14
Original line number Diff line number Diff line
@@ -77,13 +77,6 @@ config SOC_IMX21 
	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC



config SOC_IMX25

	bool

	select ARCH_MXC_IOMUX_V3

	select CPU_ARM926T

	select MXC_AVIC

	select PINCTRL_IMX25



config SOC_IMX27

	bool

	select CPU_ARM926T
@@ -149,13 +142,6 @@ config MACH_MX21ADS 
	  Include support for MX21ADS platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_IMX25_DT

	bool "Support i.MX25 platforms from device tree"

	select SOC_IMX25

	help

	  Include support for Freescale i.MX25 based platforms

	  using the device tree for discovery



comment "MX27 platforms:"



config MACH_MX27ADS
@@ -508,6 +494,20 @@ config MACH_VPR200 


endif



if ARCH_MULTI_V5



comment "Device tree only"



config SOC_IMX25

	bool "i.MX25 support"

	select ARCH_MXC_IOMUX_V3

	select CPU_ARM926T

	select MXC_AVIC

	select PINCTRL_IMX25

	help

	  This enables support for Freescale i.MX25 processor

endif



if ARCH_MULTI_V7



comment "Device tree only"

arch/arm/mach-imx/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-y := time.o cpu.o system.o irq-common.o 
obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o

obj-$(CONFIG_SOC_IMX21) += clk-imx21.o mm-imx21.o



obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o

obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o mach-imx25.o



obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o

obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o
@@ -48,9 +48,6 @@ obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o 
# i.MX21 based machines

obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o



# i.MX25 based machines

obj-$(CONFIG_MACH_IMX25_DT) += imx25-dt.o



# i.MX27 based machines

obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o

obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o