From owner-freebsd-current@FreeBSD.ORG Thu Sep 9 19:50:45 2010 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 1233) id D3A4210656E8; Thu, 9 Sep 2010 19:50:45 +0000 (UTC) Date: Thu, 9 Sep 2010 19:50:45 +0000 From: Alexander Best To: freebsd-current@freebsd.org Message-ID: <20100909195045.GA68352@freebsd.org> References: <20100909191750.GA58228@freebsd.org> <20100909194109.GA64914@freebsd.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="XsQoSWH+UP9D9v3l" Content-Disposition: inline In-Reply-To: <20100909194109.GA64914@freebsd.org> Subject: Re: {arch}/conf/DEFAULTS and uart X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Sep 2010 19:50:45 -0000 --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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. cheers. alex > > cheers. > alex > > > > > cheers. > > alex > > > > -- > > a13x > > -- > a13x -- a13x --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="DEFAULTS.diff" diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index 1fb52b3..e942c1a 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -5,10 +5,10 @@ machine amd64 -# Bus support. +# Bus support device isa -# Pseudo devices. +# Pseudo devices device mem # Memory and kernel memory devices device io # I/O device 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..b780472 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -5,14 +5,14 @@ machine i386 -# Bus support. +# Bus support device isa options ISAPNP -# Floating point support. +# Floating point support device npx -# Pseudo devices. +# Pseudo devices device mem # Memory and kernel memory devices device io # I/O device diff --git a/sys/ia64/conf/DEFAULTS b/sys/ia64/conf/DEFAULTS index 2cb2330..88119b0 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. -device io # I/O & EFI runtime device +# Pseudo devices device mem # Memory and kernel memory devices +device io # I/O & EFI runtime device # 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..527b861 100644 --- a/sys/pc98/conf/DEFAULTS +++ b/sys/pc98/conf/DEFAULTS @@ -6,14 +6,14 @@ machine pc98 i386 options PC98 -# Bus support. +# Bus support device isa options ISAPNP -# Floating point support. +# Floating point support device npx -# Pseudo devices. +# Pseudo devices device mem # Memory and kernel memory devices device io # I/O device diff --git a/sys/powerpc/conf/DEFAULTS b/sys/powerpc/conf/DEFAULTS index 658c221..195a78f 100644 --- a/sys/powerpc/conf/DEFAULTS +++ b/sys/powerpc/conf/DEFAULTS @@ -3,12 +3,15 @@ # # $FreeBSD$ -# Pseudo devices. +machine powerpc powerpc + +# 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..36f3d66 100644 --- a/sys/powerpc/conf/GENERIC +++ b/sys/powerpc/conf/GENERIC @@ -21,8 +21,6 @@ cpu AIM ident GENERIC -machine powerpc powerpc - makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols # Platform support 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 --XsQoSWH+UP9D9v3l--