[src/trunk]: src/sys/arch/evbppc/conf Factorize kern/subr_disk_mbr.c into fil...

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

details:   https://anonhg.NetBSD.org/src/rev/3f9b274a5119
branches:  trunk
changeset: 821823:3f9b274a5119
user:      rin <rin%NetBSD.org@localhost>
date:      Sat Feb 18 05:08:47 2017 +0000

description:
Factorize kern/subr_disk_mbr.c into files.evbppc, and make EVBPPC_HAS_MBR
more like a normal option. No functional changes.

diffstat:

 sys/arch/evbppc/conf/files.evbppc  |  3 ++-
 sys/arch/evbppc/conf/files.mpc85xx |  5 +----
 sys/arch/evbppc/conf/files.obs600  |  4 +---
 sys/arch/evbppc/conf/files.pmppc   |  3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

diffs (69 lines):

diff -r d533e5591257 -r 3f9b274a5119 sys/arch/evbppc/conf/files.evbppc
--- a/sys/arch/evbppc/conf/files.evbppc Sat Feb 18 04:30:34 2017 +0000
+++ b/sys/arch/evbppc/conf/files.evbppc Sat Feb 18 05:08:47 2017 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: files.evbppc,v 1.6 2007/10/17 19:54:16 garbled Exp $
+#      $NetBSD: files.evbppc,v 1.7 2017/02/18 05:08:47 rin Exp $
 
 # maxpartitions must be first item in files.${ARCH}
 maxpartitions 16
 
 maxusers 2 8 64
 
+file   kern/subr_disk_mbr.c                    disk & evbppc_has_mbr
 file   arch/evbppc/evbppc/disksubr.c           disk & !evbppc_has_mbr
 file   arch/evbppc/evbppc/evbppc_machdep.c     ppc_ibm4xx
 
diff -r d533e5591257 -r 3f9b274a5119 sys/arch/evbppc/conf/files.mpc85xx
--- a/sys/arch/evbppc/conf/files.mpc85xx        Sat Feb 18 04:30:34 2017 +0000
+++ b/sys/arch/evbppc/conf/files.mpc85xx        Sat Feb 18 05:08:47 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.mpc85xx,v 1.10 2014/12/27 16:19:33 nonaka Exp $
+#      $NetBSD: files.mpc85xx,v 1.11 2017/02/18 05:08:47 rin Exp $
 #
 # mpc85xx-specific configuration info
 
@@ -13,9 +13,6 @@
 file   arch/powerpc/booke/e500_timer.c
 file   arch/powerpc/booke/e500_tlb.c
 
-# we usr MBR
-file   kern/subr_disk_mbr.c                    disk
-
 # Memory Disk for install kernel
 file   dev/md_root.c                           memory_disk_hooks
 
diff -r d533e5591257 -r 3f9b274a5119 sys/arch/evbppc/conf/files.obs600
--- a/sys/arch/evbppc/conf/files.obs600 Sat Feb 18 04:30:34 2017 +0000
+++ b/sys/arch/evbppc/conf/files.obs600 Sat Feb 18 05:08:47 2017 +0000
@@ -1,12 +1,10 @@
-#      $NetBSD: files.obs600,v 1.2 2013/11/21 14:03:02 kiyohara Exp $
+#      $NetBSD: files.obs600,v 1.3 2017/02/18 05:08:47 rin Exp $
 #
 # obs600-specific configuration info
 
 file   arch/evbppc/obs405/obs600_autoconf.c
 file   arch/evbppc/obs405/obs600_machdep.c
 
-file   kern/subr_disk_mbr.c                    disk
-
 include "dev/usb/files.usb"
 
 include "dev/bluetooth/files.bluetooth"
diff -r d533e5591257 -r 3f9b274a5119 sys/arch/evbppc/conf/files.pmppc
--- a/sys/arch/evbppc/conf/files.pmppc  Sat Feb 18 04:30:34 2017 +0000
+++ b/sys/arch/evbppc/conf/files.pmppc  Sat Feb 18 05:08:47 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.pmppc,v 1.6 2011/06/22 18:06:32 matt Exp $
+#      $NetBSD: files.pmppc,v 1.7 2017/02/18 05:08:47 rin Exp $
 #
 #
 maxpartitions 16
@@ -9,7 +9,6 @@
 
 file   arch/evbppc/pmppc/autoconf.c
 file   arch/powerpc/powerpc/clock.c
-file   kern/subr_disk_mbr.c                    disk
 file   arch/evbppc/pmppc/pic_cpc700.c
 file   arch/evbppc/pmppc/machdep.c