core: Move config.mk to generated directory

Analogously to version.h, this moves the generated config.mk to the
proper directory. We can switch from clean-files to clean-dirs for the
header directory at that chance.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/.gitignore b/.gitignore
index c501f5e93db8320e992389adbb8fff5deb2b9a3a..14b28e5a4b968bf34b05f0f4361fd1f152c25520 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ Module.symvers
 modules.order
 driver/jailhouse.ko
 hypervisor/include/jailhouse/config.h
-hypervisor/include/jailhouse/config.mk
 hypervisor/hypervisor.lds
 tools/jailhouse
 tools/jailhouse-config-collect

diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index adc44aaffe72c34ea57fcbc8b5c912a13dce33ec..54fa7c40cfe53055761a5cf65e75aa2d2a260ce2 100644 (file)
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -48,15 +48,14 @@ define filechk_config_mk
 )
 endef
 
-$(obj)/include/jailhouse/config.mk: Makefile FORCE
+$(obj)/include/generated/config.mk: Makefile FORCE
        $(call filechk,config_mk)
 
 define filechk_version
        $(src)/../scripts/gen_version_h $(src)/..
 endef
 
-clean-files += include/jailhouse/config.mk \
-       include/generated/version.h
+clean-dirs += include/generated/
 
 define sed-y
        "/^=>/{s:=>#\(.*\):/* \1 */:; \
@@ -101,9 +100,9 @@ $(foreach co,$(CORE_OBJECTS),\
 
 $(obj)/setup.o: $(obj)/include/generated/version.h
 
-arch-builtin: $(obj)/$(defines-file) $(obj)/include/jailhouse/config.mk FORCE
+arch-builtin: $(obj)/$(defines-file) $(obj)/include/generated/config.mk FORCE
        $(Q)$(MAKE) $(build)=$(obj)/arch/$(SRCARCH) \
-               CONFIG_MK=$(obj)/include/jailhouse/config.mk
+               CONFIG_MK=$(obj)/include/generated/config.mk
 
 always :=
 

diff --git a/inmates/lib/arm/Makefile.lib b/inmates/lib/arm/Makefile.lib
index 0cb6a194e72da6c0fd17ff590fdac75708b1bc7d..0393d8a1a2712d422db826b2443ef80c3d5b01d8 100644 (file)
--- a/inmates/lib/arm/Makefile.lib
+++ b/inmates/lib/arm/Makefile.lib
@@ -12,7 +12,7 @@
 # the COPYING file in the top-level directory.
 #
 
--include $(obj)/../../../hypervisor/include/jailhouse/config.mk
+-include $(obj)/../../../hypervisor/include/generated/config.mk
 
 KBUILD_AFLAGS := $(filter-out -include asm/unified.h,$(KBUILD_AFLAGS))