From owner-svn-src-all@FreeBSD.ORG Thu Aug 14 04:21:15 2014 Return-Path: Delivered-To: svn-src-all@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 B082A761; Thu, 14 Aug 2014 04:21:15 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 91E422BD1; Thu, 14 Aug 2014 04:21:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7E4LFXI046347; Thu, 14 Aug 2014 04:21:15 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7E4LFdf046343; Thu, 14 Aug 2014 04:21:15 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201408140421.s7E4LFdf046343@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 14 Aug 2014 04:21:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r269957 - in head/sys: arm/at91 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.18-1 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: Thu, 14 Aug 2014 04:21:15 -0000 Author: imp Date: Thu Aug 14 04:21:14 2014 New Revision: 269957 URL: http://svnweb.freebsd.org/changeset/base/269957 Log: Add support for FDT and !FDT configs on Atmel, though FDT isn't working yet. Bump rev on arm Makefile since files.at91 uses new '!' operator. Modified: head/sys/arm/at91/files.at91 head/sys/conf/Makefile.arm Modified: head/sys/arm/at91/files.at91 ============================================================================== --- head/sys/arm/at91/files.at91 Thu Aug 14 04:20:13 2014 (r269956) +++ head/sys/arm/at91/files.at91 Thu Aug 14 04:21:14 2014 (r269957) @@ -3,28 +3,34 @@ arm/arm/cpufunc_asm_arm9.S standard arm/at91/at91_machdep.c standard arm/at91/at91_aic.c standard arm/at91/at91.c standard -arm/at91/at91_cfata.c optional at91_cfata -arm/at91/at91_mci.c optional at91_mci -dev/nand/nfc_at91.c optional nand +arm/at91/at91_aic.c standard arm/at91/at91_pio.c standard arm/at91/at91_pmc.c standard +arm/at91/at91_smc.c standard +arm/at91/at91_cfata.c optional at91_cfata +arm/at91/at91_common.c optional fdt +arm/at91/at91_mci.c optional at91_mci +arm/at91/at91_pinctrl.c optional fdt arm/at91/at91_pit.c optional at91sam9 arm/at91/at91_reset.S optional at91sam9 arm/at91/at91_rst.c optional at91sam9 arm/at91/at91_rtc.c optional at91_rtc -arm/at91/at91_smc.c standard +arm/at91/at91_sdramc.c optional fdt +arm/at91/at91_shdwc.c optional fdt arm/at91/at91_spi.c optional at91_spi \ dependency "spibus_if.h" arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_st.c optional at91rm9200 -arm/at91/at91_tc.c optional at91_tc +arm/at91/at91_tcb.c optional fdt arm/at91/at91_twi.c optional at91_twi arm/at91/at91_wdt.c optional at91_wdt arm/at91/if_ate.c optional ate arm/at91/if_macb.c optional macb -arm/at91/uart_bus_at91usart.c optional uart -arm/at91/uart_cpu_at91usart.c optional uart +arm/at91/uart_bus_at91usart.c optional uart ! fdt +arm/at91/uart_cpu_at91usart.c optional uart ! fdt arm/at91/uart_dev_at91usart.c optional uart +dev/uart/uart_cpu_fdt.c optional uart fdt +dev/nand/nfc_at91.c optional nand # # All the "systems on a chip" we support # @@ -54,5 +60,7 @@ arm/at91/board_tsc4370.c optional at91_b # usb # dev/usb/controller/at91dci.c optional at91_dci -dev/usb/controller/at91dci_atmelarm.c optional at91_dci -dev/usb/controller/ohci_atmelarm.c optional ohci +dev/usb/controller/at91dci_atmelarm.c optional at91_dci !fdt +dev/usb/controller/ohci_atmelarm.c optional ohci !fdt +dev/usb/controller/at91dci_fdt.c optional at91_dci fdt +dev/usb/controller/ohci_fdt.c optional ohci fdt Modified: head/sys/conf/Makefile.arm ============================================================================== --- head/sys/conf/Makefile.arm Thu Aug 14 04:20:13 2014 (r269956) +++ head/sys/conf/Makefile.arm Thu Aug 14 04:21:14 2014 (r269957) @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600012 +%VERSREQ= 600013 STD8X16FONT?= iso