aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
Commit message (Collapse)AuthorAge
...
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-05-25
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-24
| |\ | | | | | | | | | | | | | | | | | | devel-stable Conflicts: arch/arm/Kconfig
| | * ARM: s3c6400_defconfig: Add NAND driverBen Dooks2010-05-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | | | | | | | | 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-20
| |\ \ | | | | | | | | | | | | devel-stable
| | * | mx5: Add USB to Freescale MX51 defconfigDinh Nguyen2010-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-20
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'devel-stable' into develRussell King2010-05-17
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig
| | * \ \ \ Merge branch 'devel' of ↵Russell King2010-05-13
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
| | | * | | | [ARM] mmp: update mmp2 defconfigHaojian Zhuang2010-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-11
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | |_|/ | | |/| | | | | | | | | | | | Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', ↵Russell King2010-05-17
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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-14
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | omap3: Add stalker board to omap3_defconfigTony Lindgren2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | Add stalker board to omap3_defconfig Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | | omap3: update omap3_defconfigAnand Gadiyar2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update the omap3_defconfig to sync up with the generated .config - Increase CONFIG_LOG_BUF_SHIFT to 16 to allow the entire boot log to be captured (useful when using boot time tracer, for example) Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | | omap3: Add OMAP3 Stalker board LK-S defconfigJason Lam2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add OMAP3 Stalker board LK-S defconfig. Signed-off-by: Jason Lam <lzg@ema-tech.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | | omap4: Enable HSMMC supportkishore kadiyala2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables HSMMC support for OMAP4430 defconfig Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | | omap4: Enable RTC and regulator supportBalaji T K2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables RTC and regulator support on omap4430 sdp platform. Also sync up the defconfig with latest kernel Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | | omap4: Add i2c board support on omap4430 sdp platformSantosh Shilimkar2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the i2c board support for OMAP4430 SDP platform. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Balaji T K <balajitk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | | OMAP4: Networking: Defconfig SupportAbraham Arce2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable KS8851 SPI support + Networking Support - Packet Socket - TCP/IP Network Filesystems - NFS Client - Root Filesystem on NFS Signed-off-by: Abraham Arce <x0066660@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | | Merge branch 'omap-boards' into omap-for-linusTony Lindgren2010-05-20
|\ \ \ \
| * | | | AM3517: defconfig update to enable EMAC supportSriram2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the default configuration for AM3517EVM to enable support for EMAC peripheral. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | | can: ti_hecc: Enable CAN support on AM3517Sriram2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the default kernel configuration on AM3517 to enable CAN. Signed-off-by: Sriramakrishnan <srk@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | | omap: Devkit8000: Update default configurationThomas Weber2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the new default configuration for the Devkit8000. Signed-off-by: Thomas Weber <weber@corscience.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | | omap1: amsdelta: defconfig updatesJanusz Krzysztofik2010-05-20
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch provides the following ams_delta_defconfig updates: - explicitly select preemptable RCU, - replace outdated CONFIG_LBD and CONFIG_LSF options with CONFIG_LBDAF, - activate support for LCD contrast setting (new in 2.6.34), - turn off verbose bug reporting for smaller kernel. Created and tested against linux-2.6.34-rc3. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | Merge branch 'fix' of ↵Russell King2010-05-06
| |\ \ \ | | |_|/ | |/| | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
| | * | [ARM] pxa/imote2: Fix iMote2 defconfigStefan Schmidt2010-05-05
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Bring in a CMDLINE that actually works and prints to the right tty - Compile-in JFFS2 to boot into rootfs - Remove unneeded options for Bluetooth and radio - Disable CPU_FREQ as it makes the flash driver fail Thanks Jonathan for spotting what I messed up. Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | | OMAP1: Amstrad Delta: modify defconfig for external keyboardsupportJanusz Krzysztofik2010-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch adds a CONFIG directive required for supporting the Amstrad Delta connected external keyboard by default. Created and tested against linux-omap master, commit 104a77440f05430f29f9d3f4ecb88c1536819585 dated 2010-04-27. Works on top of PATCH v4 4/5(7), "input: serio: add support for Amstrad Delta serial keyboard port". Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | omap2/3/4: Disable CONFIG_FB_OMAP in omap3_defconfigTony Lindgren2010-05-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like CONFIG_FB_OMAP prevents somehow mounting root on MMC at least on zoom3 for multi-omap. Disable CONFIG_FB until the omap FB code is fixed. This allows booting omap3_defconfig on various omaps. Tested on 2420-n8x0, 3430-n900, 3630-zoom3 and 4430-blaze. Note that n8x0 still has issues with starting user space because of TLS and VFP. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | omap2/3/4: Disable CONFIG_PM_VERBOSE in omap3_defconfigTony Lindgren2010-05-04
| | | | | | | | | | | | | | | | | | It's too noisy. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | omap2/3/4: Update PMIC options for TWL and Menelaus chipsTony Lindgren2010-05-04
| | | | | | | | | | | | | | | | | | | | | | | | These are needed for mounting root on MMC on many boards. Also disable CONFIG_WATCHDOG_NOWAYOUT, that can keep the system from running with external watchdogs. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | omap2/3/4: Make omap3_defconfig usable on Nokia boardsTony Lindgren2010-05-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bootloader on Nokia boards does not support updating the kernel cmdline. For the other boards, the bootloader provided cmdline will be used instead. To mount root on n8x0, compile in also the MMC_OMAP. It seems that the best way to mount root with the new kernels on Nokia boards is to mount root on mmcblk0p2. Note that n8x0 current has several issues booting with omap3_defconfig: The bootloader has a 2MB limit for loading kernels, so you may want to use kexec. Also ARMv6 does not currently work with ARMv7 for VFP and TLS. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | omap2/3/4: Add new boards to omap3_defconfigTony Lindgren2010-05-04
|/ / | | | | | | | | | | Enable 2430 omaps and the missing boards. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-04-29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6061/1: PL061 GPIO: Bug fix - setting gpio for HIGH_LEVEL interrupt is not working. ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIB ARM: 6030/1: KS8695: enable console ARM: 6060/1: PL061 GPIO: Setting gpio val after changing direction to OUT. ARM: 6059/1: PL061 GPIO: Changing *_irq_chip_data with *_irq_data for real irqs. ARM: 6023/1: update bcmring_defconfig to latest version and fix build error ARM: fix build error in arch/arm/kernel/process.c
| * | ARM: 6023/1: update bcmring_defconfig to latest version and fix build errorLeo Chen2010-04-22
| |/ | | | | | | | | | | | | | | update bcmring_defconfig to the latest kernel version, this will fix the KAutobuild error. Signed-off-by: Leo Hao Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | n8x0_defconfig: remove CONFIG_NILFS2_FS overrideFrancisco Alecrim2010-04-23
| | | | | | | | | | | | | | | | arch/arm/configs/n8x0_defconfig:1061:warning: override: reassigning to symbol NILFS2_FS Signed-off-by: Francisco Alecrim <francisco.alecrim@openbossa.org> Signed-off-by: Tony Lindgren <tony@atomide.com>