Commit 442279da authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx53: support device tree boot only 



With device tree kernel provides the equal support as those imx53 board
files, it's time to remove the board files and get imx53 support device
tree only.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 721a4414

arch/arm/configs/imx_v6_v7_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ CONFIG_MACH_VPR200=y 
CONFIG_MACH_IMX51_DT=y

CONFIG_MACH_MX51_3DS=y

CONFIG_MACH_EUKREA_CPUIMX51SD=y

CONFIG_MACH_IMX53_DT=y

CONFIG_SOC_IMX53=y

CONFIG_SOC_IMX6Q=y

CONFIG_MXC_PWM=y

CONFIG_SMP=y

arch/arm/mach-imx/Kconfig

+10 −69
Original line number Diff line number Diff line
@@ -102,15 +102,6 @@ config SOC_IMX51 
	select ARCH_MX5

	select ARCH_MX51



config	SOC_IMX53

	bool

	select SOC_IMX5

	select ARCH_MX5

	select ARCH_MX53

	select HAVE_CAN_FLEXCAN if CAN

	select PINCTRL

	select PINCTRL_IMX53



if ARCH_IMX_V4_V5



comment "MX1 platforms:"
@@ -738,69 +729,19 @@ config MACH_EUKREA_MBIMXSD51_BASEBOARD 


endchoice



comment "i.MX53 machines:"



config MACH_IMX53_DT

	bool "Support i.MX53 platforms from device tree"

	select SOC_IMX53

	select MACH_MX53_ARD

	select MACH_MX53_EVK

	select MACH_MX53_LOCO

	select MACH_MX53_SMD

	help

	  Include support for Freescale i.MX53 based platforms

	  using the device tree for discovery



config MACH_MX53_EVK

	bool "Support MX53 EVK platforms"

	select SOC_IMX53

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	select LEDS_GPIO_REGISTER

	help

	  Include support for MX53 EVK platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_MX53_SMD

	bool "Support MX53 SMD platforms"

	select SOC_IMX53

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	help

	  Include support for MX53 SMD platform. This includes specific

	  configurations for the board and its peripherals.

comment "Device tree only"



config MACH_MX53_LOCO

	bool "Support MX53 LOCO platforms"

	select SOC_IMX53

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	select LEDS_GPIO_REGISTER

	help

	  Include support for MX53 LOCO platform. This includes specific

	  configurations for the board and its peripherals.

config	SOC_IMX53

	bool "i.MX53 support"

	select SOC_IMX5

	select ARCH_MX5

	select ARCH_MX53

	select HAVE_CAN_FLEXCAN if CAN

	select PINCTRL

	select PINCTRL_IMX53



config MACH_MX53_ARD

	bool "Support MX53 ARD platforms"

	select SOC_IMX53

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_GPIO_KEYS

	help

	  Include support for MX53 ARD platform. This includes specific

	  configurations for the board and its peripherals.



comment "i.MX6 family:"

	  This enables support for Freescale i.MX53 processor.



config SOC_IMX6Q

	bool "i.MX6 Quad support"

arch/arm/mach-imx/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -83,13 +83,9 @@ endif 
# i.MX5 based machines

obj-$(CONFIG_MACH_MX51_BABBAGE) += mach-mx51_babbage.o

obj-$(CONFIG_MACH_MX51_3DS) += mach-mx51_3ds.o

obj-$(CONFIG_MACH_MX53_EVK) += mach-mx53_evk.o

obj-$(CONFIG_MACH_MX53_SMD) += mach-mx53_smd.o

obj-$(CONFIG_MACH_MX53_LOCO) += mach-mx53_loco.o

obj-$(CONFIG_MACH_MX53_ARD) += mach-mx53_ard.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX51SD) += mach-cpuimx51sd.o

obj-$(CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD) += eukrea_mbimxsd51-baseboard.o

obj-$(CONFIG_MACH_MX50_RDP) += mach-mx50_rdp.o



obj-$(CONFIG_MACH_IMX51_DT) += imx51-dt.o

obj-$(CONFIG_MACH_IMX53_DT) += imx53-dt.o
 
obj-$(CONFIG_SOC_IMX53) += mach-imx53.o

arch/arm/mach-imx/Makefile.boot

+6 −2
Original line number Diff line number Diff line
@@ -39,8 +39,12 @@ params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100 
initrd_phys-$(CONFIG_SOC_IMX6Q)	:= 0x10800000



dtb-$(CONFIG_MACH_IMX51_DT) += imx51-babbage.dtb

dtb-$(CONFIG_MACH_IMX53_DT) += imx53-ard.dtb imx53-evk.dtb \

			       imx53-qsb.dtb imx53-smd.dtb



dtb-$(CONFIG_SOC_IMX53) += imx53-ard.dtb \

			   imx53-evk.dtb \

			   imx53-qsb.dtb \

			   imx53-smd.dtb \



dtb-$(CONFIG_SOC_IMX6Q)	+= imx6q-arm2.dtb \

			   imx6q-sabrelite.dtb \

			   imx6q-sabresd.dtb \