aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/Kconfig
Commit message (Collapse)AuthorAge
* Merge branch 'for-rmk' of ↵Russell King2010-10-19
|\ | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/mach-at91/include/mach/system.h arch/arm/mach-imx/mach-cpuimx27.c AT91 conflict resolution: Acked-by: Anders Larsen <al@alarsen.net> IMX conflict resolution confirmed by Uwe Kleine-König.
| * cpuimx27: fix compile when ULPI is selectedEric Bénard2010-10-08
| | | | | | | | | | | | | | | | | | without this patch we get : arch/arm/mach-imx/built-in.o: In function `eukrea_cpuimx27_init': eukrea_mbimx27-baseboard.c:(.init.text+0x44c): undefined reference to `mxc_ulpi_access_ops' Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | ARM: imx: dynamically allocate imx-ssi devicesUwe Kleine-König2010-09-27
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* | ARM: imx: Add support for Vista Silicon Visstrim_m10 boardJavier Martin2010-09-27
|/ | | | | | | | | | Vista Silicon Visstrim_m10 i.MX27 based board is used as multimedia streaming server, access control and other custom applications. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Uwe Kleine-König2010-07-26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: imx: dynamically register imx-uart devices (imx27)Uwe Kleine-König2010-06-30
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: dynamically register imx-uart devices (imx21)Uwe Kleine-König2010-06-30
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: dynamically register imx-uart devices (imx1)Uwe Kleine-König2010-06-30
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: dynamically register spi_imx devices (imx27)Uwe Kleine-König2010-06-30
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: dynamically register imx-i2c devices (imx27)Uwe Kleine-König2010-06-30
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: dynamically register imx-i2c devices (imx1)Uwe Kleine-König2010-06-30
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: Change the way nand devices are registered (imx27)Uwe Kleine-König2010-06-30
| | | | | | | | | | | | Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: Change the way nand devices are registered (imx21)Uwe Kleine-König2010-06-30
| | | | | | | | | | | | Make use of new mechanism to register a nand device. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: new Kconfig symbol and feature test macro for DMA on mx1 and mx2Uwe Kleine-König2010-06-30
| | | | | | | | | | | | | | | | | | | | This should be used instead of hard coding the corresponding platforms. The feature test macro is needed to support different SOCs in a single kernel image. While at it rename dma-mx1-mx2 to dma-v1 as mx25 doesn't use it and so the mx2 part is wrong and move the header to arch/arm/mach-imx. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: prepare deprecating ARCH_MX1, MACH_MX2, MACH_MX21 and MACH_MX27Uwe Kleine-König2010-06-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MACH_... is reserved for machine support, so use SOC as prefix, not MACH. This introduces new symbols SOC_IMX1, SOC_IMX21 and SOC_IMX27. They are selected by the old symbols for now. There is no substitute for MACH_MX2 as most usages of MX2 only means MX21 + MX27 but not MX25. Later the choice about CPU and CPU family should go away and the individual machines should select the right SOC symbol. This is a precondition to support more than one SOC in a single kernel image. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: Kconfig: use an if block instead of a depend for many symbolsUwe Kleine-König2010-06-30
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: move mx1 support to mach-imxUwe Kleine-König2010-06-30
| | | | | | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * ARM: imx: rename mach dir for mx21 and mx27 to mach-imxUwe Kleine-König2010-06-24
|/ | | | | | | | Finally all imx code should end up there, start with mach-mx2. While touching all files rename some files to use a hyphen instead of an underscore. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* [ARM] remove arch-imxSascha Hauer2009-05-07
| | | | | | | arch-imx is superseeded by the MXC architecture support. This patch removes arch/arm/mach-imx from the kernel. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [PATCH] ARM: select PCI, ISA and ISA_DMARussell King2005-05-05
| | | | | | | Rather than using a long "depends on..." and "default y" lines for these options, use select instead. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
* Linux-2.6.12-rc2v2.6.12-rc2Linus Torvalds2005-04-16
Initial git repository build. I'm not bothering with the full history, even though we have it. We can create a separate "historical" git archive of that later if we want to, and in the meantime it's about 3.2GB when imported into git - space that would just make the early git days unnecessarily complicated, when we don't have a lot of good infrastructure for it. Let it rip!