diff options
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 67 |
1 files changed, 40 insertions, 27 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 1ba358ba16b8..c0ac0f5e5e5c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -59,37 +59,44 @@ comma = , | |||
59 | # Note that GCC does not numerically define an architecture version | 59 | # Note that GCC does not numerically define an architecture version |
60 | # macro, but instead defines a whole series of macros which makes | 60 | # macro, but instead defines a whole series of macros which makes |
61 | # testing for a specific architecture or later rather impossible. | 61 | # testing for a specific architecture or later rather impossible. |
62 | arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) | 62 | arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m |
63 | arch-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) | 63 | arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) |
64 | arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) | ||
64 | # Only override the compiler option if ARMv6. The ARMv6K extensions are | 65 | # Only override the compiler option if ARMv6. The ARMv6K extensions are |
65 | # always available in ARMv7 | 66 | # always available in ARMv7 |
66 | ifeq ($(CONFIG_CPU_32v6),y) | 67 | ifeq ($(CONFIG_CPU_32v6),y) |
67 | arch-$(CONFIG_CPU_32v6K) :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k) | 68 | arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k) |
68 | endif | 69 | endif |
69 | arch-$(CONFIG_CPU_32v5) :=-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t) | 70 | arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t) |
70 | arch-$(CONFIG_CPU_32v4T) :=-D__LINUX_ARM_ARCH__=4 -march=armv4t | 71 | arch-$(CONFIG_CPU_32v4T) =-D__LINUX_ARM_ARCH__=4 -march=armv4t |
71 | arch-$(CONFIG_CPU_32v4) :=-D__LINUX_ARM_ARCH__=4 -march=armv4 | 72 | arch-$(CONFIG_CPU_32v4) =-D__LINUX_ARM_ARCH__=4 -march=armv4 |
72 | arch-$(CONFIG_CPU_32v3) :=-D__LINUX_ARM_ARCH__=3 -march=armv3 | 73 | arch-$(CONFIG_CPU_32v3) =-D__LINUX_ARM_ARCH__=3 -march=armv3 |
74 | |||
75 | # Evaluate arch cc-option calls now | ||
76 | arch-y := $(arch-y) | ||
73 | 77 | ||
74 | # This selects how we optimise for the processor. | 78 | # This selects how we optimise for the processor. |
75 | tune-$(CONFIG_CPU_ARM7TDMI) :=-mtune=arm7tdmi | 79 | tune-$(CONFIG_CPU_ARM7TDMI) =-mtune=arm7tdmi |
76 | tune-$(CONFIG_CPU_ARM720T) :=-mtune=arm7tdmi | 80 | tune-$(CONFIG_CPU_ARM720T) =-mtune=arm7tdmi |
77 | tune-$(CONFIG_CPU_ARM740T) :=-mtune=arm7tdmi | 81 | tune-$(CONFIG_CPU_ARM740T) =-mtune=arm7tdmi |
78 | tune-$(CONFIG_CPU_ARM9TDMI) :=-mtune=arm9tdmi | 82 | tune-$(CONFIG_CPU_ARM9TDMI) =-mtune=arm9tdmi |
79 | tune-$(CONFIG_CPU_ARM940T) :=-mtune=arm9tdmi | 83 | tune-$(CONFIG_CPU_ARM940T) =-mtune=arm9tdmi |
80 | tune-$(CONFIG_CPU_ARM946E) :=$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi) | 84 | tune-$(CONFIG_CPU_ARM946E) =$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi) |
81 | tune-$(CONFIG_CPU_ARM920T) :=-mtune=arm9tdmi | 85 | tune-$(CONFIG_CPU_ARM920T) =-mtune=arm9tdmi |
82 | tune-$(CONFIG_CPU_ARM922T) :=-mtune=arm9tdmi | 86 | tune-$(CONFIG_CPU_ARM922T) =-mtune=arm9tdmi |
83 | tune-$(CONFIG_CPU_ARM925T) :=-mtune=arm9tdmi | 87 | tune-$(CONFIG_CPU_ARM925T) =-mtune=arm9tdmi |
84 | tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi | 88 | tune-$(CONFIG_CPU_ARM926T) =-mtune=arm9tdmi |
85 | tune-$(CONFIG_CPU_FA526) :=-mtune=arm9tdmi | 89 | tune-$(CONFIG_CPU_FA526) =-mtune=arm9tdmi |
86 | tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110 | 90 | tune-$(CONFIG_CPU_SA110) =-mtune=strongarm110 |
87 | tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100 | 91 | tune-$(CONFIG_CPU_SA1100) =-mtune=strongarm1100 |
88 | tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale | 92 | tune-$(CONFIG_CPU_XSCALE) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale |
89 | tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale | 93 | tune-$(CONFIG_CPU_XSC3) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale |
90 | tune-$(CONFIG_CPU_FEROCEON) :=$(call cc-option,-mtune=marvell-f,-mtune=xscale) | 94 | tune-$(CONFIG_CPU_FEROCEON) =$(call cc-option,-mtune=marvell-f,-mtune=xscale) |
91 | tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) | 95 | tune-$(CONFIG_CPU_V6) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) |
92 | tune-$(CONFIG_CPU_V6K) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) | 96 | tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm) |
97 | |||
98 | # Evaluate tune cc-option calls now | ||
99 | tune-y := $(tune-y) | ||
93 | 100 | ||
94 | ifeq ($(CONFIG_AEABI),y) | 101 | ifeq ($(CONFIG_AEABI),y) |
95 | CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork | 102 | CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork |
@@ -164,13 +171,15 @@ machine-$(CONFIG_ARCH_MXS) += mxs | |||
164 | machine-$(CONFIG_ARCH_MVEBU) += mvebu | 171 | machine-$(CONFIG_ARCH_MVEBU) += mvebu |
165 | machine-$(CONFIG_ARCH_NETX) += netx | 172 | machine-$(CONFIG_ARCH_NETX) += netx |
166 | machine-$(CONFIG_ARCH_NOMADIK) += nomadik | 173 | machine-$(CONFIG_ARCH_NOMADIK) += nomadik |
174 | machine-$(CONFIG_ARCH_NSPIRE) += nspire | ||
167 | machine-$(CONFIG_ARCH_OMAP1) += omap1 | 175 | machine-$(CONFIG_ARCH_OMAP1) += omap1 |
168 | machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 | 176 | machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 |
169 | machine-$(CONFIG_ARCH_ORION5X) += orion5x | 177 | machine-$(CONFIG_ARCH_ORION5X) += orion5x |
170 | machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell | 178 | machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell |
171 | machine-$(CONFIG_ARCH_PRIMA2) += prima2 | 179 | machine-$(CONFIG_ARCH_SIRF) += prima2 |
172 | machine-$(CONFIG_ARCH_PXA) += pxa | 180 | machine-$(CONFIG_ARCH_PXA) += pxa |
173 | machine-$(CONFIG_ARCH_REALVIEW) += realview | 181 | machine-$(CONFIG_ARCH_REALVIEW) += realview |
182 | machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip | ||
174 | machine-$(CONFIG_ARCH_RPC) += rpc | 183 | machine-$(CONFIG_ARCH_RPC) += rpc |
175 | machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx | 184 | machine-$(CONFIG_ARCH_S3C24XX) += s3c24xx |
176 | machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx | 185 | machine-$(CONFIG_ARCH_S3C64XX) += s3c64xx |
@@ -191,12 +200,15 @@ machine-$(CONFIG_ARCH_W90X900) += w90x900 | |||
191 | machine-$(CONFIG_FOOTBRIDGE) += footbridge | 200 | machine-$(CONFIG_FOOTBRIDGE) += footbridge |
192 | machine-$(CONFIG_ARCH_SOCFPGA) += socfpga | 201 | machine-$(CONFIG_ARCH_SOCFPGA) += socfpga |
193 | machine-$(CONFIG_PLAT_SPEAR) += spear | 202 | machine-$(CONFIG_PLAT_SPEAR) += spear |
203 | machine-$(CONFIG_ARCH_STI) += sti | ||
194 | machine-$(CONFIG_ARCH_VIRT) += virt | 204 | machine-$(CONFIG_ARCH_VIRT) += virt |
195 | machine-$(CONFIG_ARCH_ZYNQ) += zynq | 205 | machine-$(CONFIG_ARCH_ZYNQ) += zynq |
196 | machine-$(CONFIG_ARCH_SUNXI) += sunxi | 206 | machine-$(CONFIG_ARCH_SUNXI) += sunxi |
207 | machine-$(CONFIG_ARCH_KEYSTONE) += keystone | ||
197 | 208 | ||
198 | # Platform directory name. This list is sorted alphanumerically | 209 | # Platform directory name. This list is sorted alphanumerically |
199 | # by CONFIG_* macro name. | 210 | # by CONFIG_* macro name. |
211 | plat-$(CONFIG_ARCH_EXYNOS) += samsung | ||
200 | plat-$(CONFIG_ARCH_OMAP) += omap | 212 | plat-$(CONFIG_ARCH_OMAP) += omap |
201 | plat-$(CONFIG_ARCH_S3C64XX) += samsung | 213 | plat-$(CONFIG_ARCH_S3C64XX) += samsung |
202 | plat-$(CONFIG_PLAT_IOP) += iop | 214 | plat-$(CONFIG_PLAT_IOP) += iop |
@@ -289,9 +301,10 @@ zImage Image xipImage bootpImage uImage: vmlinux | |||
289 | zinstall uinstall install: vmlinux | 301 | zinstall uinstall install: vmlinux |
290 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ | 302 | $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ |
291 | 303 | ||
292 | %.dtb: scripts | 304 | %.dtb: | scripts |
293 | $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ | 305 | $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ |
294 | 306 | ||
307 | PHONY += dtbs | ||
295 | dtbs: scripts | 308 | dtbs: scripts |
296 | $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs | 309 | $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs |
297 | 310 | ||