summaryrefslogtreecommitdiff
path: root/arch/arm/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2011-01-03Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Sascha Hauer1-0/+1
into imx-for-2.6.38-new
2010-12-20ARM: mxs: Add build configuration for mxsShawn Guo1-0/+1
Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-11-19ARM: imx: move mx25 support to mach-imxUwe Kleine-König1-1/+1
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-10-19Merge branch 'for-rmk' of ↵Russell King1-1/+1
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.
2010-10-18ARM: S5P64X0: Update Kconfig and MakefileKukjin Kim1-1/+1
This patch updates the Kconfig and Makefile for the S5P6440 and S5P6450 machines. It also updates arch/arm/ Kconfig and Makefile to include for support ARCH_S5P64X0 with one kernel image. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-10-05Merge branch 'for_rmk' of git://git.linaro.org/kernel/linux-linaro-next into ↵Russell King1-3/+4
devel-stable
2010-10-02ARM: link board specific files after core filesNicolas Pitre1-3/+4
This allows for board specific issues to override decisions made in generic code that might not be suitable due to some errata or the like, by making the initcall hooks from those board specific files run after the core ones, therefore avoiding ugly #ifdef's in core code. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Jason Hui <jason.hui@linaro.org>
2010-09-17ARM: Introduce plat-tccHans J. Koch1-0/+2
This patch introduces support for the tcc platform by creating an arch/arm/plat-tcc and arch/arm/mach-tcc8k directories and adding basic include files plus Kconfig and Makefile. Signed-off-by: "Hans J. Koch" <hjk@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2010-08-15ARM: 6328/1: Build with -fno-dwarf2-cfi-asmMichal Marek1-0/+3
Commit d0679c7 restricted this workaround to powerpc only, but it turns out that ARM needs it as well. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=16310 . Reported-and-Tested-by: Robert Nelson <robertcnelson@gmail.com> Acked-by: Mikael Pettersson <mikpe@it.uu.se> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-08-11Merge branches 'master' and 'devel' into for-linusRussell King1-0/+1
Conflicts: arch/arm/Kconfig arch/arm/mm/Kconfig
2010-08-09Merge branch 'for-rmk' of ↵Russell King1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/Kconfig
2010-08-06[ARM] tegra: initial tegra supportErik Gilling1-0/+1
v2: Fixes from Mike Rapoport - remove unused header files (mach/dma.h and mach/nand.h) - remove tegra 1 references from Makefile.boot v2: fixes from Russell King - remove mach/io.h include from mach/iomap.h - fix whitespace in Kconfig v2: from Colin Cross - fix invalid immediate in debug-macro.S v3: - allow selection of multiple boards Signed-off-by: Colin Cross <ccross@android.com> Signed-off-by: Erik Gilling <konkers@android.com>
2010-08-05ARM: S5PV310: Add new Kconfig and MakefilesChanghwan Youn1-0/+1
This patch adds the Kconfig and Makefile for the new S5PV310 SoC. It also updates arch/arm Kconfig, Makefile and arch/arm/mm/Kconfig to include support for the new S5PV310. Signed-off-by: Changhwan Youn <chaos.youn@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
2010-07-31Merge branch 'devel-stable' into develRussell King1-2/+7
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/kernel/setup.c arch/arm/mm/init.c
2010-07-29Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King1-2/+2
devel-stable
2010-07-29Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc ↵Russell King1-0/+1
into devel-stable
2010-07-27ARM: Add support for the LPC32XX archKevin Wells1-0/+1
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>
2010-06-30ARM: imx: move mx1 support to mach-imxUwe Kleine-König1-1/+1
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-24ARM: Remove support for LinkUp Systems L7200 SDP.Russell King1-1/+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>
2010-06-24ARM: imx: rename mach dir for mx21 and mx27 to mach-imxUwe Kleine-König1-1/+1
Finally all imx code should end up there, start with mach-mx2. While touching all files rename some files to use a hyphen instead of an underscore. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-06-15ARM: initial stack protector (-fstack-protector) supportNicolas Pitre1-0/+4
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>
2010-05-25Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King1-2/+1
devel-stable Conflicts: arch/arm/Kconfig
2010-05-20ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p frameworkMarek Szyprowski1-2/+1
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>
2010-05-19Merge branch 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linuxLinus Torvalds1-0/+2
* 'for-linus/samsung4' of git://git.fluff.org/bjdooks/linux: (98 commits) Input: s3c24xx_ts - depend on SAMSUNG_DEV_TS and update menu entry Input: s3c24xx_ts - Add FEAT for Samsung touchscreen support Input: s3c24xx_ts - Implement generic GPIO configuration callback ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen ARM: S3C64XX: Add touchscreen platform device definition ARM: SAMSUNG: Move mach/ts.h to plat/ts.h ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100 ARM: S5PC100: gpio.h cleanup ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100 ARM: S5PC100: Use common functions for gpiolib implementation drivers: serial: S5PC100 serial driver cleanup ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move ARM: SAMSUNG: Copy common I2C0 device helpers to machine directories ARM: SAMSUNG: move driver strength gpio configuration helper to common dir ARM: S5PV210: Add GPIOlib support ARM: SAMSUNGy: fix broken timer irq base ARM: SMDK6440: Add audio devices on board ARM: S5P6440: Add audio platform devices ...
2010-05-19ARM: Merge for-2635/fb-updates1Ben Dooks1-1/+1
Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
2010-05-17Merge branch 'devel-stable' into develRussell King1-1/+2
Conflicts: arch/arm/Kconfig arch/arm/include/asm/system.h arch/arm/mm/Kconfig
2010-05-17Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', ↵Russell King1-0/+7
'omap', 'pxa', 'spear' and 'versatile' into devel Conflicts: arch/arm/Makefile arch/arm/common/Makefile arch/arm/mm/Kconfig
2010-05-17Merge branch 'for-rmk/2635' of git://git.fluff.org/bjdooks/linux into ↵Russell King1-1/+1
devel-stable
2010-05-12ARM: S3C24XX: Locate kernel at 0x30108000 if PM_H1940 is enabledVasily Khoruzhick1-0/+2
If PM_H1940 is enabled, kernel _must_ be located upper then 0x30008000, because this area (0x30000000-0x30100000) can be used by bootloader. If kernel is located at 0x30008000, bootloader will corrupt kernel's code during resume. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-10ARM: S3C2416: Add arch supportYauhen Kharuzhy1-1/+1
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>
2010-05-02ARM: cns3xxx: Add basic support for Cavium Networks CNS3xxx processorsAnton Vorontsov1-0/+1
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>
2010-05-02ARM: Add Versatile Express supportRussell King1-0/+1
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-02ARM: Realview/Versatile/Integrator: separate out common clock codeRussell King1-0/+1
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-04-14ARM: 6016/1: ST SPEAr: Added support for SPEAr platform and machines in ↵viresh kumar1-0/+5
arch/arm/ 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>
2010-03-08Merge branch 'origin' into devel-stableRussell King1-0/+1
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
2010-03-03Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into ↵Russell King1-6/+8
devel-stable Conflicts: arch/arm/Kconfig arch/arm/Makefile
2010-03-03Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into ↵Russell King1-0/+1
devel-stable Conflicts: arch/arm/Kconfig
2010-03-03Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King1-0/+1
devel-stable Conflicts: arch/arm/Makefile
2010-03-01Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds1-0/+1
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits) ARM: Eliminate decompressor -Dstatic= PIC hack ARM: 5958/1: ARM: U300: fix inverted clk round rate ARM: 5956/1: misplaced parentheses ARM: 5955/1: ep93xx: move timer defines into core.c and document ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c ARM: 5953/1: ep93xx: fix broken build of clock.c ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig ARM: 5949/1: NUC900 add gpio virtual memory map ARM: 5948/1: Enable timer0 to time4 clock support for nuc910 ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk ARM: make_coherent(): fix problems with highpte, part 2 MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself ARM: 5945/1: ep93xx: include correct irq.h in core.c ARM: 5933/1: amba-pl011: support hardware flow control ARM: 5930/1: Add PKMAP area description to memory.txt. ARM: 5929/1: Add checks to detect overlap of memory regions. ARM: 5928/1: Change type of VMALLOC_END to unsigned long. ARM: 5927/1: Make delimiters of DMA area globally visibly. ARM: 5926/1: Add "Virtual kernel memory..." printout. ARM: 5920/1: OMAP4: Enable L2 Cache ... Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-02-26Merge branch 'tmpreg' into develRussell King1-2/+2
Conflicts: arch/arm/Kconfig arch/arm/mach-ux500/include/mach/debug-macro.S
2010-02-25ARM: S5PV210: Update Kconfig and MakefilesKukjin Kim1-0/+1
Updates arch/arm Kconfig and Makefile for building the S5PV210 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5PV210. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-02-24ARM: S5P6442: Update Kconfig and MakefilesKukjin Kim1-0/+1
Updates arch/arm Kconfig and Makefile for building the S5P6442 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5P6442. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-02-24ARM: SAMSUNG: Eliminate plat-s3cBen Dooks1-4/+4
The plat-s3c directory is now clear, so remove the files in it and expunge it from the build process. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-02-23ARM: Merge next-samsung-s3c64xx-platdeletionBen Dooks1-2/+2
Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung Conflicts: arch/arm/mach-s3c64xx/Makefile (fixed)
2010-02-23ARM: S3C64XX: Eliminate plat-s3c64xxBen Dooks1-1/+1
Now we've move the support out of plat-s3c64xx for everything, eliminate the platform directory arch/arm/plat-s3c64xx and remove it from the ARM build configuration. Note, PLAT_S3C64XX is kept around for the moment until the drivers that depend on it can be updated, so it is moved to the mach-s3c64xx Kconfig. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-02-21ARM: S3C64XX: Remove plat-s3c64xx Kconfig and PLAT_S3C64XXBen Dooks1-1/+1
Remove the Kconfig and PLAT_S3C64XX defines for the previous S3C64XX directory structure now that the code is moved into mach-s3c64xx. Note, we cannot currently remove plat-s3c64xx directory as we have a pair of include files used within plat-s3c and plat-samsung that need to find a new home. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-02-16Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stableRussell King1-3/+3
Conflicts: arch/arm/Makefile
2010-02-09mxc: Add support for the Babbage board (i.MX5)Amit Kucheria1-0/+1
Babbage is a reference board from Freescale for their i.MX51 SoC. Add board definition, Kconfig and Makefiles to enable Freescale i.MX51 processor and Babbage board. Boot tested on a Babbage2.5 board Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
2010-02-08ARM: mach-shmobile: SH-Mobile G3 support.Magnus Damm1-0/+1
This adds preliminary support for the SH-Mobile G-series. The SH-Mobile G-series is a series of ARM/SH multi-core CPUs that aside from the ARM MPU are primarily composed of existing SH IP blocks. This includes initial support for the SH7367 (SH-Mobile G3) CPU and the G3EVM reference board. Only timer, serial console, and NOR flash are supported at this point. Patches for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2010-02-01ARM: S3C24XX: Remove old mach-s3c2442Ben Dooks1-1/+1
Remove the old mach-s3c2442 directory now all is merged into mach-s3c2440 and remove it from the arch/arm build process. Signed-off-by: Ben Dooks <ben-linux@fluff.org>