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
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"

Reply via email to