aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/imx_v4_v5_defconfig (follow)
AgeCommit message (Collapse)AuthorFilesLines
2012-03-20Merge branch 'next/fixes-non-critical' into next/driversArnd Bergmann1-0/+1
Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c The conflicts with pxa are non-obvious, we have multiple branches adding and removing the same clock settings. According to Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct fix here. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-02-27Merge branch 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6 into next/driversArnd Bergmann1-0/+16
* 'imx-drivers' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: imx_v4_v5_defconfig: Update defconfig ARM: mx27_3ds: Add camera support ARM: imx_v6_v7_defconfig: Add support for framebuffer and camera on mx31
2012-02-27ARM: imx_v4_v5_defconfig: Update defconfigFabio Estevam1-0/+16
Select the following drivers to be built by default: - SMSC911x - LCD_L4F00242T0 (LCD present on mx27pdk) - CONFIG_VIDEO_MX2 - OV2640 (Camera present on mx27pdk) - CONFIG_VIDEO_MX2 (Allow mx2 video capture) Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-02-27ARM: imx_v4_v5_defconfig: Fix the selection of 32 bit flash support for iMX21ADS boardFabio Estevam1-0/+1
commit 1a96571d (Enable 32 bit flash support for iMX21ADS board) aimed to enable 32 bit flash support, but all it did was to delete an unset option. Fix this by enabling CONFIG_MTD_MAP_BANK_WIDTH_4 option. Cc: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-02-01CS89x0 : add CS89x0 platform device to the iMX21ADS boardJaccon Bastiaansen1-0/+2
Add CS89x0 networking support to the iMX21ADS board by using the platform driver support in the CS89x0 driver. Signed-off-by: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2012-01-09Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann1-5/+7
Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-03Enable 32 bit flash support for iMX21ADS boardJaccon Bastiaansen1-1/+0
The kernel configuration for the i.MX21ADS board (imx_v4_v5_defconfig) doesn't enable 32 bit flash support. But the i.MX21ADS specific code adds a 32 bit flash device, resulting in a kernel that refuses to boot. Signed-off-by: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-12-19imx_v4_v5_defconfig: update default configurationEric Bénard1-5/+7
- add new machine APF9328 - update CPUIMX25 -> CPUIMX25SD - add drivers : - MXC nand driver - DM9000 - SMSC Phy - SPIdev - Led GPIO Signed-off-by: Eric Bénard <eric@eukrea.com> Cc: Sascha Hauer <kernel@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
2011-08-25ARM i.MX defconfigs: use one defconfig for all ARMv4/v5 SoCsSascha Hauer1-0/+170
Now that we can compile all ARMv4/v5 based i.MX SoCs into a single kernel, update the defconfigs accordingly Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>