Remove the need for files.beaglebone and std.beaglebone by moving the one

option they defined into files.am335x.
2014-10-13 16:16:32 +00:00 · 2014-10-13 16:16:32 +00:00 · a590cc4501
commit a590cc4501
parent bbcf98d942
4 changed files with 2 additions and 8 deletions
--- 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"

--- a/sys/arm/ti/am335x/files.am335x
+++ b/sys/arm/ti/am335x/files.am335x
@ -5,6 +5,7 @@ arm/ti/aintc.c				standard
 arm/ti/am335x/am335x_dmtimer.c		standard
 arm/ti/am335x/am335x_lcd.c		optional	sc
 arm/ti/am335x/am335x_lcd_syscons.c	optional	sc
+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
--- a/sys/arm/ti/am335x/files.beaglebone
+++ b/sys/arm/ti/am335x/files.beaglebone
@ -1,3 +0,0 @@
-#$FreeBSD$
-
-arm/ti/am335x/am335x_pmic.c			optional	am335x_pmic
--- a/sys/arm/ti/am335x/std.beaglebone
+++ b/sys/arm/ti/am335x/std.beaglebone
@ -1,4 +0,0 @@
-# $FreeBSD$
-
-files		"../ti/am335x/files.beaglebone"
-include		"../ti/am335x/std.am335x"