Module Name: src
Committed By: rin
Date: Sat Feb 18 05:08:47 UTC 2017
Modified Files:
src/sys/arch/evbppc/conf: files.evbppc files.mpc85xx files.obs600
files.pmppc
Log Message:
Factorize kern/subr_disk_mbr.c into files.evbppc, and make EVBPPC_HAS_MBR
more like a normal option. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/conf/files.evbppc \
src/sys/arch/evbppc/conf/files.pmppc
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/conf/files.mpc85xx
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/conf/files.obs600
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbppc/conf/files.evbppc
diff -u src/sys/arch/evbppc/conf/files.evbppc:1.6 src/sys/arch/evbppc/conf/files.evbppc:1.7
--- src/sys/arch/evbppc/conf/files.evbppc:1.6 Wed Oct 17 19:54:16 2007
+++ src/sys/arch/evbppc/conf/files.evbppc Sat Feb 18 05:08:47 2017
@@ -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
Index: src/sys/arch/evbppc/conf/files.pmppc
diff -u src/sys/arch/evbppc/conf/files.pmppc:1.6 src/sys/arch/evbppc/conf/files.pmppc:1.7
--- src/sys/arch/evbppc/conf/files.pmppc:1.6 Wed Jun 22 18:06:32 2011
+++ src/sys/arch/evbppc/conf/files.pmppc Sat Feb 18 05:08:47 2017
@@ -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 @@ include "arch/powerpc/pic/files.pic"
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
Index: src/sys/arch/evbppc/conf/files.mpc85xx
diff -u src/sys/arch/evbppc/conf/files.mpc85xx:1.10 src/sys/arch/evbppc/conf/files.mpc85xx:1.11
--- src/sys/arch/evbppc/conf/files.mpc85xx:1.10 Sat Dec 27 16:19:33 2014
+++ src/sys/arch/evbppc/conf/files.mpc85xx Sat Feb 18 05:08:47 2017
@@ -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_intr.c
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
Index: src/sys/arch/evbppc/conf/files.obs600
diff -u src/sys/arch/evbppc/conf/files.obs600:1.2 src/sys/arch/evbppc/conf/files.obs600:1.3
--- src/sys/arch/evbppc/conf/files.obs600:1.2 Thu Nov 21 14:03:02 2013
+++ src/sys/arch/evbppc/conf/files.obs600 Sat Feb 18 05:08:47 2017
@@ -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"
