diff options
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 148 |
1 files changed, 74 insertions, 74 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index a2eb4fe068b9..770da51242c4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -135,83 +135,78 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000 | |||
135 | 135 | ||
136 | # Machine directory name. This list is sorted alphanumerically | 136 | # Machine directory name. This list is sorted alphanumerically |
137 | # by CONFIG_* macro name. | 137 | # by CONFIG_* macro name. |
138 | machine-$(CONFIG_ARCH_AT91) := at91 | 138 | machine-$(CONFIG_ARCH_AT91) += at91 |
139 | machine-$(CONFIG_ARCH_BCM2835) := bcm2835 | 139 | machine-$(CONFIG_ARCH_BCM2835) += bcm2835 |
140 | machine-$(CONFIG_ARCH_CLPS711X) := clps711x | 140 | machine-$(CONFIG_ARCH_CLPS711X) += clps711x |
141 | machine-$(CONFIG_ARCH_CNS3XXX) := cns3xxx | 141 | machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx |
142 | machine-$(CONFIG_ARCH_DAVINCI) := davinci | 142 | machine-$(CONFIG_ARCH_DAVINCI) += davinci |
143 | machine-$(CONFIG_ARCH_DOVE) := dove | 143 | machine-$(CONFIG_ARCH_DOVE) += dove |
144 | machine-$(CONFIG_ARCH_EBSA110) := ebsa110 | 144 | machine-$(CONFIG_ARCH_EBSA110) += ebsa110 |
145 | machine-$(CONFIG_ARCH_EP93XX) := ep93xx | 145 | machine-$(CONFIG_ARCH_EP93XX) += ep93xx |
146 | machine-$(CONFIG_ARCH_GEMINI) := gemini | 146 | machine-$(CONFIG_ARCH_GEMINI) += gemini |
147 | machine-$(CONFIG_ARCH_H720X) := h720x | 147 | machine-$(CONFIG_ARCH_H720X) += h720x |
148 | machine-$(CONFIG_ARCH_HIGHBANK) := highbank | 148 | machine-$(CONFIG_ARCH_HIGHBANK) += highbank |
149 | machine-$(CONFIG_ARCH_INTEGRATOR) := integrator | 149 | machine-$(CONFIG_ARCH_INTEGRATOR) += integrator |
150 | machine-$(CONFIG_ARCH_IOP13XX) := iop13xx | 150 | machine-$(CONFIG_ARCH_IOP13XX) += iop13xx |
151 | machine-$(CONFIG_ARCH_IOP32X) := iop32x | 151 | machine-$(CONFIG_ARCH_IOP32X) += iop32x |
152 | machine-$(CONFIG_ARCH_IOP33X) := iop33x | 152 | machine-$(CONFIG_ARCH_IOP33X) += iop33x |
153 | machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx | 153 | machine-$(CONFIG_ARCH_IXP4XX) += ixp4xx |
154 | machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood | 154 | machine-$(CONFIG_ARCH_KIRKWOOD) += kirkwood |
155 | machine-$(CONFIG_ARCH_KS8695) := ks8695 | 155 | machine-$(CONFIG_ARCH_KS8695) += ks8695 |
156 | machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx | 156 | machine-$(CONFIG_ARCH_LPC32XX) += lpc32xx |
157 | machine-$(CONFIG_ARCH_MMP) := mmp | 157 | machine-$(CONFIG_ARCH_MMP) += mmp |
158 | machine-$(CONFIG_ARCH_MSM) := msm | 158 | machine-$(CONFIG_ARCH_MSM) += msm |
159 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 159 | machine-$(CONFIG_ARCH_MV78XX0) += mv78xx0 |
160 | machine-$(CONFIG_ARCH_IMX_V4_V5) := imx | 160 | machine-$(CONFIG_ARCH_MXC) += imx |
161 | machine-$(CONFIG_ARCH_IMX_V6_V7) := imx | 161 | machine-$(CONFIG_ARCH_MXS) += mxs |
162 | machine-$(CONFIG_ARCH_MXS) := mxs | 162 | machine-$(CONFIG_ARCH_MVEBU) += mvebu |
163 | machine-$(CONFIG_ARCH_MVEBU) := mvebu | 163 | machine-$(CONFIG_ARCH_NETX) += netx |
164 | machine-$(CONFIG_ARCH_NETX) := netx | 164 | machine-$(CONFIG_ARCH_NOMADIK) += nomadik |
165 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik | 165 | machine-$(CONFIG_ARCH_OMAP1) += omap1 |
166 | machine-$(CONFIG_ARCH_OMAP1) := omap1 | 166 | machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 |
167 | machine-$(CONFIG_ARCH_OMAP2PLUS) := omap2 | 167 | machine-$(CONFIG_ARCH_ORION5X) += orion5x |
168 | machine-$(CONFIG_ARCH_ORION5X) := orion5x | 168 | machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell |
169 | machine-$(CONFIG_ARCH_PICOXCELL) := picoxcell | 169 | machine-$(CONFIG_ARCH_PRIMA2) += prima2 |
170 | machine-$(CONFIG_ARCH_PRIMA2) := prima2 | 170 | machine-$(CONFIG_ARCH_PXA) += pxa |
171 | machine-$(CONFIG_ARCH_PXA) := pxa | 171 | machine-$(CONFIG_ARCH_REALVIEW) += realview |
172 | machine-$(CONFIG_ARCH_REALVIEW) := realview | 172 | machine-$(CONFIG_ARCH_RPC) += rpc |
173 | machine-$(CONFIG_ARCH_RPC) := rpc | 173 | machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx s3c2412 s3c2440 |
174 | machine-$(CONFIG_ARCH_S3C24XX) := s3c24xx s3c2412 s3c2440 | 174 | machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx |
175 | machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx | 175 | machine-$(CONFIG_ARCH_S5P64X0) += s5p64x0 |
176 | machine-$(CONFIG_ARCH_S5P64X0) := s5p64x0 | 176 | machine-$(CONFIG_ARCH_S5PC100) += s5pc100 |
177 | machine-$(CONFIG_ARCH_S5PC100) := s5pc100 | 177 | machine-$(CONFIG_ARCH_S5PV210) += s5pv210 |
178 | machine-$(CONFIG_ARCH_S5PV210) := s5pv210 | 178 | machine-$(CONFIG_ARCH_EXYNOS) += exynos |
179 | machine-$(CONFIG_ARCH_EXYNOS4) := exynos | 179 | machine-$(CONFIG_ARCH_SA1100) += sa1100 |
180 | machine-$(CONFIG_ARCH_EXYNOS5) := exynos | 180 | machine-$(CONFIG_ARCH_SHARK) += shark |
181 | machine-$(CONFIG_ARCH_SA1100) := sa1100 | 181 | machine-$(CONFIG_ARCH_SHMOBILE) += shmobile |
182 | machine-$(CONFIG_ARCH_SHARK) := shark | 182 | machine-$(CONFIG_ARCH_TEGRA) += tegra |
183 | machine-$(CONFIG_ARCH_SHMOBILE) := shmobile | 183 | machine-$(CONFIG_ARCH_U300) += u300 |
184 | machine-$(CONFIG_ARCH_TEGRA) := tegra | 184 | machine-$(CONFIG_ARCH_U8500) += ux500 |
185 | machine-$(CONFIG_ARCH_U300) := u300 | 185 | machine-$(CONFIG_ARCH_VERSATILE) += versatile |
186 | machine-$(CONFIG_ARCH_U8500) := ux500 | 186 | machine-$(CONFIG_ARCH_VEXPRESS) += vexpress |
187 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 187 | machine-$(CONFIG_ARCH_VT8500) += vt8500 |
188 | machine-$(CONFIG_ARCH_VEXPRESS) := vexpress | 188 | machine-$(CONFIG_ARCH_W90X900) += w90x900 |
189 | machine-$(CONFIG_ARCH_VT8500) := vt8500 | 189 | machine-$(CONFIG_FOOTBRIDGE) += footbridge |
190 | machine-$(CONFIG_ARCH_W90X900) := w90x900 | 190 | machine-$(CONFIG_ARCH_SOCFPGA) += socfpga |
191 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 191 | machine-$(CONFIG_ARCH_SPEAR13XX) += spear13xx |
192 | machine-$(CONFIG_ARCH_SOCFPGA) := socfpga | 192 | machine-$(CONFIG_ARCH_SPEAR3XX) += spear3xx |
193 | machine-$(CONFIG_MACH_SPEAR1310) := spear13xx | 193 | machine-$(CONFIG_MACH_SPEAR600) += spear6xx |
194 | machine-$(CONFIG_MACH_SPEAR1340) := spear13xx | 194 | machine-$(CONFIG_ARCH_ZYNQ) += zynq |
195 | machine-$(CONFIG_MACH_SPEAR300) := spear3xx | ||
196 | machine-$(CONFIG_MACH_SPEAR310) := spear3xx | ||
197 | machine-$(CONFIG_MACH_SPEAR320) := spear3xx | ||
198 | machine-$(CONFIG_MACH_SPEAR600) := spear6xx | ||
199 | machine-$(CONFIG_ARCH_ZYNQ) := zynq | ||
200 | 195 | ||
201 | # Platform directory name. This list is sorted alphanumerically | 196 | # Platform directory name. This list is sorted alphanumerically |
202 | # by CONFIG_* macro name. | 197 | # by CONFIG_* macro name. |
203 | plat-$(CONFIG_ARCH_MXC) := mxc | 198 | plat-$(CONFIG_ARCH_MXC) += mxc |
204 | plat-$(CONFIG_ARCH_OMAP) := omap | 199 | plat-$(CONFIG_ARCH_OMAP) += omap |
205 | plat-$(CONFIG_ARCH_S3C64XX) := samsung | 200 | plat-$(CONFIG_ARCH_S3C64XX) += samsung |
206 | plat-$(CONFIG_ARCH_ZYNQ) := versatile | 201 | plat-$(CONFIG_ARCH_ZYNQ) += versatile |
207 | plat-$(CONFIG_PLAT_IOP) := iop | 202 | plat-$(CONFIG_PLAT_IOP) += iop |
208 | plat-$(CONFIG_PLAT_NOMADIK) := nomadik | 203 | plat-$(CONFIG_PLAT_NOMADIK) += nomadik |
209 | plat-$(CONFIG_PLAT_ORION) := orion | 204 | plat-$(CONFIG_PLAT_ORION) += orion |
210 | plat-$(CONFIG_PLAT_PXA) := pxa | 205 | plat-$(CONFIG_PLAT_PXA) += pxa |
211 | plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung | 206 | plat-$(CONFIG_PLAT_S3C24XX) += s3c24xx samsung |
212 | plat-$(CONFIG_PLAT_S5P) := samsung | 207 | plat-$(CONFIG_PLAT_S5P) += samsung |
213 | plat-$(CONFIG_PLAT_SPEAR) := spear | 208 | plat-$(CONFIG_PLAT_SPEAR) += spear |
214 | plat-$(CONFIG_PLAT_VERSATILE) := versatile | 209 | plat-$(CONFIG_PLAT_VERSATILE) += versatile |
215 | 210 | ||
216 | ifeq ($(CONFIG_ARCH_EBSA110),y) | 211 | ifeq ($(CONFIG_ARCH_EBSA110),y) |
217 | # This is what happens if you forget the IOCS16 line. | 212 | # This is what happens if you forget the IOCS16 line. |
@@ -229,15 +224,20 @@ MACHINE := arch/arm/mach-$(word 1,$(machine-y))/ | |||
229 | else | 224 | else |
230 | MACHINE := | 225 | MACHINE := |
231 | endif | 226 | endif |
227 | ifeq ($(CONFIG_ARCH_MULTIPLATFORM),y) | ||
228 | MACHINE := | ||
229 | endif | ||
232 | 230 | ||
233 | machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) | 231 | machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) |
234 | platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y)) | 232 | platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y)) |
235 | 233 | ||
234 | ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) | ||
236 | ifeq ($(KBUILD_SRC),) | 235 | ifeq ($(KBUILD_SRC),) |
237 | KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) | 236 | KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs)) |
238 | else | 237 | else |
239 | KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) | 238 | KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) |
240 | endif | 239 | endif |
240 | endif | ||
241 | 241 | ||
242 | export TEXT_OFFSET GZFLAGS MMUEXT | 242 | export TEXT_OFFSET GZFLAGS MMUEXT |
243 | 243 | ||