summaryrefslogtreecommitdiff
path: root/arch/arm/configs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into develRussell King2009-09-126-258/+503
|\
| * ARM: 5689/1: Update default config of HP Jornada 700-series machinesKristoffer Ericson2009-09-061-119/+210
| | | | | | | | | | | | | | This patch updates the default config for HP Jornada 700-series handhelds. Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * [ARM] Kirkwood: enable eSATA on QNAP TS-219PJohn Holland2009-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | Initialize PCI/PCIe on the QNAP TS-119, TS-219 and TS-219P hardware allowing the use of the discrete eSATA controller connected to the PCIe bus in the TS-219P. Signed-off-by: John Holland <john.holland@cellent-fs.de> Tested-by: Thomas Reitmayr <treitmayr@devbase.at> Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * Merge branch 'omap-fixes' of ↵Russell King2009-08-101-3/+4
| |\ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
| | * OMAP3: RX51: Updated rx51_defconfigRoger Quadros2009-08-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added REGULATOR, MMC and updated default CMDLINE so RX51 now boots. Note that the regulator code should be moved from mmc-twl4030.c to omap_hsmmc.c so it can be a module. Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | USB: musb: fix the nop registration for OMAP3EVMGupta, Ajay Kumar2009-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMAP3EVM uses ISP1504 phy which doesn't require any programming and thus has to use NOP otg transceiver. Cleanups being done: - Remove unwanted code in usb-musb.c file - Register NOP in OMAP3EVM board file using usb_nop_xceiv_register(). - Select NOP_USB_XCEIV for OMAP3EVM boards. - Don't enable TWL4030_USB in omap3_evm_defconfig Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> Signed-off-by: Eino-Ville Talvala <talvala@stanford.edu> Acked-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | mx3 defconfig updateSascha Hauer2009-07-281-49/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | - enable PCM043, MX31LILLY, ARMADILLO5X0 and MX35_3DS boards - enable MXC nand driver - enable UBI support - disable cs89x0 support which broke all boards which do not have this chip Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | mx27 defconfig updateSascha Hauer2009-07-281-85/+185
| |/ | | | | | | | | | | | | | | - enable MX27_3DS and MX27LITE Board - enable MXC nand driver - enable UBI support Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'devel-stable' into develRussell King2009-09-123-10/+2216
|\ \ | | | | | | | | | | | | | | | Conflicts: MAINTAINERS arch/arm/mm/fault.c
| * \ Merge branch 'nomadik' into devel-stableRussell King2009-09-121-0/+1316
| |\ \
| | * | [ARM] 5588/1: nomadik: add defconfig for nhk8815Alessandro Rubini2009-07-021-0/+1316
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alessandro Rubini <rubini@unipv.it> Acked-by: Andrea Gallo <andrea.gallo@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | ARM: S5PC100: Board and configuration fileByungho Min2009-08-161-0/+892
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | SMDKC100 board support. The board can be obtained from meritech (http://www.meritech.co.kr) Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: fixup subject and description] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | [ARM] 5608/1: Updated U300 defconfigLinus Walleij2009-07-171-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the LBD support that isn't of any use right now at least, then remove remnants of the TCM config flags that somehow crept in by mistake (not yet merged patch for 2.6.32) and then the usual defconfig noise from updated menus. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and ↵Russell King2009-09-129-358/+5603
|\ \ \ \ \ | | | |/ / | |_|_| / |/| | | 'w90x900' into devel
| | | * [ARM] 5576/1: Update kb9202_defconfigMatthias Kaehlcke2009-07-021-316/+842
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default configuration file for the KwikByte kb9202 board was based on a 2.6.13-rc2 kernel and doesn't produce a bootable kernel. Update the configuration in order to produce a bootable image. Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] 5579/1: Updated U300 defconfigLinus Walleij2009-07-021-39/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This defconfig update selects all the new U300 drivers merged for 2.6.31-rc1 in the merge window and add defaults for the new config options. It compiles and boots nicely from initramfs on the U300. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] s3c2410_defconfig: add MINI2440 machine to buildBen Dooks2009-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the MINI2440 to the list of machines built by the central defconfig. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | | * [ARM] S3C: Remove unused CONFIG_DEBUG_S3C_PORTBen Dooks2009-06-233-3/+0
| |_|/ |/| | | | | | | | | | | | | | | | | Remove the unused CONFIG_DEBUG_S3C_PORT as we currently only have support for using the S3C UARTs via the low-level debug code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * ARM: 5670/1: bcmring: add default configuration for bcmring archLeo Chen2009-08-151-0/+725
| |/ |/| | | | | | | | | | | add default configuration for bcmring arch Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 5630/1: Add support for Eukrea's CPUAT91Eric Bénard2009-07-301-0/+1316
| | | | | | | | | | | | | | | | | | CPUAT91 is based on Atmel's AT91RM9200 with up to 16MB Strataflash, up to 128MB SDRAM and an ethernet PHY in RMII mode. Signed-off-by: Eric Benard <ebenard@eukrea.com> Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * ARM: 5629/1: Add support for Eukrea's CPU9260 & CPU9G20Eric Bénard2009-07-302-0/+2666
|/ | | | | | | | | | CPU9260 and CPU9G20 share the same PCB populated with either Atmel's AT91SAM9260B or AT91SAM9G20B with up to 64MB Strataflash, up to 128MB SDRAM, up to 2GB NAND and an ethernet PHY in RMII mode. Signed-off-by: Eric Benard <eric@eukrea.com> Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] MINI2440: Create a mini2440_defconfig fileMichel Pollet2009-06-151-0/+2097
| | | | | | | Just a working, starting point config file for the board. Signed-off-by: Michel Pollet <buserror@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* Merge branch 'u300' into develRussell King2009-06-141-0/+1115
|\ | | | | | | | | | | | | | | Conflicts: arch/arm/Makefile Updates: arch/arm/mach-u300/core.c arch/arm/mach-u300/timer.c
| * [ARM] 5533/1: Add U300 series defconfigLinus Walleij2009-06-011-0/+1115
| | | | | | | | | | | | | | | | | | | | This adds a defconfig for the U300 series ST-Ericsson mobile platforms. It will be maintained to enable the maximum set of drivers so as to provide a good regression testing target for these platforms. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'stmp' into develRussell King2009-06-142-0/+2143
|\ \
| * | [ARM] 5463/1: Freescale STMP platform support [10/10]dmitry pervushin2009-04-272-0/+2143
| |/ | | | | | | | | | | | | Default configs for STMP3xxx boards Signed-off-by: dmitry pervushin <dpervushin@embeddedalley.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'for-rmk' of ↵Russell King2009-06-142-87/+247
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * | [ARM] pxa/cm-x300: update defconfigMike Rapoport2009-06-051-85/+244
| | | | | | | | | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | [ARM] pxa: magician_defconfig enable hx4700, asic3 and w100fbPhilipp Zabel2009-06-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | I'm not going to maintain separate defconfigs for magician and hx4700. This should probably be renamed to htcpxa_defconfig. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | | Merge branch 'w90x900' into develRussell King2009-06-111-72/+351
|\ \ \
| * | | [ARM] 5550/1: Add default configure file for w90p910 platformwanzongshun2009-06-111-72/+351
| | |/ | |/| | | | | | | | | | | | | | | | Add default configure file for w90p910 platform. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'ep93xx' into develRussell King2009-06-101-306/+547
|\ \ \
| * | | [ARM] 5523/2: Updated ep93xx defconfigRyan Mallon2009-05-241-306/+547
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated defconfig for ep93xx. By default, support for all boards which boot from 0x00000000 (SDCE3/SyncBoot) is included. Also updated the defconfig to use EABI for building the kernel. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'for_rmk' of ↵Russell King2009-06-101-34/+94
|\ \ \ | | | | | | | | | | | | git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into devel
| * | | ARM: OMAP4: SMP: Update defconfig for OMAP4430Santosh Shilimkar2009-06-091-34/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates omap_4430sdp_defconfig to add SMP and LOCAL_TIMER support for OMAP4430 SDP platform. Additionally the defconfig is made in sync with 2.6.30-rc7 Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
* | | | Merge branch 'for-rmk' of git://git.marvell.com/orion into develRussell King2009-06-082-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | [ARM] Kirkwood: add Marvell 88F6281 GTW GE board supportLennert Buytenhek2009-06-081-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
| * | | [ARM] Kirkwood: CPU idle driverRabeeh Khoury2009-06-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch adds support for Kirkwood cpu idle. Two idle states are defined: 1. Wait-for-interrupt (replacing default kirkwood wfi) 2. Wait-for-interrupt and DDR self refresh Signed-off-by: Rabeeh Khoury <rabeeh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | [ARM] orion: add hwrng timeriomem hook to TS-78xxAlexander Clouter2009-06-031-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | Add hook so that the HW RNG source on the TS-78xx is available. Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Nicolas Pitre <nico@marvell.com>
* | | Merge branch 'for-next' of ↵Russell King2009-05-294-1/+3546
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel Conflicts: arch/arm/Makefile
| * | | ARM: OMAP4: Add defconfig for 4430 SDPSantosh Shilimkar2009-05-281-0/+806
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the defconfig for OMAP4430 SDP platform. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | ARM: OMAP3: Add omap3 EVM defconfigSyed Mohammed Khasim2009-05-281-0/+1528
| | | | | | | | | | | | | | | | | | | | | | | | Add omap3 EVM defconfig Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | ARM: OMAP3: Defconfig for Zoom2 boardVikram Pandita2009-05-281-0/+1211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds OMAP3 Zoom2 board defconfig. Signed-off-by: Mikkel Christensen <mlc@ti.com> Signed-off-by: Vikram Pandita <vikram.pandita@ti.com> Acked-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | | ARM: OMAP2/3: Add generic onenand support when connected to GPMCJuha Yrjola2009-05-281-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add generic onenand support when connected to GPMC and make the boards to use it. The patch has been modified to make it more generic to support all the boards with GPMC. The patch also remove unused prototype for omap2_onenand_rephase(void). Note that board-apollon.c is currently using the MTD_ONENAND_GENERIC and setting the GPMC timings in the bootloader. Setting the GPMC timings in the bootloader will not allow supporting frequency scaling for the onenand source clock. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | Merge branch 'for-next' of ↵Russell King2009-05-291-4/+17
|\ \ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel
| * | | davinci: defconfig update: add EMACKevin Hilman2009-05-281-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | DaVinci EMAC driver is now upstream. Enable it in default defconfig. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | | davinci: update davinci_all_defconfig for dm355, dm6467Kevin Hilman2009-05-261-3/+12
| |/ / | | | | | | | | | Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | | Merge branch 'ixp4xx' of ↵Russell King2009-05-233-201/+683
|\ \ \ | |/ / | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
| * | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2009-05-052-791/+1
| |\ \
| * \ \ Merge branch 'for-rmk' of git://git.marvell.com/orionRussell King2009-05-053-201/+683
| |\ \ \
View Lorry Controller Status