From owner-svn-src-head@freebsd.org Fri Feb 26 18:54:28 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A784AB4DEB; Fri, 26 Feb 2016 18:54:28 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CFFD99A8; Fri, 26 Feb 2016 18:54:27 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1QIsQuf074095; Fri, 26 Feb 2016 18:54:26 GMT (envelope-from andrew@FreeBSD.org) Received: (from andrew@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1QIsQrk074094; Fri, 26 Feb 2016 18:54:26 GMT (envelope-from andrew@FreeBSD.org) Message-Id: <201602261854.u1QIsQrk074094@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andrew set sender to andrew@FreeBSD.org using -f From: Andrew Turner Date: Fri, 26 Feb 2016 18:54:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296105 - head/sys/arm/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2016 18:54:28 -0000 Author: andrew Date: Fri Feb 26 18:54:26 2016 New Revision: 296105 URL: https://svnweb.freebsd.org/changeset/base/296105 Log: Make the CUBIEBOARD config include the A10 config with a few needed additions. This is used by the release scripts so we need to keep it around for now. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/conf/CUBIEBOARD Modified: head/sys/arm/conf/CUBIEBOARD ============================================================================== --- head/sys/arm/conf/CUBIEBOARD Fri Feb 26 18:52:06 2016 (r296104) +++ head/sys/arm/conf/CUBIEBOARD Fri Feb 26 18:54:26 2016 (r296105) @@ -19,97 +19,15 @@ # # $FreeBSD$ -ident CUBIEBOARD - -include "std.armv6" -include "../allwinner/std.a10" - -options SOC_ALLWINNER_A10 - -options HZ=100 -options SCHED_4BSD # 4BSD scheduler -options PLATFORM - -# Debugging for use in -current -makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -options ALT_BREAK_TO_DEBUGGER -#options VERBOSE_SYSINIT # Enable verbose sysinit messages -options KDB # Enable kernel debugger support -# For minimum debugger support (stable branch) use: -#options KDB_TRACE # Print a stack trace for a panic -# For full debugger support use this instead: -options DDB # Enable the kernel debugger -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 DIAGNOSTIC +#NO_UNIVERSE -# NFS root from boopt/dhcp -#options BOOTP -#options BOOTP_NFSROOT -#options BOOTP_COMPAT -#options BOOTP_NFSV3 -#options BOOTP_WIRED_TO=cpsw0 +include "A10" +ident CUBIEBOARD # Boot device is 2nd slice on MMC/SD card options ROOTDEVNAME=\"ufs:/dev/da0s2\" -# MMC/SD/SDIO Card slot support -device mmc # mmc/sd bus -device mmcsd # mmc/sd flash cards - -# ATA controllers -device ahci # AHCI-compatible SATA controllers -#device ata # Legacy ATA/SATA controllers - -# Console and misc -device uart -device uart_ns8250 -device pty -device snp -device md -device random # Entropy device - -# I2C support -#device iicbus -#device iic - -# GPIO -device gpio - -device scbus # SCSI bus (required for ATA/SCSI) -device da # Direct Access (disks) -device pass # Passthrough device (direct ATA/SCSI access) - -# USB support -options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. -device usb -options USB_DEBUG -#options USB_REQ_DEBUG -#options USB_VERBOSE -#device uhci -#device ohci -device ehci - -device umass - -# Ethernet -device loop -device ether -device mii -device bpf - -device emac - -# USB ethernet support, requires miibus -device miibus - -# Pinmux -device fdt_pinctrl - # Flattened Device Tree -options FDT # Configure using FDT/DTB data +options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=cubieboard.dts -makeoptions MODULES_EXTRA=dtb/allwinner