diff options
| author | Warner Losh <imp@FreeBSD.org> | 2014-08-14 04:21:14 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2014-08-14 04:21:14 +0000 |
| commit | 280cfc8438ea07c1bbb0a085b1d1af9f69dfc19c (patch) | |
| tree | 4c541e962d5700842c65906f1ea2030dd7b74339 | |
| parent | 161fedb9cc4991fa971be77cebd7a64f909c4e54 (diff) | |
| download | src-280cfc8438ea07c1bbb0a085b1d1af9f69dfc19c.tar.gz src-280cfc8438ea07c1bbb0a085b1d1af9f69dfc19c.zip | |
Add support for FDT and !FDT configs on Atmel, though FDT isn't
working yet.
Bump rev on arm Makefile since files.at91 uses new '!' operator.
Notes
Notes:
svn path=/head/; revision=269957
| -rw-r--r-- | sys/arm/at91/files.at91 | 26 | ||||
| -rw-r--r-- | sys/conf/Makefile.arm | 2 |
2 files changed, 18 insertions, 10 deletions
diff --git a/sys/arm/at91/files.at91 b/sys/arm/at91/files.at91 index f8af397cc379..f8a98eb9ab4b 100644 --- a/sys/arm/at91/files.at91 +++ b/sys/arm/at91/files.at91 @@ -3,28 +3,34 @@ arm/arm/cpufunc_asm_arm9.S standard arm/at91/at91_machdep.c standard arm/at91/at91_aic.c standard arm/at91/at91.c standard -arm/at91/at91_cfata.c optional at91_cfata -arm/at91/at91_mci.c optional at91_mci -dev/nand/nfc_at91.c optional nand +arm/at91/at91_aic.c standard arm/at91/at91_pio.c standard arm/at91/at91_pmc.c standard +arm/at91/at91_smc.c standard +arm/at91/at91_cfata.c optional at91_cfata +arm/at91/at91_common.c optional fdt +arm/at91/at91_mci.c optional at91_mci +arm/at91/at91_pinctrl.c optional fdt 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_smc.c standard +arm/at91/at91_sdramc.c optional fdt +arm/at91/at91_shdwc.c optional fdt 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 optional at91rm9200 -arm/at91/at91_tc.c optional at91_tc +arm/at91/at91_tcb.c optional fdt 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_at91usart.c optional uart +arm/at91/uart_bus_at91usart.c optional uart ! fdt +arm/at91/uart_cpu_at91usart.c optional uart ! fdt arm/at91/uart_dev_at91usart.c optional uart +dev/uart/uart_cpu_fdt.c optional uart fdt +dev/nand/nfc_at91.c optional nand # # All the "systems on a chip" we support # @@ -54,5 +60,7 @@ arm/at91/board_tsc4370.c optional at91_board_tsc4370 # usb # dev/usb/controller/at91dci.c optional at91_dci -dev/usb/controller/at91dci_atmelarm.c optional at91_dci -dev/usb/controller/ohci_atmelarm.c optional ohci +dev/usb/controller/at91dci_atmelarm.c optional at91_dci !fdt +dev/usb/controller/ohci_atmelarm.c optional ohci !fdt +dev/usb/controller/at91dci_fdt.c optional at91_dci fdt +dev/usb/controller/ohci_fdt.c optional ohci fdt diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 06f75a7b0a7e..67db55dd6fa6 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600012 +%VERSREQ= 600013 STD8X16FONT?= iso |