Sat Feb 18 05:08:47 2017 UTC ()
Factorize kern/subr_disk_mbr.c into files.evbppc, and make EVBPPC_HAS_MBR
more like a normal option. No functional changes.


(rin)
diff -r1.6 -r1.7 src/sys/arch/evbppc/conf/files.evbppc
diff -r1.6 -r1.7 src/sys/arch/evbppc/conf/files.pmppc
diff -r1.10 -r1.11 src/sys/arch/evbppc/conf/files.mpc85xx
diff -r1.2 -r1.3 src/sys/arch/evbppc/conf/files.obs600
cvs diff -r1.6 -r1.7 src/sys/arch/evbppc/conf/files.evbppc (expand / switch to unified diff)

--- src/sys/arch/evbppc/conf/files.evbppc 2007/10/17 19:54:16 1.6
+++ src/sys/arch/evbppc/conf/files.evbppc 2017/02/18 05:08:47 1.7
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: files.evbppc,v 1.6 2007/10/17 19:54:16 garbled Exp $ 1# $NetBSD: files.evbppc,v 1.7 2017/02/18 05:08:47 rin Exp $
2 2
3# maxpartitions must be first item in files.${ARCH} 3# maxpartitions must be first item in files.${ARCH}
4maxpartitions 16 4maxpartitions 16
5 5
6maxusers 2 8 64 6maxusers 2 8 64
7 7
 8file kern/subr_disk_mbr.c disk & evbppc_has_mbr
8file arch/evbppc/evbppc/disksubr.c disk & !evbppc_has_mbr 9file arch/evbppc/evbppc/disksubr.c disk & !evbppc_has_mbr
9file arch/evbppc/evbppc/evbppc_machdep.c ppc_ibm4xx 10file arch/evbppc/evbppc/evbppc_machdep.c ppc_ibm4xx
10 11
11file arch/powerpc/powerpc/bus_dma.c 12file arch/powerpc/powerpc/bus_dma.c
12file arch/powerpc/powerpc/bus_space.c 13file arch/powerpc/powerpc/bus_space.c
13file arch/powerpc/powerpc/procfs_machdep.c procfs 14file arch/powerpc/powerpc/procfs_machdep.c procfs
14file dev/cons.c 15file dev/cons.c
15 16
16include "arch/evbppc/conf/majors.evbppc" 17include "arch/evbppc/conf/majors.evbppc"
cvs diff -r1.6 -r1.7 src/sys/arch/evbppc/conf/files.pmppc (expand / switch to unified diff)

--- src/sys/arch/evbppc/conf/files.pmppc 2011/06/22 18:06:32 1.6
+++ src/sys/arch/evbppc/conf/files.pmppc 2017/02/18 05:08:47 1.7
@@ -1,25 +1,24 @@ @@ -1,25 +1,24 @@
1# $NetBSD: files.pmppc,v 1.6 2011/06/22 18:06:32 matt Exp $ 1# $NetBSD: files.pmppc,v 1.7 2017/02/18 05:08:47 rin Exp $
2# 2#
3# 3#
4maxpartitions 16 4maxpartitions 16
5 5
6maxusers 2 8 64 6maxusers 2 8 64
7 7
8include "arch/powerpc/pic/files.pic" 8include "arch/powerpc/pic/files.pic"
9 9
10file arch/evbppc/pmppc/autoconf.c 10file arch/evbppc/pmppc/autoconf.c
11file arch/powerpc/powerpc/clock.c 11file arch/powerpc/powerpc/clock.c
12file kern/subr_disk_mbr.c disk 
13file arch/evbppc/pmppc/pic_cpc700.c 12file arch/evbppc/pmppc/pic_cpc700.c
14file arch/evbppc/pmppc/machdep.c 13file arch/evbppc/pmppc/machdep.c
15 14
16# 15#
17# Machine-independent SCSI drivers 16# Machine-independent SCSI drivers
18# 17#
19include "dev/scsipi/files.scsipi" 18include "dev/scsipi/files.scsipi"
20 19
21# 20#
22# Machine-independent ATA drivers 21# Machine-independent ATA drivers
23# 22#
24 23
25include "dev/ata/files.ata" 24include "dev/ata/files.ata"
cvs diff -r1.10 -r1.11 src/sys/arch/evbppc/conf/files.mpc85xx (expand / switch to unified diff)

--- src/sys/arch/evbppc/conf/files.mpc85xx 2014/12/27 16:19:33 1.10
+++ src/sys/arch/evbppc/conf/files.mpc85xx 2017/02/18 05:08:47 1.11
@@ -1,31 +1,28 @@ @@ -1,31 +1,28 @@
1# $NetBSD: files.mpc85xx,v 1.10 2014/12/27 16:19:33 nonaka Exp $ 1# $NetBSD: files.mpc85xx,v 1.11 2017/02/18 05:08:47 rin Exp $
2# 2#
3# mpc85xx-specific configuration info 3# mpc85xx-specific configuration info
4 4
5defflag opt_mpc85xx.h MPC8536 MPC8544 MPC8548 MPC8555 MPC8568 MPC8572 5defflag opt_mpc85xx.h MPC8536 MPC8544 MPC8548 MPC8555 MPC8568 MPC8572
6 P1023 P1025 P2020 CADMUS PIXIS E500_WDOG_STACK 6 P1023 P1025 P2020 CADMUS PIXIS E500_WDOG_STACK
7defparam opt_mpc85xx.h SYS_CLK MEMSIZE 7defparam opt_mpc85xx.h SYS_CLK MEMSIZE
8 8
9file arch/evbppc/mpc85xx/autoconf.c 9file arch/evbppc/mpc85xx/autoconf.c
10file arch/evbppc/mpc85xx/machdep.c 10file arch/evbppc/mpc85xx/machdep.c
11file arch/powerpc/booke/e500_autoconf.c 11file arch/powerpc/booke/e500_autoconf.c
12file arch/powerpc/booke/e500_intr.c 12file arch/powerpc/booke/e500_intr.c
13file arch/powerpc/booke/e500_timer.c 13file arch/powerpc/booke/e500_timer.c
14file arch/powerpc/booke/e500_tlb.c 14file arch/powerpc/booke/e500_tlb.c
15 15
16# we usr MBR 
17file kern/subr_disk_mbr.c disk 
18 
19# Memory Disk for install kernel 16# Memory Disk for install kernel
20file dev/md_root.c memory_disk_hooks 17file dev/md_root.c memory_disk_hooks
21 18
22# Machine-independent I2O drivers. 19# Machine-independent I2O drivers.
23include "dev/i2o/files.i2o" 20include "dev/i2o/files.i2o"
24 21
25# Machine-independent SCSI drivers 22# Machine-independent SCSI drivers
26include "dev/scsipi/files.scsipi" 23include "dev/scsipi/files.scsipi"
27 24
28# Machine-independent ATA drivers 25# Machine-independent ATA drivers
29include "dev/ata/files.ata" 26include "dev/ata/files.ata"
30 27
31# Machine-independent USB drivers 28# Machine-independent USB drivers
cvs diff -r1.2 -r1.3 src/sys/arch/evbppc/conf/files.obs600 (expand / switch to unified diff)

--- src/sys/arch/evbppc/conf/files.obs600 2013/11/21 14:03:02 1.2
+++ src/sys/arch/evbppc/conf/files.obs600 2017/02/18 05:08:47 1.3
@@ -1,12 +1,10 @@ @@ -1,12 +1,10 @@
1# $NetBSD: files.obs600,v 1.2 2013/11/21 14:03:02 kiyohara Exp $ 1# $NetBSD: files.obs600,v 1.3 2017/02/18 05:08:47 rin Exp $
2# 2#
3# obs600-specific configuration info 3# obs600-specific configuration info
4 4
5file arch/evbppc/obs405/obs600_autoconf.c 5file arch/evbppc/obs405/obs600_autoconf.c
6file arch/evbppc/obs405/obs600_machdep.c 6file arch/evbppc/obs405/obs600_machdep.c
7 7
8file kern/subr_disk_mbr.c disk 
9 
10include "dev/usb/files.usb" 8include "dev/usb/files.usb"
11 9
12include "dev/bluetooth/files.bluetooth" 10include "dev/bluetooth/files.bluetooth"