From owner-svn-src-stable-10@FreeBSD.ORG Mon Feb 2 12:36:06 2015 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7C93A26C; Mon, 2 Feb 2015 12:36:06 +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 4DB17D80; Mon, 2 Feb 2015 12:36:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t12Ca6r1045699; Mon, 2 Feb 2015 12:36:06 GMT (envelope-from loos@FreeBSD.org) Received: (from loos@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t12Ca5U1045697; Mon, 2 Feb 2015 12:36:05 GMT (envelope-from loos@FreeBSD.org) Message-Id: <201502021236.t12Ca5U1045697@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org using -f From: Luiz Otavio O Souza Date: Mon, 2 Feb 2015 12:36:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278078 - in stable/10/sys/arm: conf ti/am335x X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 12:36:06 -0000 Author: loos Date: Mon Feb 2 12:36:05 2015 New Revision: 278078 URL: https://svnweb.freebsd.org/changeset/base/278078 Log: MFC r261459, r273045, r273047. r261459: Remove trailing tabs causing false grep positives. r273045: Sort the files in the am355x directory. r273047: Remove the need for files.beaglebone and std.beaglebone by moving the one option they defined into files.am335x. Deleted: stable/10/sys/arm/ti/am335x/files.beaglebone stable/10/sys/arm/ti/am335x/std.beaglebone Modified: stable/10/sys/arm/conf/BEAGLEBONE stable/10/sys/arm/ti/am335x/files.am335x Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/conf/BEAGLEBONE ============================================================================== --- stable/10/sys/arm/conf/BEAGLEBONE Mon Feb 2 12:10:24 2015 (r278077) +++ stable/10/sys/arm/conf/BEAGLEBONE Mon Feb 2 12:36:05 2015 (r278078) @@ -22,7 +22,7 @@ ident BEAGLEBONE -include "../ti/am335x/std.beaglebone" +include "../ti/am335x/std.am335x" makeoptions WITHOUT_MODULES="ahc" Modified: stable/10/sys/arm/ti/am335x/files.am335x ============================================================================== --- stable/10/sys/arm/ti/am335x/files.am335x Mon Feb 2 12:10:24 2015 (r278077) +++ stable/10/sys/arm/ti/am335x/files.am335x Mon Feb 2 12:36:05 2015 (r278078) @@ -1,13 +1,16 @@ #$FreeBSD$ arm/ti/aintc.c standard -arm/ti/am335x/am335x_prcm.c standard + arm/ti/am335x/am335x_dmtimer.c standard -arm/ti/am335x/am335x_scm_padconf.c standard -arm/ti/am335x/am335x_lcd.c optional sc +arm/ti/am335x/am335x_lcd.c optional sc arm/ti/am335x/am335x_lcd_syscons.c optional sc -arm/ti/am335x/am335x_pwm.c standard +arm/ti/am335x/am335x_pmic.c optional am335x_pmic +arm/ti/am335x/am335x_prcm.c standard +arm/ti/am335x/am335x_pwm.c standard +arm/ti/am335x/am335x_scm_padconf.c standard arm/ti/am335x/am335x_usbss.c optional musb fdt + arm/ti/ti_edma3.c standard arm/ti/ti_sdhci.c optional sdhci #arm/ti/ti_mmchs.c optional mmc