summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel-stable' into develRussell King2010-07-311-1/+135
|\ | | | | | | | | | | | | Conflicts: arch/arm/kernel/entry-armv.S arch/arm/kernel/setup.c arch/arm/mm/init.c
| * Merge branch 'arm/booting' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Russell King2010-07-291-0/+105
| |\ | | | | | | | | | | | | | | | | | | into devel-stable Conflicts: arch/arm/Kconfig
| | * ARM: Auto calculate ZRELADDR and provide option for exceptionsEric Miao2010-07-121-0/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As long as the zImage is placed within the 128MB range from the start of memory, ZRELADDR (Address where the decompressed kernel will be placed, usually == PHYS_OFFSET + TEXT_OFFSET) can be determined at run-time by masking PC with 0xf80000000. Running through all the Makefile.boot, all those zreladdr-y addresses == 0x[0-f][08]00_0000 + TEXT_OFFSET can be determined at run-time. Option CONFIG_AUTO_ZRELADDR and CONFIG_ZRELADDR are introduced, CONFIG_ZRELADDR _must_ be explicitly specified if: - ((zreladdr-y - TEXT_OFFSET) & ~0xf8000000) != 0, which means masking PC with 0xf8000000 will result in an incorrect address. Currently this is only a problem on u300. - or the assumption of the zImage being loaded by the bootloader within the first 128MB of RAM is incorrect - or when ZBOOT_ROM is used, where the above assumption is usually wrong. [ukleinek: changed mask from 0xf0000000 to 0xf8000000 for mx1 and shark + some review fixes from the mailing list] Original-Idea-and-Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Eric Miao <eric.miao@canonical.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| | * ARM: deprecate support for old way to pass kernel parametersUwe Kleine-König2010-07-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was deprecated in 2001 and announced to live on for 5 years. For now provide a kernel parameter for those who still need it. Acked-by: Eric Miao <eric.miao@canonical.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc ↵Russell King2010-07-291-0/+15
| |\ \ | | | | | | | | | | | | into devel-stable
| | * | ARM: Add support for the LPC32XX archKevin Wells2010-07-271-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add LPC32XX support in arch/arm/Kconfig and arch/arm/Makefile Signed-off-by: Kevin Wells <wellsk40@gmail.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| * | | Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx ↵Russell King2010-07-221-1/+2
| |\ \ \ | | | | | | | | | | | | | | | into devel-stable
| | * | | ARM: cns3xxx: Add support for PCI Express portsAnton Vorontsov2010-06-081-1/+2
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds PCIe support for CNS3xxx-based boards. The support was tested with a directly attached SKY2 NIC, and EHCI USB controller behind the PLX PEX8112 P2P bridge (to make sure that type1 cfg cycles work as expected). Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stableRussell King2010-07-211-1/+2
| |\ \ \ | | | |/ | | |/|
| * | | Merge git://git.linaro.org/nico/arm_security into devel-stableRussell King2010-06-301-0/+12
| |\ \ \
| | * | | ARM: initial stack protector (-fstack-protector) supportNicolas Pitre2010-06-141-0/+12
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | This is the very basic stuff without the changing canary upon task switch yet. Just the Kconfig option and a constant canary value initialized at boot time. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| * | | Add GPIO support for HTC Dream.Pavel Machek2010-06-151-0/+1
| |/ / | | | | | | | | | | | | | | | Signed-off-by: Pavel Machek <pavel@ucw.cz> [dwalker@codeaurora.org: renamed to trout, checkpatch cleanup] Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
* | | Merge branch 'misc' into develRussell King2010-07-311-5/+2
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: arch/arm/mm/init.c
| * | | ARM: SMP: Always enable clock event broadcast supportRussell King2010-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TWD local timers are unable to wake up the CPU when it is placed into a low power mode, eg. C3. Therefore, we need to adapt things such that the TWD code can cope with this. We do this by always providing a broadcast tick function, and marking the fact that the TWD local timer will stop in low power modes. This means that when the CPU is placed into a low power mode, the core timer code marks this fact, and allows an IPI to be given to the core. Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de>
| * | | ARM: 6251/1: Make SPARSE_IRQ a hidden optioneric miao2010-07-271-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SPARSE_IRQ doesn't need to be a visible option, only those platforms supporting that will select it. Signed-off-by: Eric Miao <eric.miao@canonical.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | Merge branch 'origin' into miscRussell King2010-07-271-1/+2
| |\ \ \ | | | |/ | | |/|
| | | |
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
| \ \ \
*-------. \ \ \ Merge branches 'at91', 'ep93xx', 'kexec', 'iop', 'lmb', 'nomadik', 'nuc', ↵Russell King2010-07-311-19/+34
|\ \ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | / / | | | | |_|/ / | | | |/| | / | | |_|_|_|/ | |/| | | | 'pl', 'spear' and 'versatile' into devel
| | | | | * ARM: 6218/1: Versatile Express: add support for local timers on CA9X4 ↵Will Deacon2010-07-091-2/+3
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daughterboard This patch adds support for the Cortex-A9 local timers available when using the CA9X4 daughterboard with the Versatile Express. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | | * ARM: initial LMB trialRussell King2010-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | | * ARM: Remove DISCONTIGMEM supportRussell King2010-07-161-12/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Everything should now be using sparsemem rather than discontigmem, so remove the code supporting discontigmem from ARM. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 6206/1: CONFIG_FORCE_MAX_ZONEORDER update for SH-Mobile ARMMagnus Damm2010-07-091-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow SH-Mobile ARM users to adjust FORCE_MAX_ZONEORDER. The Kconfig entry is taken from SH and non-4K page size stuff has been trimmed away. For now only SH-Mobile ARM is allowed to change this variable, SA1111 configs are kept at "9" and the rest at "11". CONFIG_FORCE_MAX_ZONEORDER lets the user tweak the maximum amount of physically contiguous memory that can be allocated by the kernel. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 6199/1: Add kprobe-based event tracerWill Deacon2010-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch enables the HAVE_REGS_AND_STACK_ACCESS_API option for ARM which is required by the kprobe events tracer. Code based on the PowerPC port. Cc: Jean Pihet <jpihet@mvista.com> Tested-by: Jamie Iles <jamie.iles@picochip.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | ARM: 6197/2: preliminary support for sparse IRQeric miao2010-07-091-0/+12
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | So to allow NR_IRQS to be dynamic and platforms to specify the number of IRQs really needed. Acked-by: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'shmobile' into develRussell King2010-07-311-0/+1
|\ \ \
| * | | ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128Magnus Damm2010-07-291-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce SHMOBILE_TIMER_HZ for SH-Mobile. Allow users to select HZ on their system to minimize potential timer drift. Use 128 Hz as default to work well with the 32768 Hz RCLK. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'l7200' into develRussell King2010-07-161-16/+0
|\ \ \ | |/ / |/| | | | | | | | Conflicts: arch/arm/configs/lusl7200_defconfig
| * | ARM: Remove support for LinkUp Systems L7200 SDP.Russell King2010-06-241-16/+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: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMUWill Deacon2010-07-011-1/+2
|/ | | | | | | | | | | | | CPU performance event counters on v7 cores will only operate if either the NIDEN or DBGEN signals are driven high. For the OMAP3 platform, these signals are driven low by default but DBGEN can be asserted by selecting the OMAP3_EMU Kconfig option, which enables the virtual clock for hardware debugging peripherals. Acked-by: Jean Pihet <jpihet@mvista.com> Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* Merge branch 'master' into develRussell King2010-05-241-0/+11
|\
| * ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel ↵Alexander Holler2010-05-241-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cmdline Add an option to force usage of the in-kernel cmdline even if the boot loader passes another command string to the kernel. Useful if someone cannot or don't want to change the command-line options of the boot loader but is able to change the kernel. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King2010-05-241-6/+8
|\ \ | |/ |/| | | | | | | | | devel-stable Conflicts: arch/arm/Kconfig
| * ARM: SAMSUNG: Fixup convert arm to arch_gettimeoffset()Ben Dooks2010-05-201-0/+4
| | | | | | | | | | | | | | | | Fixup commit 5cfc8ee0bb5134e1204e1ec5843e164f24315021 which introduced ARCH_USES_GETTIMEOFFSET but missed out several S5P architectures. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p frameworkMarek Szyprowski2010-05-201-6/+3
| | | | | | | | | | | | | | | | | | | | This patch moves S5PC100 SoC support to plat-s5p framework. Most periperal support code has been already moved from plat-s5pc1xx to mach-s5pc100. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | Merge branch 'davinci-for-linus' of ↵Linus Torvalds2010-05-191-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (48 commits) Revert "rtc: omap: let device wakeup capability be configured from chip init logic" DM365: Added more PINMUX configurations for AEMIF DM365: Make CLKOUTx available DM365: Added PINMUX definitions for GPIO30..32 Davinci: iotable based ioremap() interception Davinci: pinmux - use ioremap() Davinci: aintc/cpintc - use ioremap() Davinci: psc - use ioremap() Davinci: timer - use ioremap() Davinci: jtag_id - use ioremap() Davinci: da8xx: rtc - use ioremap Davinci: gpio - use ioremap() davinci: edma: fix coding style issue related to breaking lines davinci: edma: use BIT() wherever possible davinci: edma: fix coding style issue related to usage of braces davinci: edma: use a more intuitive name for edma_info Davinci: serial - conditional reset via pwremu Davinci: serial - use ioremap() Davinci: serial - remove unnecessary define Davinci: watchdog reset separation across socs ... Fix up trivial conflict in arch/arm/Kconfig due to removal of "select GENERIC_TIME"
| * | Davinci: allow SOCs based on other ARM CPUsCyril Chemparathy2010-05-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Preliminary modification prior to adding support for TNETV107X based on ARM1176. This change allows for CPUs other than ARM926T to be used for Davinci derivative SoCs. Existing devices (DA8x and DMx) operate unchanged. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
* | | ARM: remove 'select GENERIC_TIME'Russell King2010-05-181-28/+0
| | | | | | | | | | | | | | | | | | | | | GENERIC_TIME is now enabled by default, so 'select GENERIC_TIME' is redundant. Remove them. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'devel-stable' into develRussell King2010-05-171-6/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig
| * \ \ Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into ↵Russell King2010-05-171-1/+6
| |\ \ \ | | | |/ | | |/| | | | | devel-stable
| | * | ARM: SAMSUNG: Update S3C2416 entry with S3C2450Ben Dooks2010-05-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These devices are so similar that they share the same SoC ID code, so note this. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S3C2416: Add arch supportYauhen Kharuzhy2010-05-101-1/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add arch/arm/mach-s3c2416 for support of the Samsung S3C2416 SoC. This patch adds support of the S3C2416 SoC, clocks, timers, and initial IRQ support (without support of secondary set of registers). Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> [ben-linux@fluff.org: removed files to be reworked, fixed conflicts] [ben-linux@fluff.org: use s3c2443 reset instead of specific reset code] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx ↵Russell King2010-05-031-0/+11
| |\ \ | | | | | | | | | | | | into devel-stable
| | * | ARM: cns3xxx: Add basic support for Cavium Networks CNS3xxx processorsAnton Vorontsov2010-05-021-0/+11
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds very basic support for ECONA CNS3xxx ARM11 MPcore (ARMv6) dual-core processors. Note that SMP is not yet supported, as well as many peripheral devices. Support for these features will be added later. Signed-off-by: Anton Vorontsov <avorontsov@mvista.com>
| * | arm: msm: define HAVE_CLK for ARCH_MSMSteve Muckle2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | | MSM supports the <linux/clk.h> interface. Acked-by: David Brown <davidb@quicinc.com> Signed-off-by: Steve Muckle <smuckle@quicinc.com>
| * | arm: msm: allow ARCH_MSM to have v7 cpusDaniel Walker2010-05-031-5/+5
| |/ | | | | | | | | | | | | | | | | ARCH_MSM supports armv7 cpus, so we're pushed the CPU_V6/CPU_V7 selection down into the arch/arm/mach-msm/Kconfig. Also update the description to be a bit more accurate. Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
| * ARM: 5957/1: ARM: RealView SD/MMC Card detection and write-protect using GPIOLIBColin Tuckley2010-04-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The switch to using GPIOLIB broke the sd/mmc card detection on the RealView development boards if GPIO_PL061 was not selected. This patch selects GPIO_PL061 if GPIOLIB is selected. The sense of the return value from mmc_status has also changed and is corrected. Signed-off-by: Colin Tuckley <colin.tuckley@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'devel-pmu' into develRussell King2010-05-171-24/+2
|\ \
| * | ARM: 6073/1: oprofile: remove old files and update KConfigWill Deacon2010-05-171-24/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable hardware perf-events if CPU_HAS_PMU and select HAVE_OPROFILE if HAVE_PERF_EVENTS. If no hardware support is present, OProfile will fall back to timer mode. This patch also removes the old OProfile drivers in favour of the code implemented by perf. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | ARM: 6136/1: ARCH_REQUIRE_GPIOLIB selects GENERIC_GPIOHartley Sweeten2010-05-171-21/+1
|/ / | | | | | | | | | | | | | | | | | | The ARCH_REQUIRE_GPIOLIB config option will select GPIOLIB which in turn will select GENERIC_GPIO. Because of this, there is no reason to do the select GENERIC_GPIO in arch/arm/Kconfig for the architectures that have ARCH_REQUIRE_GPIOLIB. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', ↵Russell King2010-05-171-19/+77
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'omap', 'pxa', 'spear' and 'versatile' into devel Conflicts: arch/arm/Makefile arch/arm/common/Makefile arch/arm/mm/Kconfig
| | | | * ARM: Add Versatile Express SMP supportRussell King2010-05-021-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
OpenPOWER on IntegriCloud