Commit 879c0e5e authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: imx: Remove i.MX27 board files 



i.MX27 has basic device tree support.

To achieve the goal of converting all i.MX SoCs to a
devicetree-only platform, remove imx27 board files.

Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 4b563a06

arch/arm/configs/imx_v4_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ CONFIG_MACH_MX27ADS=y 
CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_PCA100=y

CONFIG_MACH_IMX27_DT=y

CONFIG_SOC_IMX1=y

CONFIG_SOC_IMX25=y

CONFIG_SOC_IMX27=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

arch/arm/configs/multi_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ CONFIG_MACH_MX27ADS=y 
CONFIG_MACH_MX27_3DS=y

CONFIG_MACH_IMX27_VISSTRIM_M10=y

CONFIG_MACH_PCA100=y

CONFIG_MACH_IMX27_DT=y

CONFIG_SOC_IMX25=y

CONFIG_SOC_IMX27=y

CONFIG_ARCH_MVEBU=y

CONFIG_MACH_KIRKWOOD=y

CONFIG_ARCH_ORION5X=y

arch/arm/mach-imx/Kconfig

+10 −91
Original line number Diff line number Diff line
@@ -53,13 +53,6 @@ config IMX_HAVE_IOMUX_V1 
config ARCH_MXC_IOMUX_V3

	bool



config SOC_IMX27

	bool

	select CPU_ARM926T

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC

	select PINCTRL_IMX27



config SOC_IMX31

	bool

	select CPU_V6
@@ -71,88 +64,6 @@ config SOC_IMX35 
	select MXC_AVIC

	select PINCTRL_IMX35



if ARCH_MULTI_V5



comment "MX27 platforms:"



config MACH_MX27ADS

	bool "MX27ADS platform"

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select SOC_IMX27

	help

	  Include support for MX27ADS platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_MX27_3DS

	bool "MX27PDK platform"

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MX2_CAMERA

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_DEBUG_BOARD

	select USB_ULPI_VIEWPORT if USB_ULPI

	select SOC_IMX27

	help

	  Include support for MX27PDK platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_IMX27_VISSTRIM_M10

	bool "Vista Silicon i.MX27 Visstrim_m10"

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MX2_CAMERA

	select IMX_HAVE_PLATFORM_MX2_EMMA

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select LEDS_GPIO_REGISTER

	select SOC_IMX27

	help

	  Include support for Visstrim_m10 platform and its different variants.

	  This includes specific configurations for the board and its

	  peripherals.



config MACH_PCA100

	bool "Phytec phyCARD-s (pca100)"

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_MXC_W1

	select IMX_HAVE_PLATFORM_SPI_IMX

	select USB_ULPI_VIEWPORT if USB_ULPI

	select SOC_IMX27

	help

	  Include support for phyCARD-s (aka pca100) platform. This

	  includes specific configurations for the module and its peripherals.



config MACH_IMX27_DT

	bool "Support i.MX27 platforms from device tree"

	select SOC_IMX27

	help

	  Include support for Freescale i.MX27 based platforms

	  using the device tree for discovery



endif



if ARCH_MULTI_V6



comment "MX31 platforms:"
@@ -391,8 +302,6 @@ config MACH_VPR200 


endif



comment "Device tree only"



if ARCH_MULTI_V4T



config SOC_IMX1
@@ -415,6 +324,16 @@ config SOC_IMX25 
	select PINCTRL_IMX25

	help

	  This enables support for Freescale i.MX25 processor



config SOC_IMX27

	bool "i.MX27 support"

	select IMX_HAVE_IOMUX_V1

	select CPU_ARM926T

	select MXC_AVIC

	select PINCTRL_IMX27

	help

	  This enables support for Freescale i.MX27 processor



endif



if ARCH_MULTI_V7

arch/arm/mach-imx/Makefile

+1 −8
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-y := cpu.o system.o irq-common.o 


obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o



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

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

obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o



obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o
@@ -35,13 +35,6 @@ obj-y += ssi-fiq.o 
obj-y += ssi-fiq-ksym.o

endif



# i.MX27 based machines

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

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

obj-$(CONFIG_MACH_IMX27_VISSTRIM_M10) += mach-imx27_visstrim_m10.o

obj-$(CONFIG_MACH_PCA100) += mach-pca100.o

obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o



# i.MX31 based machines

obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o

obj-$(CONFIG_MACH_MX31LILLY) += mach-mx31lilly.o mx31lilly-db.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE