From e6e7584dcdd797e7872f4de4355e4d110aae1285 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 15 Jun 2012 07:50:26 +0000
Subject: [PATCH] Collapse the files.at91 and files.at91sam9 back into
 files.at91. Create a new option for at91rm9200 support.  Set this option in
 std.at91.  Create a new option for the at91sam9 standard devices.  Set this
 option in std.at91sam9.  Retire files.at91sam9.  Add options for at91sam9x25
 SoC and SAM9X25EK board, but don't connect it just yet as the supporting
 files aren't quite ready.

Note: device at91rm9200 and device at91sam9 are presently mutually
exclusive.
---
 sys/arm/at91/files.at91     | 17 +++++++++++++++--
 sys/arm/at91/files.at91sam9 | 37 -------------------------------------
 sys/arm/at91/std.at91       |  3 +++
 sys/arm/at91/std.at91sam9   |  9 ++++++---
 4 files changed, 24 insertions(+), 42 deletions(-)
 delete mode 100644 sys/arm/at91/files.at91sam9

diff --git a/sys/arm/at91/files.at91 b/sys/arm/at91/files.at91
index 4aa0b0ce4124..081690102e7e 100644
--- a/sys/arm/at91/files.at91
+++ b/sys/arm/at91/files.at91
@@ -8,25 +8,38 @@ arm/at91/at91_mci.c		optional	at91_mci
 arm/at91/at91_nand.c		optional	nand
 arm/at91/at91_pio.c		standard
 arm/at91/at91_pmc.c		standard
+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_spi.c		optional	at91_spi		\
 	dependency	"spibus_if.h"
 arm/at91/at91_ssc.c		optional	at91_ssc
-arm/at91/at91_st.c		standard
+arm/at91/at91_st.c		optional	at91rm9200
 arm/at91/at91_tc.c		optional	at91_tc
 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_at91rm9200usart.c	optional	uart
 arm/at91/uart_dev_at91usart.c	optional	uart
 #
 # All the "systems on a chip" we support
 #
-arm/at91/at91rm9200.c		standard
+arm/at91/at91rm9200.c		optional	at91rm9200
+arm/at91/at91sam9260.c		optional	at91sam9260
+arm/at91/at91sam9g20.c		optional	at91sam9g20
+arm/at91/at91sam9x25.c		optional	at91sam9x25
 #
 # All the boards we support
 #
 arm/at91/board_bwct.c		optional	at91_board_bwct
+arm/at91/board_ethernut5.c	optional	at91_board_ethernut5
 arm/at91/board_hl200.c		optional	at91_board_hl200
+arm/at91/board_hl201.c		optional	at91_board_hl201
 arm/at91/board_kb920x.c		optional	at91_board_kb920x
+arm/at91/board_qila9g20.c	optional	at91_board_qila9g20
+arm/at91/board_sam9g20ek.c	optional	at91_board_sam9g20ek
+arm/at91/board_sam9x25ek.c	optional	at91_board_sam9x25ek
 arm/at91/board_tsc4370.c	optional	at91_board_tsc4370
diff --git a/sys/arm/at91/files.at91sam9 b/sys/arm/at91/files.at91sam9
deleted file mode 100644
index a05f883f91b2..000000000000
--- a/sys/arm/at91/files.at91sam9
+++ /dev/null
@@ -1,37 +0,0 @@
-# $FreeBSD$
-arm/arm/cpufunc_asm_arm9.S	standard
-arm/arm/irq_dispatch.S		standard
-arm/at91/at91_machdep.c		standard
-arm/at91/at91.c			standard
-arm/at91/at91_mci.c		optional	at91_mci
-arm/at91/at91_nand.c		optional	nand
-arm/at91/at91_pio.c		standard
-arm/at91/at91_pmc.c		standard
-arm/at91/at91_pit.c		standard
-arm/at91/at91_reset.S		standard
-arm/at91/at91_rst.c		standard
-arm/at91/at91_spi.c		optional	at91_spi		\
-	dependency	"spibus_if.h"
-arm/at91/at91_ssc.c		optional	at91_ssc
-arm/at91/at91_tc.c		optional	at91_tc
-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_at91rm9200usart.c	optional	uart
-arm/at91/uart_dev_at91usart.c	optional	uart
-dev/usb/controller/ohci_atmelarm.c	optional	ohci
-#
-# All the "systems on a chip" we support
-#
-arm/at91/at91sam9g20.c		optional	at91sam9g20
-arm/at91/at91sam9260.c		optional	at91sam9260
-#
-#
-# All the boards we support
-#
-arm/at91/board_ethernut5.c	optional	at91_board_ethernut5
-arm/at91/board_hl201.c		optional	at91_board_hl201
-arm/at91/board_sam9g20ek.c	optional	at91_board_sam9g20ek
-arm/at91/board_qila9g20.c	optional	at91_board_qila9g20
diff --git a/sys/arm/at91/std.at91 b/sys/arm/at91/std.at91
index b2b9dd6ec1ec..fe577212d58d 100644
--- a/sys/arm/at91/std.at91
+++ b/sys/arm/at91/std.at91
@@ -4,3 +4,6 @@ files	"../at91/files.at91"
 cpu		CPU_ARM9
 makeoptions	CONF_CFLAGS=-mcpu=arm9
 options 	PHYSADDR=0x20000000
+
+# For now, just do the AT91RM9200
+device		at91rm9200
diff --git a/sys/arm/at91/std.at91sam9 b/sys/arm/at91/std.at91sam9
index ab1fa9547a90..91ce69d3a377 100644
--- a/sys/arm/at91/std.at91sam9
+++ b/sys/arm/at91/std.at91sam9
@@ -1,9 +1,12 @@
 # $FreeBSD$
 
-files	"../at91/files.at91sam9"
+files	"../at91/files.at91"
 cpu		CPU_ARM9
-makeoptions	CONF_CFLAGS="-mcpu=arm9"
+makeoptions	CONF_CFLAGS=-mcpu=arm9
 options 	PHYSADDR=0x20000000
 
-device		at91sam9g20
+# bring in the sam specific timers and such
+device		at91sam9
+
 device		at91sam9260
+device		at91sam9g20