aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
Commit message (Collapse)AuthorAge
* Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6Russell King2009-05-05
|\
| * i.MX31: Disable CPU_32v6K in mx3_defconfig.Magnus Lilja2009-05-05
| | | | | | | | | | | | | | | | The i.MX31 ARM11 core is not a v6K core. Disable this option as it is incompatible with non v6K cores. Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * mx31: remove mx31moboard_defconfigValentin Longchamp2009-05-05
| | | | | | | | | | | | | | | | | | | | We want to have a mx31_defconfig file that builds a kernel that is able to boot on all support mx31 systems and thus also can be better tested by automatic build scripts. For these reasons, this config file is not needed anymore. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | Merge branch 'for-rmk' of git://git.marvell.com/orionRussell King2009-05-05
|\ \ | |/ |/|
| * [ARM] mv78xx0: update defconfigNicolas Pitre2009-05-04
| | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] orion5x: update defconfigNicolas Pitre2009-05-04
| | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * [ARM] Kirkwood: update defconfigNicolas Pitre2009-05-04
| | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
* | Merge branch 'fix' of ↵Russell King2009-04-28
|\ \ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
| * | [ARM] pxa: remove unused CPU_FREQ_PXA Kconfig symbolPhilipp Zabel2009-04-26
| |/ | | | | | | | | | | | | | | cpufreq drivers for pxa2xx/3xx are now built-in automatically as soon as CPU_FREQ is enabled. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* / davinci: add default Kconfig, add HAVE_IDEKevin Hilman2009-04-23
|/ | | | Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* Merge branch 'defconfig-s3c2410' of git://aeryn.fluff.org.uk/bjdooks/linuxRussell King2009-04-17
|\
| * [ARM] s3c2410_defconfig: Update miscellaneous driversBen Dooks2009-04-16
| | | | | | | | | | | | | | Update the driver build in the s3c2410_defconfig for the LED, IDE, Input and EEPROM options Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] s3c2410_defconfig: Update USB device driversBen Dooks2009-04-16
| | | | | | | | | | | | | | Add more USB device driver options to the s3c2410_defconfig, mostly as modules. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] s3c2410_defconfig: Update filesystem optionsBen Dooks2009-04-16
| | | | | | | | | | | | | | | | Update the filesystem options in the s3c2410_defconfig, such as building ext4, enable the automounter as modules and update the network filesysyem choices. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] s3c2410_defconfig: Add video/radio driversBen Dooks2009-04-16
| | | | | | | | | | | | | | Add a set of various video and radio drivers to the s3c2410_defconfig as modules. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] s3c2410_defconfig: Add sound driversBen Dooks2009-04-16
| | | | | | | | | | | | Add sound drivers to the s3c2410_defconfig. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] s3c2410_defconfig: Add MMC/SD core and driversBen Dooks2009-04-15
| | | | | | | | | | | | | | Add SD/MMC to the s3c2410_defconfig, building in the core and adding the rest of the drivers as modules. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] s3c2410_defconfig: Update machine configurationBen Dooks2009-04-15
| | | | | | | | | | | | | | | | Update the machine configuration of s3c2410_defconfig to add support for newer machines, and update the s3c24xx specific options. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] s3c2410_defconfig: Update network optionsBen Dooks2009-04-15
| | | | | | | | | | | | | | | | Update the list of modules being built for the network core of the s3c2410_defconfig. This update adds such items as TCP congestion, netfilter for IPv4 and IPv6. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * [ARM] s3c2410_defconfig: update to 2.6.30-rc2Ben Dooks2009-04-15
| | | | | | | | | | | | | | Update arch/arm/configs/s3c2410_defconfig to the latest kernel release (2.6.30-rc2). Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | mxc defconfig updatesSascha Hauer2009-04-16
|/ | | | | | | | | This patch removes several i.MX board specific defconfig files in favour for a mx1_defconfig, mx27_defconfig and mx3_defconfig. All config files have all currently available boards, i.MX specific drivers and the network device drivers for the boards enabled. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* [ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_powerPhilipp Zabel2009-04-03
| | | | | | | | | | | | | | | With this patch, the bq24022 battery charger is controlled by the USB gadget framework (via gpio_vbus) when connected to USB. To compile, this patch depends on the "regulator: Allow init data to be supplied for bq24022" patch (queued for next in the regulator tree) to add the init_data field to struct bq24022_mach_info. It also depends on the "add optional OTG transceiver and voltage regulator support to pda_power" patch (queued for next in the power supply tree) to enable charging when connected to the AC charger. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* arm: update omap_ldp defconfig to use smsc911xStanley.Miao2009-04-02
| | | | Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
* arm: update realview defconfigs to use smsc911xSteve Glendinning2009-04-02
| | | | Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
* arm: update pcm037 defconfig to use smsc911xSteve Glendinning2009-04-02
| | | | | | Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
* Merge branch 'for-next' of ↵Russell King2009-03-25
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
| * ARM OMAP3: Initial support for Nokia RX-51, v3Lauri Leukkunen2009-03-23
| | | | | | | | | | | | | | | | | | | | | | Adds board files and related headers for Nokia RX-51 Internet Tablet. This patch has been updated with some clean-up patches posted earlier to linux-omap list. Signed-off-by: Lauri Leukkunen <lauri.leukkunen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * ARM: OMAP3: Add support for 3430 SDP, v4Syed Mohammed Khasim2009-03-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for 3430 SDP. Various updates have been merged into this patch from the linux-omap list. Patch updated to initialize regulators by David Brownell <dbrownell@users.sourceforge.net>. Signed-off-by: Syed Mohammed Khasim <khasim@ti.com> David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
* | Merge git://git.marvell.com/orion into develRussell King2009-03-25
|\ \
| * | [ARM] Kirkwood: Add support for QNAP TS-119/TS-219 Turbo NASMartin Michlmayr2009-03-23
| | | | | | | | | | | | | | | | | | | | | Add support for the QNAP TS-119 and TS-219 Turbo NAS devices. Signed-off-by: Martin Michlmayr <tbm@cyrius.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
* | | Merge branch 'devel' of ↵root2009-03-24
|\ \ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * | | [ARM] pxa: add defconfig for pxa910-based platformsEric Miao2009-03-22
| | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | [ARM] pxa: add defconfig for pxa168-based platformsEric Miao2009-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having various pieces of defconfig files for different platforms, let's group them into a single one. Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | [ARM] pxa: add colibri PXA300 defconfigDaniel Mack2009-03-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * | | [ARM] pxa: rename and update Colibri PXA270 defconfigDaniel Mack2009-03-22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | | | Merge branch 'master' of git://git.marvell.com/orion into develRussell King2009-03-19
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: arch/arm/mach-mx1/devices.c
| * | | [ARM] mv78xx0: Add Marvell RD-78x00-mASA Reference Design supportLennert Buytenhek2009-03-15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Acked-by: Stanislav Samsonov <samsonov@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | [ARM] Kirkwood: update defconfigNicolas Pitre2009-03-15
| | | | | | | | | | | | | | | | Signed-off-by: Nicolas Pitre <nico@marvell.com>
| * | | [ARM] orion5x: ts78xx add NAND support via plat_nandAlexander Clouter2009-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ts78xx add NAND support via plat_nand Signed-off-by: Alexander Clouter <alex@digriz.org.uk> Signed-off-by: Nicolas Pitre <nico@cam.org>
| * | | Merge branch 'for-np' of git://git.wormnet.eu/alex/ts78xx into orion/masterNicolas Pitre2009-02-19
| |\ \ \ | | |_|/ | |/| |
| | * | [ARM] orion5x: add rtc-m48t86 to orion5x_defconfigAlexander Clouter2009-02-06
| | | | | | | | | | | | | | | | | | | | | | | | The TS-7800 can have a M48T86 RTC onboard Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
* | | | [ARM] 5423/1: SA1100: remove unused H3600_SLEEVE Kconfig optionDmitry Artamonow2009-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no actual code for iPAQ sleeves support in kernel that depends on this config option. Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into develRussell King2009-03-13
|\| | | | |_|/ |/| | | | | | | | | | | Conflicts: arch/arm/mach-at91/gpio.c
| * | [ARM] 5390/1: AT91: Watchdog fixesAndrew Victor2009-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The recently merged AT91SAM9 watchdog driver uses the AT91SAM9X_WATCHDOG config variable, whereas the original version of the driver (and the platform support code) used AT91SAM9_WATCHDOG. This causes the watchdog platform_device to never be registered, and therefore the driver not to be initialized. This patch: - updates the platform support code to use AT91SAM9X_WATCHDOG. - includes <linux/io.h> to fix compile error (same fix as was applied to at91rm9200_wdt.c) - fixes comment regarding watchdog clock-rates in at91rm9200. Signed-off-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] pxa/magician: select PXA_SSP for touchscreen and soundPhilipp Zabel2009-03-09
| | | | | | | | | | | | | | | Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | | [ARM] 5408/1: SA1100: update defconfigs after h3800 removalDmitry Artamonow2009-02-21
| | | | | | | | | | | | | | | Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] 5363/1: Shark cleanup and new defconfigAlexander Schulz2009-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | This includes a new defconfig for the Shark and some changes to the mach-shark directory to avoid namespace pollution and to switch the rtc to the newer driver. Signed-off-by: Alexander Schulz <alex@shark-linux.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | [ARM] 5372/1: ACS5K: Core board support for the ACS-5000Daniel Silverstone2009-02-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch provides the core board support for the Brivo Systems LLC ACS-5000 master board for automated door/card-reader etc management. Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk> Signed-off-by: Vincent Sanders <vince@simtec.co.uk> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'devel' of ↵Russell King2009-02-07
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel Conflicts: arch/arm/configs/magician_defconfig
| * | [ARM] pxa: add em_x270_defconfig for EM-X270 and eXedaMike Rapoport2009-02-02
| | | | | | | | | | | | | | | | | | | | | machines Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>