diff options
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 359d224c8c3e..703a44fa0f9b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -97,9 +97,7 @@ textofs-y := 0x00008000 | |||
97 | machine-$(CONFIG_ARCH_RPC) := rpc | 97 | machine-$(CONFIG_ARCH_RPC) := rpc |
98 | machine-$(CONFIG_ARCH_EBSA110) := ebsa110 | 98 | machine-$(CONFIG_ARCH_EBSA110) := ebsa110 |
99 | machine-$(CONFIG_ARCH_CLPS7500) := clps7500 | 99 | machine-$(CONFIG_ARCH_CLPS7500) := clps7500 |
100 | incdir-$(CONFIG_ARCH_CLPS7500) := cl7500 | ||
101 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 100 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
102 | incdir-$(CONFIG_FOOTBRIDGE) := ebsa285 | ||
103 | machine-$(CONFIG_ARCH_SHARK) := shark | 101 | machine-$(CONFIG_ARCH_SHARK) := shark |
104 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 102 | machine-$(CONFIG_ARCH_SA1100) := sa1100 |
105 | ifeq ($(CONFIG_ARCH_SA1100),y) | 103 | ifeq ($(CONFIG_ARCH_SA1100),y) |
@@ -120,7 +118,6 @@ endif | |||
120 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx | 118 | machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx |
121 | machine-$(CONFIG_ARCH_OMAP1) := omap1 | 119 | machine-$(CONFIG_ARCH_OMAP1) := omap1 |
122 | machine-$(CONFIG_ARCH_OMAP2) := omap2 | 120 | machine-$(CONFIG_ARCH_OMAP2) := omap2 |
123 | incdir-$(CONFIG_ARCH_OMAP) := omap | ||
124 | plat-$(CONFIG_ARCH_OMAP) := omap | 121 | plat-$(CONFIG_ARCH_OMAP) := omap |
125 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 | 122 | machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 |
126 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx | 123 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx |
@@ -138,7 +135,6 @@ endif | |||
138 | machine-$(CONFIG_ARCH_DAVINCI) := davinci | 135 | machine-$(CONFIG_ARCH_DAVINCI) := davinci |
139 | machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood | 136 | machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood |
140 | machine-$(CONFIG_ARCH_KS8695) := ks8695 | 137 | machine-$(CONFIG_ARCH_KS8695) := ks8695 |
141 | incdir-$(CONFIG_ARCH_MXC) := mxc | ||
142 | plat-$(CONFIG_ARCH_MXC) := mxc | 138 | plat-$(CONFIG_ARCH_MXC) := mxc |
143 | machine-$(CONFIG_ARCH_MX2) := mx2 | 139 | machine-$(CONFIG_ARCH_MX2) := mx2 |
144 | machine-$(CONFIG_ARCH_MX3) := mx3 | 140 | machine-$(CONFIG_ARCH_MX3) := mx3 |
@@ -158,11 +154,6 @@ endif | |||
158 | # The byte offset of the kernel image in RAM from the start of RAM. | 154 | # The byte offset of the kernel image in RAM from the start of RAM. |
159 | TEXT_OFFSET := $(textofs-y) | 155 | TEXT_OFFSET := $(textofs-y) |
160 | 156 | ||
161 | ifeq ($(incdir-y),) | ||
162 | incdir-y := $(word 1,$(machine-y)) | ||
163 | endif | ||
164 | INCDIR := arch-$(incdir-y) | ||
165 | |||
166 | # The first directory contains additional information for the boot setup code | 157 | # The first directory contains additional information for the boot setup code |
167 | ifneq ($(machine-y),) | 158 | ifneq ($(machine-y),) |
168 | MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ | 159 | MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ |
@@ -213,20 +204,10 @@ boot := arch/arm/boot | |||
213 | # them changed. We use .arch to indicate when they were updated | 204 | # them changed. We use .arch to indicate when they were updated |
214 | # last, otherwise make uses the target directory mtime. | 205 | # last, otherwise make uses the target directory mtime. |
215 | 206 | ||
216 | include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf | ||
217 | @echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)' | ||
218 | ifneq ($(KBUILD_SRC),) | ||
219 | $(Q)mkdir -p include/asm-arm | ||
220 | $(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch | ||
221 | else | ||
222 | $(Q)ln -fsn $(INCDIR) include/asm-arm/arch | ||
223 | endif | ||
224 | @touch $@ | ||
225 | |||
226 | archprepare: maketools | 207 | archprepare: maketools |
227 | 208 | ||
228 | PHONY += maketools FORCE | 209 | PHONY += maketools FORCE |
229 | maketools: include/linux/version.h include/asm-arm/.arch FORCE | 210 | maketools: include/linux/version.h FORCE |
230 | $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h | 211 | $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h |
231 | 212 | ||
232 | # Convert bzImage to zImage | 213 | # Convert bzImage to zImage |