diff options
author | Nathan Lynch <nathan_lynch@mentor.com> | 2015-03-25 14:16:05 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-03-27 18:20:45 -0400 |
commit | e5b61deb3af465f11db7e5e11944ba00a33ece1f (patch) | |
tree | 9a33472595fbd61a56618226340db1d9b53476f8 /arch/arm/Makefile | |
parent | ecf99a439105ebd0a507af1a9cd901a2e166bf9a (diff) |
ARM: 8332/1: add CONFIG_VDSO Kconfig and Makefile bits
Allow users to enable the vdso in Kconfig; include the vdso in the
build if CONFIG_VDSO is enabled. Add 'vdso_install' target.
Signed-off-by: Nathan Lynch <nathan_lynch@mentor.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7f99cd652203..6c13a84b6cd2 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -263,6 +263,7 @@ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) | |||
263 | core-$(CONFIG_VFP) += arch/arm/vfp/ | 263 | core-$(CONFIG_VFP) += arch/arm/vfp/ |
264 | core-$(CONFIG_XEN) += arch/arm/xen/ | 264 | core-$(CONFIG_XEN) += arch/arm/xen/ |
265 | core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ | 265 | core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ |
266 | core-$(CONFIG_VDSO) += arch/arm/vdso/ | ||
266 | 267 | ||
267 | # If we have a machine-specific directory, then include it in the build. | 268 | # If we have a machine-specific directory, then include it in the build. |
268 | core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ | 269 | core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ |
@@ -320,6 +321,12 @@ dtbs: prepare scripts | |||
320 | dtbs_install: | 321 | dtbs_install: |
321 | $(Q)$(MAKE) $(dtbinst)=$(boot)/dts | 322 | $(Q)$(MAKE) $(dtbinst)=$(boot)/dts |
322 | 323 | ||
324 | PHONY += vdso_install | ||
325 | vdso_install: | ||
326 | ifeq ($(CONFIG_VDSO),y) | ||
327 | $(Q)$(MAKE) $(build)=arch/arm/vdso $@ | ||
328 | endif | ||
329 | |||
323 | # We use MRPROPER_FILES and CLEAN_FILES now | 330 | # We use MRPROPER_FILES and CLEAN_FILES now |
324 | archclean: | 331 | archclean: |
325 | $(Q)$(MAKE) $(clean)=$(boot) | 332 | $(Q)$(MAKE) $(clean)=$(boot) |
@@ -344,4 +351,5 @@ define archhelp | |||
344 | echo ' Install using (your) ~/bin/$(INSTALLKERNEL) or' | 351 | echo ' Install using (your) ~/bin/$(INSTALLKERNEL) or' |
345 | echo ' (distribution) /sbin/$(INSTALLKERNEL) or' | 352 | echo ' (distribution) /sbin/$(INSTALLKERNEL) or' |
346 | echo ' install to $$(INSTALL_PATH) and run lilo' | 353 | echo ' install to $$(INSTALL_PATH) and run lilo' |
354 | echo ' vdso_install - Install unstripped vdso.so to $$(INSTALL_MOD_PATH)/vdso' | ||
347 | endef | 355 | endef |