From: Ian Jackson <iwj@barriere.debian.org>
Date: Fri, 12 Oct 2018 16:00:16 +0000 (+0000)
Subject: tools/firmware/Makfile: Respect caller's CONFIG_PV_SHIM
X-Git-Tag: archive/raspbian/4.14.5+24-g87d90d511c-1+rpi1^2~32
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5aa7c8ac5aeb11595e72a28c6c8ef76dd5c7003;p=xen.git

tools/firmware/Makfile: Respect caller's CONFIG_PV_SHIM

This makes it easier to disable the shim build.  (In Debian we need to
build the shim separately because it needs different compiler flags
and a different XEN_COMPILE_ARCH.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

Gbp-Pq: Name 0013-tools-firmware-Makfile-Respect-caller-s-CONFIG_PV_SH.patch
---

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index cf304fc578..69f63b1fe6 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../..
 include $(XEN_ROOT)/tools/Rules.mk
 
 ifneq ($(XEN_TARGET_ARCH),x86_32)
-CONFIG_PV_SHIM := y
+CONFIG_PV_SHIM ?= y
 endif
 
 # hvmloader is a 32-bit protected mode binary.