On Fri Sep 10 10, John Baldwin wrote: > On Thursday, September 09, 2010 3:50:45 pm Alexander Best wrote: > > On Thu Sep 9 10, Alexander Best wrote: > > > On Thu Sep 9 10, Alexander Best wrote: > > > > hi there, > > > > > > > > except for arm most archs seem to enforce uart support in > > > > conf/DEFAULTS. is > > > > this really necessary? shouldn't DEFAULTS only contain vital > > > > devices/options > > > > without a kernel on a specific arch won't function at all? > > > > > > jhb just explained to me, that the uart entry in DEFAULTS is not a > > > controller > > > or something like that, but the uart backend to use *if* uart gets > > > defined in > > > the kernel config. > > > > > > sorry for the noise folks. > > > > however i found some missing comments and incorrect syntax which i fixed. > > > > see the attached patch. > > I think the ia64 ordering for 'io and mem' is probably more correct > (alphabetically sorted), so I would fix i386 and amd64 and leave ia64 alone. > > The powerpc 'machine' changes are wrong I think as it would break GENERIC64 > and powerpc64 kernel configs in general. Nathan purposefully removed > 'machine' from the powerpc DEFAULTS.
here's try #2. ;) cheers. alex > > -- > John Baldwin -- a13x
diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index 1fb52b3..c525935 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -5,12 +5,12 @@ machine amd64 -# Bus support. +# Bus support device isa -# Pseudo devices. -device mem # Memory and kernel memory devices +# Pseudo devices device io # I/O device +device mem # Memory and kernel memory devices # UART chips on this platform device uart_ns8250 diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS index 591a0a1..5e1512f 100644 --- a/sys/arm/conf/DEFAULTS +++ b/sys/arm/conf/DEFAULTS @@ -5,7 +5,9 @@ machine arm -device mem +# Pseudo devices +device mem # Memory and kernel memory devices +# Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_MBR diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index 32e77e4..d364389 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -5,16 +5,16 @@ machine i386 -# Bus support. +# Bus support device isa options ISAPNP -# Floating point support. +# Floating point support device npx -# Pseudo devices. -device mem # Memory and kernel memory devices +# Pseudo devices device io # I/O device +device mem # Memory and kernel memory devices # UART chips on this platform device uart_ns8250 @@ -26,5 +26,5 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR # enable support for native hardware -options NATIVE device atpic +options NATIVE diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS index 2cb2330..608dcc1 100644 --- a/sys/ia64/conf/DEFAULTS +++ b/sys/ia64/conf/DEFAULTS @@ -5,16 +5,17 @@ machine ia64 -# Bus support. +# Bus support device acpi # ACPI support -# Pseudo devices. +# Pseudo devices device io # I/O & EFI runtime device device mem # Memory and kernel memory devices # UART chips on this platform device uart_ns8250 +# Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_GPT options GEOM_PART_MBR diff --git a/sys/mips/conf/DEFAULTS b/sys/mips/conf/DEFAULTS index dc480ce..59e4442 100644 --- a/sys/mips/conf/DEFAULTS +++ b/sys/mips/conf/DEFAULTS @@ -5,9 +5,12 @@ machine mips -device mem +# Pseudo devices +device mem # Memory and kernel memory devices +# UART chips on this platform device uart_ns8250 +# Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_MBR diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS index f30501e..246f309 100644 --- a/sys/pc98/conf/DEFAULTS +++ b/sys/pc98/conf/DEFAULTS @@ -6,16 +6,16 @@ machine pc98 i386 options PC98 -# Bus support. +# Bus support device isa options ISAPNP -# Floating point support. +# Floating point support device npx -# Pseudo devices. -device mem # Memory and kernel memory devices +# Pseudo devices device io # I/O device +device mem # Memory and kernel memory devices # UART chips on this platform device uart_ns8250 diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS index 658c221..5623732 100644 --- a/sys/powerpc/conf/DEFAULTS +++ b/sys/powerpc/conf/DEFAULTS @@ -3,12 +3,13 @@ # # $FreeBSD$ -# Pseudo devices. +# Pseudo devices device mem # Memory and kernel memory devices # UART chips on this platform device uart_ns8250 device uart_z8530 +# Default partitioning schemes options GEOM_PART_APM options GEOM_PART_MBR diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC index 891d9aa..d8a8f4e 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -12,8 +12,8 @@ # latest information. # # An exhaustive list of options and more detailed explanations of the -# device lines is also present in the ../../conf/NOTES and NOTES files. -# If you are in doubt as to the purpose or necessity of a line, check first +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # # $FreeBSD$ @@ -21,60 +21,60 @@ cpu AIM ident GENERIC -machine powerpc powerpc +machine powerpc powerpc -makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols # Platform support -options POWERMAC #NewWorld Apple PowerMacs -options PSIM #GDB PSIM ppc simulator -options MAMBO #IBM Mambo Full System Simulator - -options SCHED_ULE #ULE scheduler -options INET #InterNETworking -options INET6 #IPv6 communications protocols -options SCTP #Stream Control Transmission Protocol -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 UFS_GJOURNAL #Enable gjournal-based UFS journaling -options MD_ROOT #MD is a potential root device -options NFSCLIENT #Network Filesystem Client -options NFSSERVER #Network Filesystem Server -options NFSLOCKD #Network Lock Manager -options NFS_ROOT #NFS usable as root device -options MSDOSFS #MSDOS Filesystem -options CD9660 #ISO 9660 Filesystem -options PROCFS #Process filesystem (requires PSEUDOFS) -options PSEUDOFS #Pseudo-filesystem framework -options GEOM_PART_GPT #GUID Partition Tables. -options GEOM_LABEL #Provides labelization -options COMPAT_FREEBSD4 #Keep this for a while -options COMPAT_FREEBSD5 #Compatible with FreeBSD5 -options COMPAT_FREEBSD6 #Compatible with FreeBSD6 -options COMPAT_FREEBSD7 #Compatible with FreeBSD7 -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -options KTRACE #ktrace(1) syscall trace support -options STACK #stack(9) support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores +options POWERMAC # NewWorld Apple PowerMacs +options PSIM # GDB PSIM ppc simulator +options MAMBO # IBM Mambo Full System Simulator + +options SCHED_ULE # ULE scheduler +options INET # InterNETworking +options INET6 # IPv6 communications protocols +options SCTP # Stream Control Transmission Protocol +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 UFS_GJOURNAL # Enable gjournal-based UFS journaling +options MD_ROOT # MD is a potential root device +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as root device +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization +options COMPAT_FREEBSD4 # Keep this for a while +options COMPAT_FREEBSD5 # Compatible with FreeBSD5 +options COMPAT_FREEBSD6 # Compatible with FreeBSD6 +options COMPAT_FREEBSD7 # Compatible with FreeBSD7 +options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI +options KTRACE # ktrace(1) syscall trace support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores options P1003_1B_SEMAPHORES # POSIX-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +options _KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing options MAC # TrustedBSD MAC Framework -options INCLUDE_CONFIG_FILE # Include this file in kernel +options INCLUDE_CONFIG_FILE # Include this file in kernel # Debugging for use in -current -options KDB #Enable the kernel debugger -options DDB #Support DDB -#options DEADLKRES #Enable the deadlock resolver -options INVARIANTS #Enable calls of extra sanity checking -options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -options WITNESS #Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +options KDB # Enable the kernel debugger +options DDB # Support DDB +#options DEADLKRES # Enable the deadlock resolver +options INVARIANTS # Enable calls of extra sanity checking +options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +options WITNESS # Enable checks to detect deadlocks and cycles +options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones # To make an SMP kernel, the next line is needed @@ -145,7 +145,7 @@ device firmware # firmware assist module # The `bpf' device enables the Berkeley Packet Filter. # Be aware of the administrative consequences of enabling this! # Note that 'bpf' is required for DHCP. -device bpf #Berkeley packet filter +device bpf # Berkeley packet filter # USB support options USB_DEBUG # enable debug msgs @@ -185,4 +185,3 @@ device pmu # Powermac I2C support device iicbus # I2C bus code device kiic # Keywest I2C - diff --git a/sys/sparc64/conf/DEFAULTS b/sys/sparc64/conf/DEFAULTS index 38b2408..2e60c94 100644 --- a/sys/sparc64/conf/DEFAULTS +++ b/sys/sparc64/conf/DEFAULTS @@ -5,7 +5,7 @@ machine sparc64 -# Pseudo devices. +# Pseudo devices device mem # Memory and kernel memory devices # UART chips on this platform @@ -17,5 +17,5 @@ device uart_z8530 options GEOM_PART_BSD options GEOM_PART_VTOC8 -# Let sunkbd emulate an AT keyboard by default. +# Let sunkbd emulate an AT keyboard by default options SUNKBD_EMULATE_ATKBD diff --git a/sys/sun4v/conf/DEFAULTS b/sys/sun4v/conf/DEFAULTS index 87a55ec..4c21bc9 100644 --- a/sys/sun4v/conf/DEFAULTS +++ b/sys/sun4v/conf/DEFAULTS @@ -5,7 +5,7 @@ machine sun4v sparc64 -# Pseudo devices. +# Pseudo devices device mem # Memory and kernel memory devices # Default partitioning schemes
_______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "[email protected]"
