From: Andrew Cooper Date: Mon, 23 Sep 2019 12:32:53 +0000 (+0200) Subject: x86/boot: Fix build dependenices for reloc.c X-Git-Tag: archive/raspbian/4.11.3+24-g14b62ab3e5-1+rpi1^2~55^2~117 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6af54f7ce3b2391ff9f93e0ee085cad9dd8471f7;p=xen.git x86/boot: Fix build dependenices for reloc.c c/s 201f852eaf added start_info.h and kconfig.h to reloc.c, but only updated start_info.h in RELOC_DEPS. This causes reloc.c to not be regenerated when Kconfig changes. It is most noticeable when enabling CONFIG_PVH and finding the resulting binary crash early with: (d9) (XEN) (d9) (XEN) **************************************** (d9) (XEN) Panic on CPU 0: (d9) (XEN) Magic value is wrong: c2c2c2c2 (d9) (XEN) **************************************** (d9) (XEN) (d9) (XEN) Reboot in five seconds... (XEN) d9v0 Triple fault - invoking HVM shutdown action 1 Reported-by: Paul Durrant Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné master commit: 78c0000c87ce498bf621914c0554b83fac3ee00d master date: 2019-07-31 11:19:45 +0100 --- diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index e10388282f..9b31bfcbfb 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -4,7 +4,10 @@ DEFS_H_DEPS = defs.h $(BASEDIR)/include/xen/stdbool.h CMDLINE_DEPS = $(DEFS_H_DEPS) video.h -RELOC_DEPS = $(DEFS_H_DEPS) $(BASEDIR)/include/xen/multiboot.h \ +RELOC_DEPS = $(DEFS_H_DEPS) \ + $(BASEDIR)/include/generated/autoconf.h \ + $(BASEDIR)/include/xen/kconfig.h \ + $(BASEDIR)/include/xen/multiboot.h \ $(BASEDIR)/include/xen/multiboot2.h \ $(BASEDIR)/include/public/arch-x86/hvm/start_info.h