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

Commit eaed435a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Consolidate i.MX 5 platforms to be under the new shared i.MX 3/5/6 tree.

* tag 'arm-soc-imx-move' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM i.MX: Update defconfig
  ARM i.MX: Merge i.MX5 support into mach-imx
  ARM i.MX5: remove unnecessary includes from board files

Fix up fairly trivial conflicts due to various changes nearby in
arch/arm/{mach,plat}-imx/{Kconfig,Makefile}

Pull request had been sent to the wrong email address, but happened
before the merge window closed.  I'm merging the MX 5 consolidation,
since it apparently will help the next development window and will avoid
conflicts later as per Arnd.
parents a99cbf6b 3f07f355

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ machine-$(CONFIG_ARCH_MSM) := msm 
machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0

machine-$(CONFIG_ARCH_IMX_V4_V5)	:= imx

machine-$(CONFIG_ARCH_IMX_V6_V7)	:= imx

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXS)		:= mxs

machine-$(CONFIG_ARCH_NETX)		:= netx

machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik

arch/arm/configs/mx5_defconfig→arch/arm/configs/imx_v6_v7_defconfig

+35 −26
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ CONFIG_EXPERIMENTAL=y 
CONFIG_KERNEL_LZO=y

CONFIG_SYSVIPC=y

CONFIG_LOG_BUF_SHIFT=18

CONFIG_CGROUPS=y

CONFIG_RELAY=y

CONFIG_EXPERT=y

# CONFIG_SLUB_DEBUG is not set
@@ -14,20 +15,31 @@ CONFIG_MODULE_SRCVERSION_ALL=y 
# CONFIG_LBDAF is not set

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MXC=y

CONFIG_ARCH_MX5=y

CONFIG_MACH_MX51_BABBAGE=y

CONFIG_MACH_MX31LILLY=y

CONFIG_MACH_MX31LITE=y

CONFIG_MACH_PCM037=y

CONFIG_MACH_PCM037_EET=y

CONFIG_MACH_MX31_3DS=y

CONFIG_MACH_MX31MOBOARD=y

CONFIG_MACH_QONG=y

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_KZM_ARM11_01=y

CONFIG_MACH_PCM043=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_EUKREA_CPUIMX35=y

CONFIG_MACH_VPR200=y

CONFIG_MACH_IMX51_DT=y

CONFIG_MACH_MX51_3DS=y

CONFIG_MACH_EUKREA_CPUIMX51=y

CONFIG_MACH_EUKREA_CPUIMX51SD=y

CONFIG_MACH_MX51_EFIKAMX=y

CONFIG_MACH_MX51_EFIKASB=y

CONFIG_MACH_MX53_EVK=y

CONFIG_MACH_MX53_SMD=y

CONFIG_MACH_MX53_LOCO=y

CONFIG_MACH_MX53_ARD=y

CONFIG_MACH_IMX53_DT=y

CONFIG_SOC_IMX6Q=y

CONFIG_MXC_PWM=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_VMSPLIT_2G=y

CONFIG_PREEMPT_VOLUNTARY=y

CONFIG_AEABI=y
@@ -49,7 +61,7 @@ CONFIG_IP_PNP_DHCP=y 
# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_IPV6=y

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -68,24 +80,20 @@ CONFIG_SCSI_SCAN_ASYNC=y 
CONFIG_ATA=y

CONFIG_PATA_IMX=y

CONFIG_NETDEVICES=y

CONFIG_MII=m

CONFIG_MARVELL_PHY=y

CONFIG_DAVICOM_PHY=y

CONFIG_QSEMI_PHY=y

CONFIG_LXT_PHY=y

CONFIG_CICADA_PHY=y

CONFIG_VITESSE_PHY=y

CONFIG_SMSC_PHY=y

CONFIG_BROADCOM_PHY=y

CONFIG_ICPLUS_PHY=y

CONFIG_REALTEK_PHY=y

CONFIG_NATIONAL_PHY=y

CONFIG_STE10XP=y

CONFIG_LSI_ET1011C_PHY=y

CONFIG_MICREL_PHY=y

CONFIG_NET_ETHERNET=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_FARADAY is not set

CONFIG_FEC=y

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set

# CONFIG_NET_VENDOR_MICREL is not set

# CONFIG_NET_VENDOR_MICROCHIP is not set

# CONFIG_NET_VENDOR_NATSEMI is not set

# CONFIG_NET_VENDOR_SEEQ is not set

CONFIG_SMC91X=y

CONFIG_SMC911X=y

CONFIG_SMSC911X=y

# CONFIG_NET_VENDOR_STMICRO is not set

# CONFIG_WLAN is not set

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_EVDEV=y
@@ -124,7 +132,6 @@ CONFIG_USB_EHCI_HCD=y 
CONFIG_USB_EHCI_MXC=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK=m

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_ESDHC_IMX=y
@@ -133,6 +140,8 @@ CONFIG_LEDS_CLASS=y 
CONFIG_RTC_CLASS=y

CONFIG_RTC_INTF_DEV_UIE_EMUL=y

CONFIG_RTC_MXC=y

CONFIG_DMADEVICES=y

CONFIG_IMX_SDMA=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y

arch/arm/configs/mx3_defconfig

deleted100644 → 0
+0 −144
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_EXPERT=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_ARCH_MXC=y

CONFIG_MACH_MX31ADS_WM1133_EV1=y

CONFIG_MACH_MX31LILLY=y

CONFIG_MACH_MX31LITE=y

CONFIG_MACH_PCM037=y

CONFIG_MACH_PCM037_EET=y

CONFIG_MACH_MX31_3DS=y

CONFIG_MACH_MX31MOBOARD=y

CONFIG_MACH_QONG=y

CONFIG_MACH_ARMADILLO5X0=y

CONFIG_MACH_KZM_ARM11_01=y

CONFIG_MACH_PCM043=y

CONFIG_MACH_MX35_3DS=y

CONFIG_MACH_EUKREA_CPUIMX35=y

CONFIG_MXC_IRQ_PRIOR=y

CONFIG_MXC_PWM=y

CONFIG_ARM_ERRATA_411920=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="noinitrd console=ttymxc0,115200 root=/dev/mtdblock2 rw ip=off"

CONFIG_VFP=y

CONFIG_PM_DEBUG=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_IPV6 is not set

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_FW_LOADER=m

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CHAR=y

CONFIG_MTD_BLOCK=y

CONFIG_MTD_CFI=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_UBI=y

# CONFIG_BLK_DEV is not set

CONFIG_MISC_DEVICES=y

CONFIG_EEPROM_AT24=y

CONFIG_NETDEVICES=y

CONFIG_SMSC_PHY=y

CONFIG_NET_ETHERNET=y

CONFIG_SMSC911X=y

CONFIG_DNET=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_INPUT_MOUSEDEV is not set

# CONFIG_KEYBOARD_ATKBD is not set

CONFIG_KEYBOARD_IMX=y

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_8250=m

CONFIG_SERIAL_8250_EXTENDED=y

CONFIG_SERIAL_8250_SHARE_IRQ=y

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_W1=y

CONFIG_W1_MASTER_MXC=y

CONFIG_W1_SLAVE_THERM=y

# CONFIG_HWMON is not set

CONFIG_WATCHDOG=y

CONFIG_IMX2_WDT=y

CONFIG_MFD_WM8350_I2C=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_WM8350=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_VIDEO_DEV=y

# CONFIG_RC_CORE is not set

# CONFIG_MEDIA_TUNER_CUSTOMISE is not set

CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_MT9M001=y

CONFIG_SOC_CAMERA_MT9M111=y

CONFIG_SOC_CAMERA_MT9T031=y

CONFIG_SOC_CAMERA_MT9V022=y

CONFIG_SOC_CAMERA_TW9910=y

CONFIG_SOC_CAMERA_OV772X=y

CONFIG_VIDEO_MX3=y

# CONFIG_RADIO_ADAPTERS is not set

CONFIG_FB=y

CONFIG_SOUND=y

CONFIG_SND=y

# CONFIG_SND_ARM is not set

# CONFIG_SND_SPI is not set

CONFIG_SND_SOC=y

CONFIG_SND_IMX_SOC=y

CONFIG_SND_MXC_SOC_WM1133_EV1=y

CONFIG_SND_SOC_PHYCORE_AC97=y

CONFIG_SND_SOC_EUKREA_TLV320=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_GADGET=m

CONFIG_USB_FSL_USB2=m

CONFIG_USB_G_SERIAL=m

CONFIG_USB_ULPI=y

CONFIG_MMC=y

CONFIG_MMC_MXC=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_MXC=y

CONFIG_DMADEVICES=y

# CONFIG_DNOTIFY is not set

CONFIG_TMPFS=y

CONFIG_JFFS2_FS=y

CONFIG_UBIFS_FS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

# CONFIG_ENABLE_WARN_DEPRECATED is not set

# CONFIG_ENABLE_MUST_CHECK is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

arch/arm/mach-imx/Kconfig

+239 −0
Original line number Diff line number Diff line
@@ -22,6 +22,18 @@ config ARCH_MX25 
config MACH_MX27

	bool



config ARCH_MX5

	bool



config ARCH_MX50

	bool



config ARCH_MX51

	bool



config ARCH_MX53

	bool



config SOC_IMX1

	bool

	select ARCH_MX1
@@ -73,6 +85,32 @@ config SOC_IMX35 
	select MXC_AVIC

	select SMP_ON_UP if SMP



config SOC_IMX5

	select CPU_V7

	select ARM_L1_CACHE_SHIFT_6

	select MXC_TZIC

	select ARCH_MXC_IOMUX_V3

	select ARCH_MXC_AUDMUX_V2

	select ARCH_HAS_CPUFREQ

	select ARCH_MX5

	bool



config SOC_IMX50

	bool

	select SOC_IMX5

	select ARCH_MX50



config	SOC_IMX51

	bool

	select SOC_IMX5

	select ARCH_MX5

	select ARCH_MX51



config	SOC_IMX53

	bool

	select SOC_IMX5

	select ARCH_MX5

	select ARCH_MX53



if ARCH_IMX_V4_V5
@@ -592,6 +630,207 @@ config MACH_VPR200 
	  Include support for VPR200 platform. This includes specific

	  configurations for the board and its peripherals.



comment "i.MX5 platforms:"



config MACH_MX50_RDP

	bool "Support MX50 reference design platform"

	depends on BROKEN

	select SOC_IMX50

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Include support for MX50 reference design platform (RDP) board. This

	  includes specific configurations for the board and its peripherals.



comment "i.MX51 machines:"



config MACH_IMX51_DT

	bool "Support i.MX51 platforms from device tree"

	select SOC_IMX51

	select USE_OF

	select MACH_MX51_BABBAGE

	help

	  Include support for Freescale i.MX51 based platforms

	  using the device tree for discovery



config MACH_MX51_BABBAGE

	bool "Support MX51 BABBAGE platforms"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Include support for MX51 Babbage platform, also known as MX51EVK in

	  u-boot. This includes specific configurations for the board and its

	  peripherals.



config MACH_MX51_3DS

	bool "Support MX51PDK (3DS)"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_DEBUG_BOARD

	help

	  Include support for MX51PDK (3DS) platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_EUKREA_CPUIMX51

	bool "Support Eukrea CPUIMX51 module"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Include support for Eukrea CPUIMX51 platform. This includes

	  specific configurations for the module and its peripherals.



choice

	prompt "Baseboard"

	depends on MACH_EUKREA_CPUIMX51

	default MACH_EUKREA_MBIMX51_BASEBOARD



config MACH_EUKREA_MBIMX51_BASEBOARD

	prompt "Eukrea MBIMX51 development board"

	bool

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select LEDS_GPIO_REGISTER

	help

	  This adds board specific devices that can be found on Eukrea's

	  MBIMX51 evaluation board.



endchoice



config MACH_EUKREA_CPUIMX51SD

	bool "Support Eukrea CPUIMX51SD module"

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMX_I2C

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SPI_IMX

	help

	  Include support for Eukrea CPUIMX51SD platform. This includes

	  specific configurations for the module and its peripherals.



choice

	prompt "Baseboard"

	depends on MACH_EUKREA_CPUIMX51SD

	default MACH_EUKREA_MBIMXSD51_BASEBOARD



config MACH_EUKREA_MBIMXSD51_BASEBOARD

	prompt "Eukrea MBIMXSD development board"

	bool

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select LEDS_GPIO_REGISTER

	help

	  This adds board specific devices that can be found on Eukrea's

	  MBIMXSD evaluation board.



endchoice



config MX51_EFIKA_COMMON

	bool

	select SOC_IMX51

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_PATA_IMX

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX

	select IMX_HAVE_PLATFORM_SPI_IMX

	select MXC_ULPI if USB_ULPI



config MACH_MX51_EFIKAMX

	bool "Support MX51 Genesi Efika MX nettop"

	select LEDS_GPIO_REGISTER

	select MX51_EFIKA_COMMON

	help

	  Include support for Genesi Efika MX nettop. This includes specific

	  configurations for the board and its peripherals.



config MACH_MX51_EFIKASB

	bool "Support MX51 Genesi Efika Smartbook"

	select LEDS_GPIO_REGISTER

	select MX51_EFIKA_COMMON

	help

	  Include support for Genesi Efika Smartbook. This includes specific

	  configurations for the board and its peripherals.



comment "i.MX53 machines:"



config MACH_IMX53_DT

	bool "Support i.MX53 platforms from device tree"

	select SOC_IMX53

	select USE_OF

	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.



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 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:"



config SOC_IMX6Q

arch/arm/mach-imx/Makefile

+21 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ obj-$(CONFIG_SOC_IMX27) += clock-imx27.o mm-imx27.o ehci-imx27.o 
obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o clock-imx31.o iomux-imx31.o ehci-imx31.o

obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o clock-imx35.o ehci-imx35.o



obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clock-mx51-mx53.o ehci-imx5.o pm-imx5.o cpu_op-mx51.o



# Support for CMOS sensor interface

obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o
@@ -75,3 +77,22 @@ obj-$(CONFIG_SOC_IMX6Q) += clock-imx6q.o mach-imx6q.o 
ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_SOC_IMX6Q) += pm-imx6q.o

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_CPUIMX51) += mach-cpuimx51.o

obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o

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

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

obj-$(CONFIG_MX51_EFIKA_COMMON) += mx51_efika.o

obj-$(CONFIG_MACH_MX51_EFIKAMX) += mach-mx51_efikamx.o

obj-$(CONFIG_MACH_MX51_EFIKASB) += mach-mx51_efikasb.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