diff options
author | imp <imp@FreeBSD.org> | 2006-07-14 15:20:31 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2006-07-14 15:20:31 +0000 |
commit | e5fffb857462d8a8f576916d4af4ad7e21d723e7 (patch) | |
tree | f5924454ed8517556b3dd30fb9521b1f150289e5 /sys/arm | |
parent | 6ae97a774eb9eb77b71537b032d4b838a53f9d41 (diff) | |
download | FreeBSD-src-e5fffb857462d8a8f576916d4af4ad7e21d723e7.zip FreeBSD-src-e5fffb857462d8a8f576916d4af4ad7e21d723e7.tar.gz |
Move some of the common parameters into the std. files for this platform.
Also migrate from MD disk to NFS boot.
Diffstat (limited to 'sys/arm')
-rw-r--r-- | sys/arm/at91/std.at91 | 1 | ||||
-rw-r--r-- | sys/arm/at91/std.kb920x | 4 | ||||
-rw-r--r-- | sys/arm/conf/KB920X | 22 |
3 files changed, 16 insertions, 11 deletions
diff --git a/sys/arm/at91/std.at91 b/sys/arm/at91/std.at91 index 9c0b39b..bb320eb 100644 --- a/sys/arm/at91/std.at91 +++ b/sys/arm/at91/std.at91 @@ -2,3 +2,4 @@ files "../at91/files.at91" cpu CPU_ARM9 +makeoptions CONF_CFLAGS=-mcpu=arm9 diff --git a/sys/arm/at91/std.kb920x b/sys/arm/at91/std.kb920x index 2e4878a..3e8be49 100644 --- a/sys/arm/at91/std.kb920x +++ b/sys/arm/at91/std.kb920x @@ -4,3 +4,7 @@ files "../at91/files.kb920x" makeoptions KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 +options KERNPHYSADDR=0x20000000 +options KERNVIRTADDR=0xc0000000 +options PHYSADDR=0x20000000 +options STARTUP_PAGETABLE_ADDR=0x20800000 diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X index 0e8ee22..d59ec06 100644 --- a/sys/arm/conf/KB920X +++ b/sys/arm/conf/KB920X @@ -21,16 +21,11 @@ machine arm ident KB920X -options KERNPHYSADDR=0x20000000 -options KERNVIRTADDR=0xc0000000 -options PHYSADDR=0x20000000 -options STARTUP_PAGETABLE_ADDR=0x20800000 include "../at91/std.kb920x" #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -makeoptions CONF_CFLAGS=-mcpu=arm9 options DDB options KDB @@ -41,12 +36,15 @@ options FFS #Berkeley Fast Filesystem #options SOFTUPDATES #Enable FFS soft updates support #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories -options MD_ROOT #MD is a potential root device -options MD_ROOT_SIZE=4096 # 3MB ram disk -options ROOTDEVNAME=\"ufs:md0\" -#options NFSCLIENT #Network Filesystem Client +#options MD_ROOT #MD is a potential root device +#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options ROOTDEVNAME=\"ufs:md0\" +options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server -#options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options NFS_ROOT #NFS usable as /, requires NFSCLIENT +options BOOTP_NFSROOT +options BOOTP + #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem #options PROCFS #Process filesystem (requires PSEUDOFS) @@ -57,12 +55,14 @@ options SYSVSHM #SYSV-style shared memory options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev #options SYSCTL_OMIT_DESCR options MUTEX_NOINLINE +options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING device genclock +device random +device pty device loop device ether device nexus |