[src/bouyer-xenpvh]: src/sys/arch/xen/conf Include again xen/conf/files.compa...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2e27ac0804b8
branches:  bouyer-xenpvh
changeset: 982968:2e27ac0804b8
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Apr 25 10:52:26 2020 +0000

description:
Include again xen/conf/files.compat for PV kernels, and make it build.
My build.sh -u used stale opt_*.h files ...

diffstat:

 sys/arch/xen/conf/files.compat |  8 +-------
 sys/arch/xen/conf/files.xen    |  4 ++--
 sys/arch/xen/conf/files.xen.pv |  4 +++-
 3 files changed, 6 insertions(+), 10 deletions(-)

diffs (51 lines):

diff -r 85ed842de8f7 -r 2e27ac0804b8 sys/arch/xen/conf/files.compat
--- a/sys/arch/xen/conf/files.compat    Sat Apr 25 10:51:25 2020 +0000
+++ b/sys/arch/xen/conf/files.compat    Sat Apr 25 10:52:26 2020 +0000
@@ -1,16 +1,10 @@
-#      $NetBSD: files.compat,v 1.32 2018/12/09 00:45:18 mrg Exp $
+#      $NetBSD: files.compat,v 1.32.10.1 2020/04/25 10:52:26 bouyer Exp $
 #      NetBSD: files.x86,v 1.10 2003/10/08 17:30:00 bouyer Exp 
 
 # options for MP configuration through the MP spec
 #defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI
 #defflag opt_mpacpi.h MPACPI MPACPI_SCANPCI
 
-# MTRR support
-defflag                                MTRR
-
-defflag opt_xen.h              XEN PAE
-
-
 # XXX define fake options to make config create the .h files
 defflag        lapic.h                 XXXLAPIC
 defflag        apm.h                   XXXAPM
diff -r 85ed842de8f7 -r 2e27ac0804b8 sys/arch/xen/conf/files.xen
--- a/sys/arch/xen/conf/files.xen       Sat Apr 25 10:51:25 2020 +0000
+++ b/sys/arch/xen/conf/files.xen       Sat Apr 25 10:52:26 2020 +0000
@@ -1,6 +1,6 @@
-#      $NetBSD: files.xen,v 1.180.2.6 2020/04/20 19:40:24 bouyer Exp $
+#      $NetBSD: files.xen,v 1.180.2.7 2020/04/25 10:52:26 bouyer Exp $
 
-defflag        opt_xen.h                       XEN XENPVH XENPVHVM
+defflag        opt_xen.h                       XEN XENPVH XENPVHVM PAE
 
 file   arch/xen/x86/hypervisor_machdep.c       xen
 file   arch/xen/x86/xen_intr.c                 xen
diff -r 85ed842de8f7 -r 2e27ac0804b8 sys/arch/xen/conf/files.xen.pv
--- a/sys/arch/xen/conf/files.xen.pv    Sat Apr 25 10:51:25 2020 +0000
+++ b/sys/arch/xen/conf/files.xen.pv    Sat Apr 25 10:52:26 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.xen.pv,v 1.1.2.4 2020/04/20 19:40:24 bouyer Exp $
+#      $NetBSD: files.xen.pv,v 1.1.2.5 2020/04/25 10:52:26 bouyer Exp $
 
 file   arch/xen/x86/autoconf.c         xenpv
 file   arch/xen/x86/x86_xpmap.c        xenpv
@@ -11,6 +11,8 @@
 
 file   arch/xen/x86/xen_ipi.c                  multiprocessor & xenpv
 
+include "arch/xen/conf/files.compat"
+
 #
 # System bus types
 #