From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Wed, 13 Jan 2016 14:12:11 +0000 (-0500)
Subject: xen.config: Add support for .config in xen/xen
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=49f89c6580c3840affd7d22f1c1e980e266e70ff;p=xentesttools%2Fbootstrap.git

xen.config: Add support for .config in xen/xen

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---

diff --git a/Makefile b/Makefile
index 6784c13..738b862 100644
--- a/Makefile
+++ b/Makefile
@@ -149,16 +149,32 @@ linux-distclean: linux-clean
 XEN_DISTDIR = xen/dist/install
 
 XEN_MINOR = $(shell cat xen/xen/Makefile | grep XEN_SUBVERSION | head -1 |sed 's/.*= //g')
+XEN_VERSION = $(shell cat xen/xen/Makefile |grep XEN_SUBVERSION | head -1 | sed s/.*=// | sed s/\ //)
 
 xen-DISTRIB_TARGET = dist/common/xen.gz
 
-.PHONY: xen-dist-nodep
-xen-dist-nodep:
+.PHONY: xen-config
+xen-config:
 	if [ -e xen/tools/configure ]; then \
 		if ! [ -e xen/tools/config.h ]; \
 			then (cd xen;./configure --prefix=/usr --disable-blktap2); \
 		fi; \
 	fi
+	if [ -e xen/tools/firmware/seabios-dir ]; then \
+		$(MAKE) -C xen/tools/firmware/seabios-dir defconfig; \
+	fi
+	if [ $(XEN_VERSION) -gt 6 ]; then \
+		$(MAKE) xen/xen/.config; \
+	fi
+
+XEN_DEF_CONFIG = xen/xen/arch/x86/configs/$(ARCH)_defconfig
+
+xen/xen/.config: xen.config
+	./linux_cfg.pl $(DEF_CONFIG) xen.config  >$@
+	yes "" | $(MAKE) -C xen/xen $(XEN_OPTS) oldconfig
+
+.PHONY: xen-hypervisor
+xen-hypervisor: xen-config
 ifeq ($(ARCH),i386)
 	touch xen/xen/xen.gz
 else
diff --git a/xen.config b/xen.config
new file mode 100644
index 0000000..b740c40
--- /dev/null
+++ b/xen.config
@@ -0,0 +1,4 @@
+CONFIG_KEXEC=y
+CONFIG_XSPLICE=y
+CONFIG_XSM=y
+CONFIG_BIGMEM=y