2dcf78c0ee
There are some more conflicts than detected by git, namely support for the newly added cpuimx machines needed to be converted to dynamic device registration. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Conflicts: arch/arm/mach-imx/Makefile arch/arm/mach-imx/devices.c arch/arm/mach-imx/devices.h arch/arm/mach-imx/eukrea_mbimx27-baseboard.c arch/arm/mach-mx2/Kconfig arch/arm/mach-mx25/Makefile arch/arm/mach-mx25/devices.c arch/arm/plat-mxc/include/mach/mx25.h arch/arm/plat-mxc/include/mach/mxc_nand.h
31 lines
680 B
Text
31 lines
680 B
Text
if ARCH_MX25
|
|
|
|
comment "MX25 platforms:"
|
|
|
|
config MACH_MX25_3DS
|
|
bool "Support MX25PDK (3DS) Platform"
|
|
select IMX_HAVE_PLATFORM_IMX_UART
|
|
select IMX_HAVE_PLATFORM_MXC_NAND
|
|
|
|
config MACH_EUKREA_CPUIMX25
|
|
bool "Support Eukrea CPUIMX25 Platform"
|
|
select IMX_HAVE_PLATFORM_IMX_I2C
|
|
select IMX_HAVE_PLATFORM_IMX_UART
|
|
select IMX_HAVE_PLATFORM_MXC_NAND
|
|
select MXC_ULPI if USB_ULPI
|
|
|
|
choice
|
|
prompt "Baseboard"
|
|
depends on MACH_EUKREA_CPUIMX25
|
|
default MACH_EUKREA_MBIMXSD_BASEBOARD
|
|
|
|
config MACH_EUKREA_MBIMXSD_BASEBOARD
|
|
prompt "Eukrea MBIMXSD development board"
|
|
bool
|
|
help
|
|
This adds board specific devices that can be found on Eukrea's
|
|
MBIMXSD evaluation board.
|
|
|
|
endchoice
|
|
|
|
endif
|