diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-26 19:10:11 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-26 19:10:11 -0400 |
| commit | 542f869f1826f092606efd0c4c771f070d1314f5 (patch) | |
| tree | 9c9d265ab0c87ea7862ccb70933f33d3d7011334 /arch/arm/Makefile | |
| parent | e8b374bb6c888a70530d800c9e2fcd153e2c325d (diff) | |
| parent | 839e642f3dda44a35c6a91780bff41d84c288022 (diff) | |
Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel
Conflicts:
arch/arm/mm/Kconfig
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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 95186ef17e1..e84729bf13d 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -72,6 +72,7 @@ tune-$(CONFIG_CPU_ARM920T) :=-mtune=arm9tdmi | |||
| 72 | tune-$(CONFIG_CPU_ARM922T) :=-mtune=arm9tdmi | 72 | tune-$(CONFIG_CPU_ARM922T) :=-mtune=arm9tdmi |
| 73 | tune-$(CONFIG_CPU_ARM925T) :=-mtune=arm9tdmi | 73 | tune-$(CONFIG_CPU_ARM925T) :=-mtune=arm9tdmi |
| 74 | tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi | 74 | tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi |
| 75 | tune-$(CONFIG_CPU_FA526) :=-mtune=arm9tdmi | ||
| 75 | tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 | 76 | tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 |
| 76 | tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 | 77 | tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 |
| 77 | tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale | 78 | tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale |
| @@ -113,6 +114,7 @@ endif | |||
| 113 | plat-$(CONFIG_PLAT_PXA) := pxa | 114 | plat-$(CONFIG_PLAT_PXA) := pxa |
| 114 | machine-$(CONFIG_ARCH_L7200) := l7200 | 115 | machine-$(CONFIG_ARCH_L7200) := l7200 |
| 115 | machine-$(CONFIG_ARCH_INTEGRATOR) := integrator | 116 | machine-$(CONFIG_ARCH_INTEGRATOR) := integrator |
| 117 | machine-$(CONFIG_ARCH_GEMINI) := gemini | ||
| 116 | textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 | 118 | textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000 |
| 117 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x | 119 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x |
| 118 | machine-$(CONFIG_ARCH_IOP32X) := iop32x | 120 | machine-$(CONFIG_ARCH_IOP32X) := iop32x |