From 8b0255da5e11c65b6b91b9cec8ef4364ce238665 Mon Sep 17 00:00:00 2001
From: loos <loos@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Mon, 2 Feb 2015 12:36:05 +0000
Subject: [PATCH] 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.


git-svn-id: svn://svn.freebsd.org/base/stable/10@278078 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/arm/conf/BEAGLEBONE            |  2 +-
 sys/arm/ti/am335x/files.am335x     | 11 +++++++----
 sys/arm/ti/am335x/files.beaglebone |  3 ---
 sys/arm/ti/am335x/std.beaglebone   |  4 ----
 4 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 sys/arm/ti/am335x/files.beaglebone
 delete mode 100644 sys/arm/ti/am335x/std.beaglebone

diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index e654ad5e5..2da371b2e 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -22,7 +22,7 @@
 
 ident		BEAGLEBONE
 
-include		"../ti/am335x/std.beaglebone"
+include		"../ti/am335x/std.am335x"
 
 makeoptions	WITHOUT_MODULES="ahc"
 
diff --git a/sys/arm/ti/am335x/files.am335x b/sys/arm/ti/am335x/files.am335x
index be0b6413a..3bb44e3b6 100644
--- a/sys/arm/ti/am335x/files.am335x
+++ b/sys/arm/ti/am335x/files.am335x
@@ -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
diff --git a/sys/arm/ti/am335x/files.beaglebone b/sys/arm/ti/am335x/files.beaglebone
deleted file mode 100644
index ff527ce21..000000000
--- a/sys/arm/ti/am335x/files.beaglebone
+++ /dev/null
@@ -1,3 +0,0 @@
-#$FreeBSD$
-
-arm/ti/am335x/am335x_pmic.c			optional	am335x_pmic
diff --git a/sys/arm/ti/am335x/std.beaglebone b/sys/arm/ti/am335x/std.beaglebone
deleted file mode 100644
index 299e82253..000000000
--- a/sys/arm/ti/am335x/std.beaglebone
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-
-files		"../ti/am335x/files.beaglebone"
-include		"../ti/am335x/std.am335x"
-- 
2.45.0