summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
Commit message (Collapse)AuthorAgeFilesLines
* omap: Fix omap_4430sdp_defconfig for make oldconfigTony Lindgren2010-08-161-0/+3
| | | | | | | | | | | | | | | Commit ffb63e3402849e1b70119ee0c9a81dc9da4dfa97 changed Kconfig to select support for omap2, 3 and 4 by default. However, CONFIG_SMP won't currently work properly on uniprocessor ARMs, or if support for earlier ARM cores is selected in. Fix this by updating omap_4430sdp_defconfig to not select omap2 or 3 at this point. Signed-off-by: Tony Lindgren <tony@atomide.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
* Merge branches 'master' and 'devel' into for-linusRussell King2010-08-102-66/+5
|\ | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/mm/Kconfig
| * Merge branch 'for-rmk' of ↵Russell King2010-08-092-66/+5
| |\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/Kconfig
| | * ARM: s5pv210_defconfig: Update for removing s5pc110_defconfigKukjin Kim2010-08-052-66/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that S5PC110 machines and S5PV210 machines can be built into one kernel, update mach-s5pv210/Kconfig and s5pv210_defconfig. Tested on Aquila(S5PC110), GONI(S5PC110), SMDKC110(S5PC110) and SMDKV210(S5PV210). Created and tested against linux-2.6.35-rc5. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
* | | Remove ARM default configurations which duplicate omap3_defconfigVincent Sanders2010-08-0419-3467/+0
|/ / | | | | | | | | | | | | | | These configurations are no longer useful as the systems they support are covered by the generic omap3_defconfig Signed-off-by:Vincent Sanders <vince@simtec.co.uk> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | Merge branch 'devel-stable' into develRussell King2010-07-311-0/+8
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/kernel/entry-armv.S arch/arm/kernel/setup.c arch/arm/mm/init.c
| * | [ARM] Kirkwood: add missing machine targets to defconfigNicolas Pitre2010-07-161-0/+8
| |/ | | | | | | Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
* | Merge branch 'l7200' into develRussell King2010-07-161-23/+0
|\ \ | |/ |/| | | | | Conflicts: arch/arm/configs/lusl7200_defconfig
| * ARM: Remove support for LinkUp Systems L7200 SDP.Russell King2010-06-241-453/+0
| | | | | | | | | | | | | | | | This hasn't been actively maintained for a long time, only receiving the occasional build update when things break. I doubt anyone has one of these on their desks anymore. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | ARM: reduce defconfigsUwe Kleine-König2010-06-10177-194157/+652
|/ | | | Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
* ARM: s3c2410_defconfig: Add new machinesBen Dooks2010-05-281-8/+27
| | | | | | | Add the SMDK2416, and the GTA02 to the list of machines that are included in the s3c2410_defconfig. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s3c6400_defconfig: Add framebuffer and basic LCDBen Dooks2010-05-281-2/+43
| | | | | | | Add the framebuffer driver and some basic LCD configurations that should be suitable for the SMDK boards. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s3c6400_defconfig: Add RTC driver supportBen Dooks2010-05-281-1/+66
| | | | | | | Now that the RTC driver supports the S3C64XX, enable it in the build. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s3c6400_defconfig: Enable USB host sideBen Dooks2010-05-281-3/+217
| | | | | | | Enable the USB Host side by adding the USB OHCI and some basic USB driver modules. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s3c6400_defconfig: Add SPI driverBen Dooks2010-05-281-1/+37
| | | | | | | | The SPI driver was added last kernel round, so enable the core SPI and add the 64XX and bitbang driver as modules. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s3c6400_defconfig: Update compiled machinesBen Dooks2010-05-281-7/+13
| | | | | | | Add the machines that have been added in the last round to the list of builds. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-gitBen Dooks2010-05-261-6/+27
| | | | | | Update the s5pv210_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-gitBen Dooks2010-05-261-6/+24
| | | | | | Update the s5pc110_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-gitBen Dooks2010-05-261-49/+184
| | | | | | Update the s5pc100_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-gitBen Dooks2010-05-261-6/+18
| | | | | | Update the s5p6442_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-gitBen Dooks2010-05-261-6/+23
| | | | | | Update the s5p6440_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-gitBen Dooks2010-05-261-7/+28
| | | | | | Update the s3c6400_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-gitBen Dooks2010-05-261-9/+61
| | | | | | Update the s3c2410_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-05-258-403/+628
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits) ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline ARM: 6140/1: silence a bogus sparse warning in unwind.c ARM: mach-at91: duplicated include ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup ARM: SPEAR6xx: remove duplicated #include ARM: s3c6400_defconfig: Add NAND driver ARM: s3c6400_defconfig: enable sound as modules ARM: s3c6400_defconfig: enable power management ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34 ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34 ...
| * Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King2010-05-247-402/+612
| |\ | | | | | | | | | | | | | | | | | | devel-stable Conflicts: arch/arm/Kconfig
| | * ARM: s3c6400_defconfig: Add NAND driverBen Dooks2010-05-231-1/+83
| | | | | | | | | | | | | | | | | | Add the NAND driver to the list of inbuilt devices. Signed-of-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s3c6400_defconfig: enable sound as modulesBen Dooks2010-05-231-2/+41
| | | | | | | | | | | | | | | | | | Add the ASoC/ALSA configuration for s3c6400_defconfig as modules Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s3c6400_defconfig: enable power managementBen Dooks2010-05-231-2/+12
| | | | | | | | | | | | | | | | | | Enable power management in the default build Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34Ben Dooks2010-05-231-6/+18
| | | | | | | | | | | | | | | | | | Update the s5pv210_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34Ben Dooks2010-05-231-6/+18
| | | | | | | | | | | | | | | | | | Update the s5pc110_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34Ben Dooks2010-05-231-16/+28
| | | | | | | | | | | | | | | | | | Update the s5p6442_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34Ben Dooks2010-05-231-17/+43
| | | | | | | | | | | | | | | | | | Update the s5p6440_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34Ben Dooks2010-05-231-34/+47
| | | | | | | | | | | | | | | | | | Update the s3c6400_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34Ben Dooks2010-05-231-317/+321
| | | | | | | | | | | | | | | | | | Update the s3c2410_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: s5pc100_defconfig: change ARCH_S5PC1XX to ARCH_S5PC100Ben Dooks2010-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixup the defconfig post the latest moves, so ARCH_S5PC1XX becomes ARCH_S5PC100 which is sufficient to get the system building. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2010-05-201-1/+16
| |\ \ | | | | | | | | | | | | devel-stable
| | * | mx5: Add USB to Freescale MX51 defconfigDinh Nguyen2010-05-031-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mx51_defconfig to include USB EHCI by default. This patch applies to 2.6.34-rc6. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | | | Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linuxLinus Torvalds2010-05-213-3/+139
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://gitorious.org/linux-omap-dss2/linux: (23 commits) OMAP: DSS2: Fix omap_dss_probe() error path OMAP: DSS2: omap_dss_probe() conditional compilation cleanup board-omap3-beagle: add DSS2 support OMAP2: DSS: Add missing line for update bg color OMAP3630: DSS2: Updating MAX divider value OMAP: RX51: Update board defconfig OMAP: DSS2: Add ACX565AKM Panel Driver OMAP: RX51: Add Touch Controller in SPI board info OMAP: RX51: Add LCD Panel support OMAP: DSS2: TPO-TD03MTEA1: fix Kconfig dependency OMAP: LCD LS037V7DW01: Add Backlight driver support OMAP: DSS2: Taal: Fix DSI bus locking problem OMAP: DSS2: Taal: add mutex to protect panel data OMAP: DSS2: Make partial update width even OMAP: DSS2: Fix device disable when driver is not loaded OMAP: DSS2: VENC: don't call platform_enable/disable() twice OMAP: DSS2: check lock_fb_info() return value OMAP: DSS2: fix lock_fb_info() and omapfb_lock() locking order OMAP: DSS2: Use vdds_sdi regulator supply in SDI OMAP: DSS2: Remove redundant enable/disable calls from SDI ...
| * | | | OMAP: RX51: Update board defconfigRoger Quadros2010-05-181-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add LCD, Boot-up logo, framebuffer console, Keypad and Power button support Signed-off-by: Roger Quadros <roger.quadros@nokia.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
| * | | | OMAP: AM3517: Enable DSS2 in AM3517EVM defconfigVaibhav Hiremath2010-05-181-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> [tomi.valkeinen@nokia.com: removed the board file changes] Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
| * | | | OMAP: Enable DSS2 in OMAP3EVM defconfigVaibhav Hiremath2010-05-181-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> [tomi.valkeinen@nokia.com: removed the board file changes] Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
* | | | | Merge branch 'omap4-i2c-init' into omap-for-linusTony Lindgren2010-05-207-23/+5422
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'devel-stable' into develRussell King2010-05-178-159/+1053
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig
| | * \ \ \ Merge branch 'devel' of ↵Russell King2010-05-132-128/+119
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
| | | * | | | [ARM] mmp: update mmp2 defconfigHaojian Zhuang2010-05-111-23/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable MAX8649 & MAX8925 regulator, dynamic debug, Marvell Jasper platform. Disable DNOTIFY, MAX8660 regulator, 88pm860x PMIC. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | | * | | | [ARM] mmp: enable L2 in mmp2Haojian Zhuang2010-05-111-0/+2
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Tauros2 L2 in mmp2. Tauros2 L2 is shared in Marvell ARM cores. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| | * | | | ARM: cns3xxx: Add defconfig for CNS3420 validation boardAnton Vorontsov2010-05-021-0/+831
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', ↵Russell King2010-05-174-0/+3083
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'omap', 'pxa', 'spear' and 'versatile' into devel Conflicts: arch/arm/Makefile arch/arm/common/Makefile arch/arm/mm/Kconfig
| | | * | | ARM: 6019/1: ST SPEAr: Added default configuration files for SPEAr machinesviresh kumar2010-04-144-0/+3083
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Linus Walleij <linux.walleij@stericsson.com> Signed-off-by: Viresh Kumar <viresh.kumar@st.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | ARM: 6055/1: AT91: add defconfig for taskit PortuxG20 and Stamp9G20Christian Glindkamp2010-04-141-0/+1456
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for both boards can easily be built into one kernel image, so there is no need to add one defconfig for each of them. Signed-off-by: Christian Glindkamp <christian.glindkamp@taskit.de> Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
OpenPOWER on IntegriCloud