summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2012-06-03 01:07:55 +0000
committermarius <marius@FreeBSD.org>2012-06-03 01:07:55 +0000
commit245e8ceaa321ef5e788e794127465a5957c15f03 (patch)
tree33310ae1cfc0662290f54ba2bb33ccdf6dfb3b62
parent8573447bb655201aa7209a2e4efcc16e84f33c18 (diff)
downloadFreeBSD-src-245e8ceaa321ef5e788e794127465a5957c15f03.zip
FreeBSD-src-245e8ceaa321ef5e788e794127465a5957c15f03.tar.gz
- 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.
-rw-r--r--sys/arm/conf/ETHERNUT514
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5
index 31c278b..65490b0 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
OpenPOWER on IntegriCloud