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

Commit e48ab1c1 authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: imx: move mx25 support to mach-imx 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 2a8bd56a

arch/arm/Makefile

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

machine-$(CONFIG_ARCH_MX1)		:= imx

machine-$(CONFIG_ARCH_MX2)		:= imx

machine-$(CONFIG_ARCH_MX25)		:= mx25

machine-$(CONFIG_ARCH_MX25)		:= imx

machine-$(CONFIG_ARCH_MX3)		:= mx3

machine-$(CONFIG_ARCH_MX5)		:= mx5

machine-$(CONFIG_ARCH_MXC91231)		:= mxc91231

arch/arm/mach-imx/Kconfig

+69 −16
Original line number Diff line number Diff line 
config IMX_HAVE_DMA_V1

	bool



if ARCH_MX1



config SOC_IMX1

	bool

	select CPU_ARM920T

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1



config SOC_IMX21

	bool

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1



config SOC_IMX25

	bool

	select CPU_ARM926T

	select ARCH_MXC_IOMUX_V3

	select HAVE_FB_IMX

	select ARCH_MXC_AUDMUX_V2



config SOC_IMX27

	bool

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1



if ARCH_MX1



comment "MX1 platforms:"

config MACH_MXLADS
@@ -31,20 +52,6 @@ endif 


if ARCH_MX2



config SOC_IMX21

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	bool



config SOC_IMX27

	select CPU_ARM926T

	select ARCH_MXC_AUDMUX_V1

	select IMX_HAVE_DMA_V1

	select IMX_HAVE_IOMUX_V1

	bool



choice

	prompt "CPUs:"

	default MACH_MX21
@@ -81,6 +88,52 @@ config MACH_MX21ADS 


endif



if ARCH_MX25



comment "MX25 platforms:"



config MACH_MX25_3DS

	bool "Support MX25PDK (3DS) Platform"

	select SOC_IMX25

	select IMX_HAVE_PLATFORM_ESDHC

	select IMX_HAVE_PLATFORM_IMX2_WDT

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_FB

	select IMX_HAVE_PLATFORM_IMX_KEYPAD

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_NAND



config MACH_EUKREA_CPUIMX25

	bool "Support Eukrea CPUIMX25 Platform"

	select SOC_IMX25

	select IMX_HAVE_PLATFORM_ESDHC

	select IMX_HAVE_PLATFORM_FLEXCAN

	select IMX_HAVE_PLATFORM_FSL_USB2_UDC

	select IMX_HAVE_PLATFORM_IMXDI_RTC

	select IMX_HAVE_PLATFORM_IMX_FB

	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 MXC_ULPI if USB_ULPI



choice

	prompt "Baseboard"

	depends on MACH_EUKREA_CPUIMX25

	default MACH_EUKREA_MBIMXSD25_BASEBOARD



config MACH_EUKREA_MBIMXSD25_BASEBOARD

	bool "Eukrea MBIMXSD development board"

	select IMX_HAVE_PLATFORM_IMX_SSI

	help

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

	  MBIMXSD evaluation board.



endchoice



endif



if MACH_MX27



comment "MX27 platforms:"

arch/arm/mach-imx/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o 
obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o

obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o



obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o



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

obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o
@@ -20,6 +22,10 @@ obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o 


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



obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX25) += mach-eukrea_cpuimx25.o

obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd25-baseboard.o



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

obj-$(CONFIG_MACH_PCM038) += mach-pcm038.o

obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o

arch/arm/mach-imx/Makefile.boot

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ zreladdr-$(CONFIG_MACH_MX21) := 0xC0008000 
params_phys-$(CONFIG_MACH_MX21)	:= 0xC0000100

initrd_phys-$(CONFIG_MACH_MX21)	:= 0xC0800000



zreladdr-$(CONFIG_ARCH_MX25)	:= 0x80008000

params_phys-$(CONFIG_ARCH_MX25)	:= 0x80000100

initrd_phys-$(CONFIG_ARCH_MX25)	:= 0x80800000



zreladdr-$(CONFIG_MACH_MX27)	:= 0xA0008000

params_phys-$(CONFIG_MACH_MX27)	:= 0xA0000100

initrd_phys-$(CONFIG_MACH_MX27)	:= 0xA0800000