From owner-svn-src-all@FreeBSD.ORG Mon Jul 2 21:25:25 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F81C106566C; Mon, 2 Jul 2012 21:25:25 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 637A18FC0A; Mon, 2 Jul 2012 21:25:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q62LPPtF000618; Mon, 2 Jul 2012 21:25:25 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q62LPPpH000614; Mon, 2 Jul 2012 21:25:25 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201207022125.q62LPPpH000614@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 2 Jul 2012 21:25:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r238034 - head/sys/powerpc/conf X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Jul 2012 21:25:25 -0000 Author: marcel Date: Mon Jul 2 21:25:24 2012 New Revision: 238034 URL: http://svn.freebsd.org/changeset/base/238034 Log: Remove device uart_z8530 and options GEOM_PART_APM from DEFAULTS and instead add them to GENERIC and GENERIC64. They are applicable to Apple H/W and not at all for Book-E platforms. Modified: head/sys/powerpc/conf/DEFAULTS head/sys/powerpc/conf/GENERIC head/sys/powerpc/conf/GENERIC64 Modified: head/sys/powerpc/conf/DEFAULTS ============================================================================== --- head/sys/powerpc/conf/DEFAULTS Mon Jul 2 21:21:12 2012 (r238033) +++ head/sys/powerpc/conf/DEFAULTS Mon Jul 2 21:25:24 2012 (r238034) @@ -8,9 +8,7 @@ device mem # Memory and kernel memory # UART chips on this platform device uart_ns8250 -device uart_z8530 -options GEOM_PART_APM options GEOM_PART_MBR options NEW_PCIB Modified: head/sys/powerpc/conf/GENERIC ============================================================================== --- head/sys/powerpc/conf/GENERIC Mon Jul 2 21:21:12 2012 (r238033) +++ head/sys/powerpc/conf/GENERIC Mon Jul 2 21:25:24 2012 (r238034) @@ -49,6 +49,7 @@ options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework +options GEOM_PART_APM #Apple Partition Maps. options GEOM_PART_GPT #GUID Partition Tables. options GEOM_LABEL #Provides labelization options COMPAT_FREEBSD4 #Keep this for a while @@ -127,6 +128,7 @@ makeoptions SC_DFLT_FONT=cp437 # Serial (COM) ports device scc device uart +device uart_z8530 # PCI Ethernet NICs that use the common MII bus controller code. device miibus # MII bus support Modified: head/sys/powerpc/conf/GENERIC64 ============================================================================== --- head/sys/powerpc/conf/GENERIC64 Mon Jul 2 21:21:12 2012 (r238033) +++ head/sys/powerpc/conf/GENERIC64 Mon Jul 2 21:25:24 2012 (r238034) @@ -49,6 +49,7 @@ options MSDOSFS #MSDOS Filesystem options CD9660 #ISO 9660 Filesystem options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework +options GEOM_PART_APM #Apple Partition Maps. options GEOM_PART_GPT #GUID Partition Tables. options GEOM_LABEL #Provides labelization options COMPAT_FREEBSD32 #Compatible with FreeBSD/powerpc binaries @@ -125,6 +126,7 @@ makeoptions SC_DFLT_FONT=cp437 # Serial (COM) ports device scc device uart +device uart_z8530 # Ethernet hardware device glc # Sony Playstation 3 Ethernet