summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx25/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Fix KConfig warningEric Bénard2010-07-261-1/+1
| | | | | | | | | | This patch fixes the following Kconfig warning : "arch/arm/mach-mx25/Kconfig:18:warning: choice value used outside its choice group Signed-off-by: Eric Bénard <eric@eukrea.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Uwe Kleine-König2010-07-261-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into HEAD 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
| * ARM: mx25: rename mach-mx25pdk.c to mach-mx25_3ds.c matching its arch numberUwe Kleine-König2010-06-021-1/+1
| | | | | | | | | | | | Additionally document all known names of that machine. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* | i.MX25: add cpuimx25 module and its baseboardEric Bénard2010-07-261-0/+2
|/ | | | | | | | | * cpuimx25 integrates i.MX25, RAM, NAND, Ethernet, I2C RTC, USB Host and USB OTG * mbimxsd provides access to LCD, Audio, LED, Switch button, UART ... Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* imx/mx25: rename files defining a machine to mach-$mach.cUwe Kleine-König2010-02-021-1/+1
| | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* Freescale i.MX25 PDK (3ds) board supportSascha Hauer2009-08-141-0/+1
| | | | Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* Add i.MX25 supportSascha Hauer2009-08-141-0/+2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
OpenPOWER on IntegriCloud