Automatically include config.h for all per-arch translation units

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/arch/x86/setup.c b/arch/x86/setup.c
index 8aa3825c3c54a01f639dbb1679644d8c03d3561c..bc9553a0fe04539e4433882e9f177a0e47484b9f 100644 (file)
--- a/arch/x86/setup.c
+++ b/arch/x86/setup.c
@@ -2,7 +2,7 @@
 #include <xtf/console.h>
 #include <xtf/hypercall.h>
 
-#include <arch/x86/config.h>
+#include <arch/x86/desc.h>
 #include <arch/x86/mm.h>
 
 uint8_t boot_stack[PAGE_SIZE] __aligned(PAGE_SIZE);

diff --git a/arch/x86/traps.c b/arch/x86/traps.c
index eb678bcb77d40d337f24d56726f6fb8e8c5f0430..3879ad75af457ceec0688f796b325761a25fe71b 100644 (file)
--- a/arch/x86/traps.c
+++ b/arch/x86/traps.c
@@ -1,7 +1,5 @@
 #include <xtf/traps.h>
 
-#include <arch/x86/config.h>
-
 /*
  * Getting called means that a shutdown(crash) hypercall has not succeeded.
  * Attempt more extreme measures to try and force a crash, and fall into an

diff --git a/config/common.mk b/config/common.mk
index 72b842ae42d4d80d2fb57cbd20c254e1d8ea1b41..28ff15fc9b11e6e921d6b4e2712fb56f57afffae 100644 (file)
--- a/config/common.mk
+++ b/config/common.mk
@@ -48,8 +48,8 @@ define PERENV_setup
 AFLAGS_$($(1)_arch) := $$(COMMON_AFLAGS) $$(COMMON_AFLAGS-$($(1)_arch))
 CFLAGS_$($(1)_arch) := $$(COMMON_CFLAGS) $$(COMMON_CFLAGS-$($(1)_arch))
 
-AFLAGS_$(1) := $$(AFLAGS_$($(1)_arch)) $$(COMMON_AFLAGS-$(1)) -DCONFIG_ENV_$(1)
-CFLAGS_$(1) := $$(CFLAGS_$($(1)_arch)) $$(COMMON_CFLAGS-$(1)) -DCONFIG_ENV_$(1)
+AFLAGS_$(1) := $$(AFLAGS_$($(1)_arch)) $$(COMMON_AFLAGS-$(1)) -DCONFIG_ENV_$(1) -include arch/x86/config.h
+CFLAGS_$(1) := $$(CFLAGS_$($(1)_arch)) $$(COMMON_CFLAGS-$(1)) -DCONFIG_ENV_$(1) -include arch/x86/config.h
 
 link-$(1) := $(ROOT)/arch/x86/link-$(1).lds
 

diff --git a/include/arch/x86/mm.h b/include/arch/x86/mm.h
index 6a76ab1e7a32a7d6210736ef04e785f3952fe654..0706728784c15f74bbacd9ea5bb9ca0614da1194 100644 (file)
--- a/include/arch/x86/mm.h
+++ b/include/arch/x86/mm.h
@@ -3,7 +3,6 @@
 
 #include <stdint.h>
 
-#include <arch/x86/config.h>
 #include <arch/x86/page.h>
 
 #include <xen/xen.h>