summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King2010-10-281-0/+1
|\ | | | | | | devel-stable
| * ARM: mx5: Add gpio-keys to mx51 babbage boardDinh Nguyen2010-10-261-0/+1
| | | | | | | | | | | | | | Add functionality for the power button on MX51 Babbage board. Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
* | AT91: add board support for Pcontrol_G20Peter Gsellmann2010-10-261-0/+175
| | | | | | | | | | | | | | | | | | Board is a carrier board for Stamp9G20, with additional peripherals for a building automation system Signed-off-by: Peter Gsellmann <pgsellmann@portner-elektronik.at> [nicolas.ferre@atmel.com: remove machine_desc.io_pg_offst and .phys_io] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
* | Merge branch 'omap-for-linus' of ↵Linus Torvalds2010-10-254-281/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits) omap: complete removal of machine_desc.io_pg_offst and .phys_io omap: UART: fix wakeup registers for OMAP24xx UART2 omap: Fix spotty MMC voltages ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h serial: omap-serial: fix signess error OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish omap: dma: Fix buffering disable bit setting for omap24xx omap: serial: Fix the boot-up crash/reboot without CONFIG_PM OMAP3: PM: fix scratchpad memory accesses for off-mode omap4: pandaboard: enable the ehci port on pandaboard omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set omap4: pandaboard: remove unused hsmmc definition OMAP: McBSP: Remove null omap44xx ops comment OMAP: McBSP: Swap CLKS source definition OMAP: McBSP: Fix CLKR and FSR signal muxing OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks OMAP: control: move plat-omap/control.h to mach-omap2/control.h OMAP: split plat-omap/common.c OMAP: McBSP: implement functional clock switching via clock framework OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c ... Fixed up trivial conflicts in arch/arm/mach-omap2/ {board-zoom-peripherals.c,devices.c} as per Tony
| * | omap: Update omap2plus_defconfig to use ttyO instead ttySTony Lindgren2010-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the omap-serial the device has changed from ttyS to ttyO as the system may have both omap-serial and 8250 ports. Note that systems using omap-serial need to be updated to use ttyO[012] instead of ttyS[012] in the bootloader, CONFIG_CMDLINE, /etc/inittab, and the root file system with mknod. Also you may need to add ttyO[012] to /etc/securetty. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | OMAP2+: defconfig: disable CPUfreqKevin Hilman2010-09-291-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable CPUfreq since 1) is not yet supported in mainline, and 2) the current driver fails to suspend properly Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | OMAP2+: defconfig: modularize bluetooth, audio and WLANKevin Hilman2010-09-291-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In working towards a smaller default kernel, only devices used for early boot should be built in. Toward that end, build the following as modules by default: - bluetooth - audio: ALSA, ASoC - WLAN Uncompressed kernel size comparison: Before: text data bss dec hex filename 6557576 465088 5616024 12638688 c0d9e0 vmlinux After: text data bss dec hex filename 5616572 436448 5610800 11663820 b1f9cc vmlinux Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: Update omap3_defconfig for omap2Tony Lindgren2010-09-203-131/+1
| | | | | | | | | | | | | | | | | | | | | We need to enable ARM_ERRATA_411920 for omap2 and remove the omap2 specific defconfigs. Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: Update and rename common defconfig for omap2plus devicesSantosh Shilimkar2010-09-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch addresses below things - Renaming existing omap3_defconfig which has OMAP2, OMAP3 and OMAP4 builds enabled to more appropriate name 'omap2plus_defconfig' - L1 cache shift is suppose to be 5 on OMAP4 where as it is 6 on previous OMAPs. Keeping it to 5 is safer option for OMAP4 and previous OMAPs. For OMAP3 only build the shift would be still 6 - Enable needed Errata's for OMAP4 to work with DMA based device drivers CONFIG_PL310_ERRATA_588369=y CONFIG_ARM_ERRATA_720789=y - Enable the Micrel ethernet controller CONFIG_KS8851=y CONFIG_KS8851_MLL=y With above three changes, OMAP4 ethernet, mmc etc works reliably. Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | omap: Update omap3_defconfig to work with SMP_ON_UPTony Lindgren2010-09-202-130/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the recent changes to core ARM kernel code, we can now boot SMP kernel on UP systems. Update omap3_defconfig to enable SMP. This allows us to remove omap_4430sdp_defconfig. In addition to enabling SMP, we also need to disable some options to make the system boot: - For some reason LOCK_STAT causes tons of WARNING: at mm/percpu-vm.c:320 pcpu_alloc+0x2fc/0x888() so disable it for now. - MUSB init fails for multi-omap, disable it for now. - LOCAL_TIMERS hangs on omap4, disable it for now. Also disable DEBUG_LL as this should be only enabled for debugging. Signed-off-by: Tony Lindgren <tony@atomide.com>
* | | Merge branch 'davinci-next' into davinci-for-linusKevin Hilman2010-10-211-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-davinci/board-da830-evm.c arch/arm/mach-davinci/board-da850-evm.c
| * | | davinci: Initial support for Omapl138-HawkboardVictor Rodriguez2010-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds initial support for the Hawkboard-L138 system It is under the machine name "omapl138_hawkboard". This system is based on the da850 davinci CPU architecture. Information on these system may be found at http://www.hawkboard.org. Basic support for the UART console is included in this patch. It's tested with latest Angstrom File Systems like ramdisk from http://alturl.com/imb45. Signed-off-by: Victor Rodriguez <victor.rodriguez@sasken.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | | davinci: Initial support for MityDSP-L138/MityARM-1808Michael Williamson2010-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds initial support for the MityDSP-L138 and MityDSP-1808 system on Module (SOM) under the machine name "mityomapl138". These SOMs are based on the da850 davinci CPU architecture. Information on these SOMs may be found at http://www.mitydsp.com. Basic support for the console UART, NAND, and EMAC (MII interface) is included in this patch. Signed-off-by: Michael Williamson <michael.williamson@criticallink.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
| * | | davinci: Add CONFIG_REGULATOR_DUMMY to DA8XX defconfig file.Michael Williamson2010-09-241-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | In order to support reference DA8XX machines not providing a voltage regulator control for the core voltage, the REGULATOR_DUMMY option is required. Signed-off-by: Michael Williamson <michael.williamson@criticallink.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | | Merge branch 'devel-stable' into develRussell King2010-10-197-55/+20
|\ \ \
| * \ \ Merge branch 'for-rmk' of ↵Russell King2010-10-191-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/mach-at91/include/mach/system.h arch/arm/mach-imx/mach-cpuimx27.c AT91 conflict resolution: Acked-by: Anders Larsen <al@alarsen.net> IMX conflict resolution confirmed by Uwe Kleine-König.
| | * | | ARM: s5p64x0_defconfig: Update for support S5P6440 and S5P6450Kukjin Kim2010-10-181-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates s5p64x0_defconfig and changes the name from s5p6440_defconfig so that can support S5P6440 and S5P6450 with one kernel. Tested on SMDK6440(S5P6440) and SMDK6450(S5P6450). Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stableRussell King2010-10-121-0/+1
| |\ \ \
| | * | | [ARM] Kirkwood: support for Seagate DockStarEric Cooper2010-09-191-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Seagate FreeAgent DockStar, a Marvell SheevaPlug variant. Signed-off-by: Eric Cooper <ecc@cmu.edu> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
| * | | Merge branch 'for-rmk-next' of git://git.pengutronix.de/git/imx/linux-2.6 ↵Russell King2010-10-114-54/+16
| |\ \ \ | | | |/ | | |/| | | | | into devel-stable
| | * | ARM: mx51_defconfig: add new boards MACH_MX51_3DS and MACH_EUKREA_CPUIMX51Uwe Kleine-König2010-09-271-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further remove FIXED_PHY as it breaks the ethernet. VGA_CONSOLE isn't selectable anymore since fb78b51cb11e. EXT3_DEFAULTS_TO_ORDERED defaults to y since aa32a796389b. INOTIFY is gone since 2dfc1cae4c42. CONFIG_DETECT_SOFTLOCKUP is gone since e16bb1d7fe07. Enable TMPFS for udev. KEYS is selected by NFS_USE_KERNEL_DNS Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: remove mx31pdk_defconfigUwe Kleine-König2010-09-271-44/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This machine is enabled in mx3_defconfig and so mx31pdk_defconfig isn't really useful. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx3_defconfig: add new machine MACH_EUKREA_CPUIMX35Uwe Kleine-König2010-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Furthermore INOTIFY is gone since 2dfc1ca (inotify: remove inotify in kernel interface) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * | ARM: mx27_defconfig: enable switches used in mx27 codeUwe Kleine-König2010-09-271-3/+12
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - enable all mx27 machines (MACH_CPUIMX27, MACH_IMX27_VISSTRIM_M10, MACH_PCA100, MACH_MXT_TD60) including optional features for CPUIMX27 - eukrea_mbimx27-baseboard.c uses TOUCHSCREEN_ADS7846 - mach-cpuimx27.c uses SERIAL_8250 - several machines make use of SPI_IMX (selects SPI_BITBANG) - drop VGA_CONSOLE as this isn't selectable anymore since fb78b51cb11e - several machines make use of USB_ULPI (depends on USB, but don't enable USB_DEVICE_CLASS as it's deprecated) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | AT91: at91sam9g20ek: merge 2mmc version in one boardJean-Christophe PLAGNIOL-VILLARD2010-10-071-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The board-sam9g20ek-2slot-mmc.c was a revision of the at91sam9g20ek since board revision C. It contains 2 sd/mmc slots. This merge keep the support of the old machine ID MACH_AT91SAM9G20EK_2MMC for backward compatibility. Now we use the ATAG to pass the hardware functionality to kernel with this board revision encoding bit 0: 0 => 1 sd/mmc slot 1 => 2 sd/mmc slots connectors (board from revision C) system_rev tested on Barebox commit d8f3ee103a9f4bd Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
| |
| \
| \
| \
*---. \ Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', ↵Russell King2010-10-183-39/+28
|\ \ \ \ | |_|_|/ |/| | | | | | | 'st-ux' and 'unwind' into devel
| | | * ARM: 6366/1: Update U300 defconfigLinus Walleij2010-10-041-35/+2
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | This mainly removes a lot of unused subsystems (as for the mainline drivers) in the U300 defconfig, switch of MMC debugging by default and enables debugfs on the builds. Once we merge the drivers we'll configure it on again. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * ARM: 6369/1: Update RealView SMP defconfigLinus Walleij2010-10-081-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patches the condensed RealView SMP defconfig activating the same 2.6.36 features mentioned in the vanilla RealView defconfig patch submitted earlier. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * ARM: 6365/1: Update RealView defconfigLinus Walleij2010-10-081-2/+13
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patches the condensed RealView defconfig activating some stuff that has been missing from this config for some time and some stuff that was merged in the 2.6.36 merge window: - The new character LCD driver is enabled - The Versatile I2C is enabled - The PL022 SPI driver is enabled - gpiolib is enabled (and makes MMC detection work properly) - The new LEDs code is enabled with a heartbeat trigger - The RTC class is enabled, and the PL031 RTC (onchip) and the offchip DS1307 on I2C is enabled Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | 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>
OpenPOWER on IntegriCloud