Index: sys/arm/conf/SHEEVAPLUG =================================================================== --- sys/arm/conf/SHEEVAPLUG (revision 273634) +++ sys/arm/conf/SHEEVAPLUG (working copy) @@ -10,12 +10,20 @@ options SOC_MV_KIRKWOOD makeoptions MODULES_OVERRIDE="" -#makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +#options INVARIANTS +#options INVARIANT_SUPPORT +#options WITNESS +#options DEBUG_LOCKS +#options DEBUG_VFS_LOCKS +#options DIAGNOSTIC makeoptions WERROR="-Werror" +option KSTACK_PAGES=5 +option ARM_DEVICE_MULTIPASS options SCHED_4BSD # 4BSD scheduler options INET # InterNETworking -options INET6 # IPv6 communications protocols +#options INET6 # IPv6 communications protocols options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme options TMPFS # Efficient memory filesystem @@ -23,14 +31,22 @@ options NANDFS # NAND Filesystem options NFSCL # New Network Filesystem Client options NFSLOCKD # Network Lock Manager -options NFS_ROOT # NFS usable as /, requires NFSCL -options BOOTP -options BOOTP_NFSROOT -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=mge0 +#options NFS_ROOT # NFS usable as /, requires NFSCL +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_WIRED_TO=mge0 +# Added by Ronald +options SOFTUPDATES +options MSDOSFS +options IPFIREWALL +options IPFIREWALL_DEFAULT_TO_ACCEPT # Root fs on USB device -#options ROOTDEVNAME=\"ufs:/dev/da0a\" +options ROOTDEVNAME=\"ufs:/dev/da0s1a\" +#options ROOTDEVNAME=\"ufs:/dev/da0s2d\" +#options ROOTDEVNAME=\"nandfs:/dev/da0s2d\" +#options ROOTDEVNAME=\"nandfs:/dev/gnand0s.root\" options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues @@ -49,6 +65,7 @@ # Pseudo devices device random device loop +device md # Serial ports device uart @@ -79,6 +96,10 @@ # NAND device nand +#device mmc +#device mmcsd +#device sdhci + # Flattened Device Tree options FDT options FDT_DTB_STATIC Index: sys/boot/fdt/dts/arm/sheevaplug.dts =================================================================== --- sys/boot/fdt/dts/arm/sheevaplug.dts (revision 273634) +++ sys/boot/fdt/dts/arm/sheevaplug.dts (working copy) @@ -95,7 +95,12 @@ }; slice@200000 { - reg = <0x200000 0x1fe00000>; + reg = <0x200000 0x600000>; + label = "fbsd-boot"; + }; + + slice@800000 { + reg = <0x800000 0x1f800000>; label = "root"; }; };