diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 18:40:39 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 18:40:39 -0500 |
| commit | ea14fad0d416354a4e9bb1a04f32acba706f9548 (patch) | |
| tree | 2c8acc5331f189aef1d40ddce3f40d6be9314e77 /arch/arm/Makefile | |
| parent | 6ee7e78e7c78d871409ad4df30551c9355be7d0e (diff) | |
| parent | 6705cda24fad1cb0ac82ac4f312df8ec735b39b0 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
[ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
[ARM] 4001/1: S3C24XX: shorten reboot time
[ARM] 3983/2: remove unused argument to __bug()
[ARM] 4000/1: Osiris: add third serial port in
[ARM] 3999/1: RX3715: suspend to RAM support
[ARM] 3998/1: VR1000: LED platform devices
[ARM] 3995/1: iop13xx: add iop13xx support
[ARM] 3968/1: iop13xx: add iop13xx_defconfig
[ARM] Update mach-types
[ARM] Allow gcc to optimise arm_add_memory a little more
[ARM] 3991/1: i.MX/MX1 high resolution time source
[ARM] 3990/1: i.MX/MX1 more precise PLL decode
[ARM] 3986/1: H1940: suspend to RAM support
[ARM] 3985/1: ixp4xx clocksource cleanup
[ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
[ARM] 3994/1: ixp23xx: fix handling of pci master aborts
[ARM] 3981/1: sched_clock for PXA2xx
[ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
[ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
[ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
...
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 6f4f8bf36071..000f1100b553 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -15,6 +15,8 @@ CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) | |||
| 15 | OBJCOPYFLAGS :=-O binary -R .note -R .comment -S | 15 | OBJCOPYFLAGS :=-O binary -R .note -R .comment -S |
| 16 | GZFLAGS :=-9 | 16 | GZFLAGS :=-9 |
| 17 | #CFLAGS +=-pipe | 17 | #CFLAGS +=-pipe |
| 18 | # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: | ||
| 19 | CFLAGS +=$(call cc-option,-marm,) | ||
| 18 | 20 | ||
| 19 | # Do not use arch/arm/defconfig - it's always outdated. | 21 | # Do not use arch/arm/defconfig - it's always outdated. |
| 20 | # Select a platform tht is kept up-to-date | 22 | # Select a platform tht is kept up-to-date |
| @@ -108,6 +110,7 @@ endif | |||
| 108 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x | 110 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x |
| 109 | machine-$(CONFIG_ARCH_IOP32X) := iop32x | 111 | machine-$(CONFIG_ARCH_IOP32X) := iop32x |
| 110 | machine-$(CONFIG_ARCH_IOP33X) := iop33x | 112 | machine-$(CONFIG_ARCH_IOP33X) := iop33x |
| 113 | machine-$(CONFIG_ARCH_IOP13XX) := iop13xx | ||
| 111 | machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx | 114 | machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx |
| 112 | machine-$(CONFIG_ARCH_IXP2000) := ixp2000 | 115 | machine-$(CONFIG_ARCH_IXP2000) := ixp2000 |
| 113 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx | 116 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx |