Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 37d9fe4783ffcaddcc4afe67626691e62c5ab30e

Authored by Feng Wu
Committed by Paolo Bonzini
1 parent f73f817312
Exists in smarc_imx_lf-5.15.y and in 27 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, pitx_8mp_lf-5.10.y, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y

virt: Add virt directory to the top Makefile 

We need to build files in virt/lib/, which are now used by
KVM and VFIO, so add virt directory to the top Makefile.

Signed-off-by: Feng Wu <feng.wu@intel.com>
Acked-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Showing 2 changed files with 7 additions and 4 deletions Side-by-side Diff

... ... @@ -550,6 +550,7 @@
550 550 net-y := net/
551 551 libs-y := lib/
552 552 core-y := usr/
  553 +virt-y := virt/
553 554 endif # KBUILD_EXTMOD
554 555  
555 556 ifeq ($(dot-config),1)
556 557  
... ... @@ -882,10 +883,10 @@
882 883  
883 884 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
884 885 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
885   - $(net-y) $(net-m) $(libs-y) $(libs-m)))
  886 + $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y)))
886 887  
887 888 vmlinux-alldirs := $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
888   - $(init-) $(core-) $(drivers-) $(net-) $(libs-))))
  889 + $(init-) $(core-) $(drivers-) $(net-) $(libs-) $(virt-))))
889 890  
890 891 init-y := $(patsubst %/, %/built-in.o, $(init-y))
891 892 core-y := $(patsubst %/, %/built-in.o, $(core-y))
892 893  
893 894  
... ... @@ -894,14 +895,15 @@
894 895 libs-y1 := $(patsubst %/, %/lib.a, $(libs-y))
895 896 libs-y2 := $(patsubst %/, %/built-in.o, $(libs-y))
896 897 libs-y := $(libs-y1) $(libs-y2)
  898 +virt-y := $(patsubst %/, %/built-in.o, $(virt-y))
897 899  
898 900 # Externally visible symbols (used by link-vmlinux.sh)
899 901 export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)
900   -export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y)
  902 +export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(virt-y)
901 903 export KBUILD_LDS := arch/$(SRCARCH)/kernel/vmlinux.lds
902 904 export LDFLAGS_vmlinux
903 905 # used by scripts/pacmage/Makefile
904   -export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools virt)
  906 +export KBUILD_ALLDIRS := $(sort $(filter-out arch/%,$(vmlinux-alldirs)) arch Documentation include samples scripts tools)
905 907  
906 908 vmlinux-deps := $(KBUILD_LDS) $(KBUILD_VMLINUX_INIT) $(KBUILD_VMLINUX_MAIN)
907 909  
  1 +obj-y += lib/