Sat Oct 30 05:02:28 2010 UTC ()
xmd(4) uses a conflicting symbol "md_root_image" with md(4).
Exclude md(4) where xmd(4) is used.

XXX In the long run mdsetimage(8) must die.


(uebayasi)
diff -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/conf/XIP
diff -r1.1.2.1 -r1.1.2.2 src/sys/arch/i386/conf/XIP
cvs diff -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/conf/Attic/XIP (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/Attic/XIP 2010/08/27 09:41:51 1.1.2.1
+++ src/sys/arch/amd64/conf/Attic/XIP 2010/10/30 05:02:28 1.1.2.2
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1# $NetBSD: XIP,v 1.1.2.1 2010/08/27 09:41:51 uebayasi Exp $ 1# $NetBSD: XIP,v 1.1.2.2 2010/10/30 05:02:28 uebayasi Exp $
2 2
3include "arch/amd64/conf/GENERIC" 3include "arch/amd64/conf/GENERIC"
4 4
5options XIP 5options XIP
6 6
 7no pseudo-device md
7pseudo-device xmd 1 # XIP memory disk device (ramdisk) 8pseudo-device xmd 1 # XIP memory disk device (ramdisk)
8options XMD_ROOT_SIZE=10240 # 5MB 9options XMD_ROOT_SIZE=10240 # 5MB
cvs diff -r1.1.2.1 -r1.1.2.2 src/sys/arch/i386/conf/Attic/XIP (expand / switch to unified diff)

--- src/sys/arch/i386/conf/Attic/XIP 2010/08/20 07:04:38 1.1.2.1
+++ src/sys/arch/i386/conf/Attic/XIP 2010/10/30 05:02:28 1.1.2.2
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1# $NetBSD: XIP,v 1.1.2.1 2010/08/20 07:04:38 uebayasi Exp $ 1# $NetBSD: XIP,v 1.1.2.2 2010/10/30 05:02:28 uebayasi Exp $
2 2
3include "arch/i386/conf/GENERIC" 3include "arch/i386/conf/GENERIC"
4 4
5file-system FFS # UFS 5file-system FFS # UFS
6options XIP 6options XIP
7 7
 8no pseudo-device md
8pseudo-device xmd 1 # XIP memory disk device (ramdisk) 9pseudo-device xmd 1 # XIP memory disk device (ramdisk)
9options XMD_ROOT_SIZE=10240 # 5MB 10options XMD_ROOT_SIZE=10240 # 5MB