diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 16:53:03 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 16:53:03 -0500 |
| commit | ca9ba4471c1203bb6e759b76e83167fec54fe590 (patch) | |
| tree | 8aeb359631742f77f635cb5ff785bea9132502f9 /arch/arm/Makefile | |
| parent | d4965b3e2ff94d0c7b7e6e7e9794b54950a2f4b9 (diff) | |
| parent | c4713074375c61f939310b04e92090afe29810dc (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3388/1: ixp23xx: add core ixp23xx support
[ARM] 3417/1: add support for logicpd pxa270 card engine
[ARM] 3387/1: ixp23xx: add defconfig
[ARM] 3377/2: add support for intel xsc3 core
[ARM] Move ice-dcc code into misc.c
[ARM] Fix decompressor serial IO to give CRLF not LFCR
[ARM] proc-v6: mark page table walks outer-cacheable, shared. Enable NX.
[ARM] nommu: trivial patch for arch/arm/lib/Makefile
[ARM] 3416/1: Update LART site URL
[ARM] 3415/1: Akita: Add missing EXPORT_SYMBOL
[ARM] 3414/1: ep93xx: reset ethernet controller before uncompressing
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 99c0d323719a..ce3e804ea0f3 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -57,6 +57,7 @@ tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi | |||
| 57 | tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 | 57 | tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 |
| 58 | tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 | 58 | tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 |
| 59 | tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale | 59 | tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale |
| 60 | tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale | ||
| 60 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) | 61 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) |
| 61 | 62 | ||
| 62 | ifeq ($(CONFIG_AEABI),y) | 63 | ifeq ($(CONFIG_AEABI),y) |
| @@ -97,6 +98,7 @@ endif | |||
| 97 | machine-$(CONFIG_ARCH_IOP3XX) := iop3xx | 98 | machine-$(CONFIG_ARCH_IOP3XX) := iop3xx |
| 98 | machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx | 99 | machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx |
| 99 | machine-$(CONFIG_ARCH_IXP2000) := ixp2000 | 100 | machine-$(CONFIG_ARCH_IXP2000) := ixp2000 |
| 101 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx | ||
| 100 | machine-$(CONFIG_ARCH_OMAP1) := omap1 | 102 | machine-$(CONFIG_ARCH_OMAP1) := omap1 |
| 101 | machine-$(CONFIG_ARCH_OMAP2) := omap2 | 103 | machine-$(CONFIG_ARCH_OMAP2) := omap2 |
| 102 | incdir-$(CONFIG_ARCH_OMAP) := omap | 104 | incdir-$(CONFIG_ARCH_OMAP) := omap |