diff options
| author | Marius Strobl <marius@FreeBSD.org> | 2012-06-03 01:07:55 +0000 |
|---|---|---|
| committer | Marius Strobl <marius@FreeBSD.org> | 2012-06-03 01:07:55 +0000 |
| commit | 57974eb5769293d4f378eadbbd0d84aa68620b10 (patch) | |
| tree | 33310ae1cfc0662290f54ba2bb33ccdf6dfb3b62 /sys | |
| parent | 7f2107d400373c2753a1a1adf3a23e1554ac5f5b (diff) | |
| download | src-57974eb5769293d4f378eadbbd0d84aa68620b10.tar.gz src-57974eb5769293d4f378eadbbd0d84aa68620b10.zip | |
- Now that the DataFlash related drivers work properly (at91_spi(4) since
r236495 and at45d(4) since r236496), enable them by default.
- Sort BOOTP options.
Notes
Notes:
svn path=/head/; revision=236497
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arm/conf/ETHERNUT5 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5 index 31c278bc5857..65490b04dfca 100644 --- a/sys/arm/conf/ETHERNUT5 +++ b/sys/arm/conf/ETHERNUT5 @@ -66,11 +66,11 @@ options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. #options INCLUDE_CONFIG_FILE # Include this file in kernel # required for netbooting -options BOOTP_NFSROOT options BOOTP +options BOOTP_COMPAT +options BOOTP_NFSROOT options BOOTP_NFSV3 options BOOTP_WIRED_TO=ate0 -options BOOTP_COMPAT # alternatively, boot from a MMC/SD memory card #options ROOTDEVNAME=\"ufs:/dev/mmcsd0a\" @@ -117,11 +117,11 @@ options AT91_MCI_HAS_4WIRE device mmc # MMC/SD bus device mmcsd # MMC/SD memory card -# DataFlash - totally b0rken drivers -#device at91_spi # Atmel AT91 Serial Peripheral Interface -#device spibus # SPI bus -#device at45d # Atmel AT45D -#device geom_map # GEOM partition mapping +# DataFlash +device at91_spi # Atmel AT91 Serial Peripheral Interface +device spibus # SPI bus +device at45d # Atmel AT45D +device geom_map # GEOM partition mapping # Pseudo devices. device loop # Network loopback |