From owner-svn-src-all@freebsd.org Fri Nov 4 04:47:09 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 8AE87C2FFE2; Fri, 4 Nov 2016 04:47:09 +0000 (UTC) (envelope-from manu@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 5A30C14BB; Fri, 4 Nov 2016 04:47:09 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uA44l8Tn040787; Fri, 4 Nov 2016 04:47:08 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uA44l8M2040786; Fri, 4 Nov 2016 04:47:08 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201611040447.uA44l8M2040786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 4 Nov 2016 04:47:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r308285 - 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-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: Fri, 04 Nov 2016 04:47:09 -0000 Author: manu Date: Fri Nov 4 04:47:08 2016 New Revision: 308285 URL: https://svnweb.freebsd.org/changeset/base/308285 Log: Add Allwinner UP SoC support to GENERIC on armv6 Relnotes: yes Modified: head/sys/arm/conf/GENERIC Modified: head/sys/arm/conf/GENERIC ============================================================================== --- head/sys/arm/conf/GENERIC Fri Nov 4 04:06:55 2016 (r308284) +++ head/sys/arm/conf/GENERIC Fri Nov 4 04:47:08 2016 (r308285) @@ -30,6 +30,9 @@ options KERNVIRTADDR=0xc0000000 include "std.armv6" files "../allwinner/files.allwinner" +files "../allwinner/files.allwinner_up" +files "../allwinner/a10/files.a10" +files "../allwinner/a13/files.a13" files "../allwinner/a20/files.a20" files "../allwinner/a31/files.a31" files "../allwinner/a83t/files.a83t" @@ -41,6 +44,8 @@ files "../qemu/files.qemu" files "../ti/files.ti" files "../ti/am335x/files.am335x" +options SOC_ALLWINNER_A10 +options SOC_ALLWINNER_A13 options SOC_ALLWINNER_A20 options SOC_ALLWINNER_A31 options SOC_ALLWINNER_A31S @@ -180,7 +185,7 @@ device vlan # 802.1Q VLAN support device mii device bpf -#device emac # 10/100 integrated EMAC controller +device emac # 10/100 integrated EMAC controller device dwc # 10/100/1000 integrated GMAC controller device awg # 10/100/1000 integrated EMAC controller