Author: imp
Date: Fri Jun 15 07:50:26 2012
New Revision: 237122
URL: http://svn.freebsd.org/changeset/base/237122
Log:
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.
Deleted:
head/sys/arm/at91/files.at91sam9
Modified:
head/sys/arm/at91/files.at91
head/sys/arm/at91/std.at91
head/sys/arm/at91/std.at91sam9
Modified: head/sys/arm/at91/files.at91
==============================================================================
--- head/sys/arm/at91/files.at91 Fri Jun 15 07:42:44 2012
(r237121)
+++ head/sys/arm/at91/files.at91 Fri Jun 15 07:50:26 2012
(r237122)
@@ -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
Modified: head/sys/arm/at91/std.at91
==============================================================================
--- head/sys/arm/at91/std.at91 Fri Jun 15 07:42:44 2012 (r237121)
+++ head/sys/arm/at91/std.at91 Fri Jun 15 07:50:26 2012 (r237122)
@@ -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
Modified: head/sys/arm/at91/std.at91sam9
==============================================================================
--- head/sys/arm/at91/std.at91sam9 Fri Jun 15 07:42:44 2012
(r237121)
+++ head/sys/arm/at91/std.at91sam9 Fri Jun 15 07:50:26 2012
(r237122)
@@ -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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
