From owner-svn-src-all@freebsd.org Mon Nov 21 15:35:57 2016 Return-Path: Delivered-To: svn-src-all@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 E1AE4C4DA8C; Mon, 21 Nov 2016 15:35:57 +0000 (UTC) (envelope-from br@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 9A2901FCB; Mon, 21 Nov 2016 15:35:57 +0000 (UTC) (envelope-from br@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uALFZu2Z020874; Mon, 21 Nov 2016 15:35:56 GMT (envelope-from br@FreeBSD.org) Received: (from br@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uALFZuR1020869; Mon, 21 Nov 2016 15:35:56 GMT (envelope-from br@FreeBSD.org) Message-Id: <201611211535.uALFZuR1020869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: br set sender to br@FreeBSD.org using -f From: Ruslan Bukin Date: Mon, 21 Nov 2016 15:35:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308927 - head/sys/mips/conf X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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, 21 Nov 2016 15:35:58 -0000 Author: br Date: Mon Nov 21 15:35:56 2016 New Revision: 308927 URL: https://svnweb.freebsd.org/changeset/base/308927 Log: Move FDT option to the main SoC file and mark boards config as NO_UNIVERSE. Pointed out by: andrew Sponsored by: DARPA, AFRL Modified: head/sys/mips/conf/CANNA head/sys/mips/conf/CI20 head/sys/mips/conf/JZ4780 head/sys/mips/conf/X1000 Modified: head/sys/mips/conf/CANNA ============================================================================== --- head/sys/mips/conf/CANNA Mon Nov 21 14:43:31 2016 (r308926) +++ head/sys/mips/conf/CANNA Mon Nov 21 15:35:56 2016 (r308927) @@ -2,10 +2,11 @@ # # $FreeBSD$ +#NO_UNIVERSE + include "X1000" ident CANNA -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=ingenic/canna.dts Modified: head/sys/mips/conf/CI20 ============================================================================== --- head/sys/mips/conf/CI20 Mon Nov 21 14:43:31 2016 (r308926) +++ head/sys/mips/conf/CI20 Mon Nov 21 15:35:56 2016 (r308927) @@ -2,10 +2,11 @@ # # $FreeBSD$ +#NO_UNIVERSE + include "JZ4780" ident CI20 -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=ingenic/ci20.dts @@ -27,5 +28,4 @@ options ROOTDEVNAME=\"ufs:mmcsd0\" makeoptions TRAMPLOADADDR=0x88000000 #options VERBOSE_SYSINIT -device dme options PRINTF_BUFR_SIZE=256 Modified: head/sys/mips/conf/JZ4780 ============================================================================== --- head/sys/mips/conf/JZ4780 Mon Nov 21 14:43:31 2016 (r308926) +++ head/sys/mips/conf/JZ4780 Mon Nov 21 15:35:56 2016 (r308927) @@ -78,6 +78,8 @@ device da device mmc device mmcsd +device dme + # USB support options USB_DEBUG # enable debug msgs options USB_HOST_ALIGN=128 # L2 cache line size @@ -90,3 +92,6 @@ device uhid # "Human Interface Devices #device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da device ums # Mouse + +# FDT support +options FDT Modified: head/sys/mips/conf/X1000 ============================================================================== --- head/sys/mips/conf/X1000 Mon Nov 21 14:43:31 2016 (r308926) +++ head/sys/mips/conf/X1000 Mon Nov 21 15:35:56 2016 (r308927) @@ -87,3 +87,6 @@ device mmcsd #device ulpt # Printer #device umass # Disks/Mass storage - Requires scbus and da #device ums # Mouse + +# FDT support +options FDT