From owner-svn-src-projects@FreeBSD.ORG Fri Dec 20 16:50:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0659DA7; Fri, 20 Dec 2013 16:50:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 73AF314F8; Fri, 20 Dec 2013 16:50:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBKGorNB042803; Fri, 20 Dec 2013 16:50:53 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBKGor2T042802; Fri, 20 Dec 2013 16:50:53 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201312201650.rBKGor2T042802@svn.freebsd.org> From: Andrew Turner Date: Fri, 20 Dec 2013 16:50:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r259658 - projects/specific_leg/sys/arm/conf X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2013 16:50:53 -0000 Author: andrew Date: Fri Dec 20 16:50:52 2013 New Revision: 259658 URL: http://svnweb.freebsd.org/changeset/base/259658 Log: Update the GENERIC kernel to comment out sc and related optoins, and to add the CPU_CORTEXA cpu. With this I can boot the same kernel on a Raspberry Pi, and a Panda Board. Modified: projects/specific_leg/sys/arm/conf/GENERIC Modified: projects/specific_leg/sys/arm/conf/GENERIC ============================================================================== --- projects/specific_leg/sys/arm/conf/GENERIC Fri Dec 20 16:37:03 2013 (r259657) +++ projects/specific_leg/sys/arm/conf/GENERIC Fri Dec 20 16:50:52 2013 (r259658) @@ -23,6 +23,7 @@ ident GENERIC # This kernel supports ARMv6 and later machine arm armv6 cpu CPU_ARM1176 +cpu CPU_CORTEXA files "../broadcom/bcm2835/files.bcm2835" files "../ti/omap4/files.omap4" @@ -87,12 +88,12 @@ device pl310 # PL310 L2 cache contro device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) -device kbdmux # keyboard multiplexer +#device kbdmux # keyboard multiplexer # syscons is the default console driver, resembling an SCO console -device sc -options SC_DFLT_FONT # compile font in -makeoptions SC_DFLT_FONT=cp437 +#device sc +#options SC_DFLT_FONT # compile font in +#makeoptions SC_DFLT_FONT=cp437 # Serial (COM) ports device uart # Generic UART driver @@ -120,13 +121,13 @@ device bpf # Berkeley packet filter # USB support options USB_DEBUG # enable debug msgs # One or more of these break RPi -#device uhci # UHCI USB interface -#device ohci # OHCI USB interface -#device ehci # EHCI USB interface (USB 2.0) +device uhci # UHCI USB interface +device ohci # OHCI USB interface +device ehci # EHCI USB interface (USB 2.0) #device xhci # XHCI USB interface (USB 3.0) device dwcotg # DWC OTG controller device usb # USB Bus (required) -device ukbd # Keyboard +#device ukbd # Keyboard device umass # Disks/Mass storage - Requires scbus and da # MMC/SD/SDIO Card slot support