18c18
< # $FreeBSD: head/sys/arm/conf/CRB 185478 2008-11-30 17:53:19Z sam $
---
> # $FreeBSD: head/sys/arm/conf/CRB 191954 2009-05-10 00:00:25Z kuriyama $
23,24c23,24
< options KERNPHYSADDR=0x00200000
< options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
---
> options KERNPHYSADDR=0x00200000
> options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
26,27c26,27
< options COUNTS_PER_SEC=400000000
< options STARTUP_PAGETABLE_ADDR=0x00000000
---
> options COUNTS_PER_SEC=400000000
> options STARTUP_PAGETABLE_ADDR=0x00000000
35,37c35,37
< options HZ=100
< options BREAK_TO_DEBUGGER
< #options DEVICE_POLLING
---
> options HZ=100
> options BREAK_TO_DEBUGGER
> #options DEVICE_POLLING
56c56
< options INTR_FILTER
---
> options INTR_FILTER
62,67c62,67
< options BOOTP
< options BOOTP_NFSROOT
< options BOOTP_NFSV3
< options BOOTP_WIRED_TO=em0
< options BOOTP_COMPAT
< #options PREEMPTION
---
> options BOOTP
> options BOOTP_NFSROOT
> options BOOTP_NFSV3
> options BOOTP_WIRED_TO=em0
> options BOOTP_COMPAT
> #options PREEMPTION
78,83c78,83
< device atadisk # ATA disk drives
< device ataraid # ATA RAID drives
< device atapicd # ATAPI CDROM drives
< device atapifd # ATAPI floppy drives
< device atapist # ATAPI tape drives
< options ATA_STATIC_ID # Static device numbering
---
> device atadisk # ATA disk drives
> device ataraid # ATA RAID drives
> device atapicd # ATAPI CDROM drives
> device atapifd # ATAPI floppy drives
> device atapist # ATAPI tape drives
> options ATA_STATIC_ID # Static device numbering
96c96
< options KDB
---
> options KDB
102c102
< #options DIAGNOSTIC
---
> #options DIAGNOSTIC
107,109c107,109
< options XSCALE_CACHE_READ_WRITE_ALLOCATE
< device md
< device random # Entropy device
---
> options XSCALE_CACHE_READ_WRITE_ALLOCATE
> device md
> device random # Entropy device
112c112
< options ARM_USE_SMALL_ALLOC
---
> options ARM_USE_SMALL_ALLOC
< # $FreeBSD: head/sys/arm/conf/CRB 185478 2008-11-30 17:53:19Z sam $
---
> # $FreeBSD: head/sys/arm/conf/CRB 191954 2009-05-10 00:00:25Z kuriyama $
23,24c23,24
< options KERNPHYSADDR=0x00200000
< options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
---
> options KERNPHYSADDR=0x00200000
> options KERNVIRTADDR=0xc0200000 # Used in ldscript.arm
26,27c26,27
< options COUNTS_PER_SEC=400000000
< options STARTUP_PAGETABLE_ADDR=0x00000000
---
> options COUNTS_PER_SEC=400000000
> options STARTUP_PAGETABLE_ADDR=0x00000000
35,37c35,37
< options HZ=100
< options BREAK_TO_DEBUGGER
< #options DEVICE_POLLING
---
> options HZ=100
> options BREAK_TO_DEBUGGER
> #options DEVICE_POLLING
56c56
< options INTR_FILTER
---
> options INTR_FILTER
62,67c62,67
< options BOOTP
< options BOOTP_NFSROOT
< options BOOTP_NFSV3
< options BOOTP_WIRED_TO=em0
< options BOOTP_COMPAT
< #options PREEMPTION
---
> options BOOTP
> options BOOTP_NFSROOT
> options BOOTP_NFSV3
> options BOOTP_WIRED_TO=em0
> options BOOTP_COMPAT
> #options PREEMPTION
78,83c78,83
< device atadisk # ATA disk drives
< device ataraid # ATA RAID drives
< device atapicd # ATAPI CDROM drives
< device atapifd # ATAPI floppy drives
< device atapist # ATAPI tape drives
< options ATA_STATIC_ID # Static device numbering
---
> device atadisk # ATA disk drives
> device ataraid # ATA RAID drives
> device atapicd # ATAPI CDROM drives
> device atapifd # ATAPI floppy drives
> device atapist # ATAPI tape drives
> options ATA_STATIC_ID # Static device numbering
96c96
< options KDB
---
> options KDB
102c102
< #options DIAGNOSTIC
---
> #options DIAGNOSTIC
107,109c107,109
< options XSCALE_CACHE_READ_WRITE_ALLOCATE
< device md
< device random # Entropy device
---
> options XSCALE_CACHE_READ_WRITE_ALLOCATE
> device md
> device random # Entropy device
112c112
< options ARM_USE_SMALL_ALLOC
---
> options ARM_USE_SMALL_ALLOC