summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsbruno <sbruno@FreeBSD.org>2014-09-07 20:27:48 +0000
committersbruno <sbruno@FreeBSD.org>2014-09-07 20:27:48 +0000
commit1c96a23edcb78cf219ba7cc0ae3b48539aebc3a0 (patch)
treebaa06b6327d249c444431285f79ed98bf51fff55
parenteb057430f05c8ad43697c0b7e39a77e661142580 (diff)
downloadFreeBSD-src-1c96a23edcb78cf219ba7cc0ae3b48539aebc3a0.zip
FreeBSD-src-1c96a23edcb78cf219ba7cc0ae3b48539aebc3a0.tar.gz
Remove redundant kern conf entries that are inherited via include
Move cfg to spi1 as that's where it is located from the factory
-rw-r--r--sys/mips/conf/WZR-300HP6
-rw-r--r--sys/mips/conf/WZR-300HP.hints2
2 files changed, 1 insertions, 7 deletions
diff --git a/sys/mips/conf/WZR-300HP b/sys/mips/conf/WZR-300HP
index ce86403..8f84776 100644
--- a/sys/mips/conf/WZR-300HP
+++ b/sys/mips/conf/WZR-300HP
@@ -21,12 +21,6 @@ options AR71XX_REALMEM=64*1024*1024
options AR71XX_ENV_UBOOT
options BOOTVERBOSE
-# Don't include the SCSI/CAM strings in the default build
-options SCSI_NO_SENSE_STRINGS
-options SCSI_NO_OP_STRINGS
-
-# .. And no sysctl strings
-options NO_SYSCTL_DESCR
# GEOM modules
device geom_map # to get access to the SPI flash partitions
diff --git a/sys/mips/conf/WZR-300HP.hints b/sys/mips/conf/WZR-300HP.hints
index 070f381..07d8a71 100644
--- a/sys/mips/conf/WZR-300HP.hints
+++ b/sys/mips/conf/WZR-300HP.hints
@@ -108,7 +108,7 @@ hint.map.4.name="rootfs"
hint.map.4.readonly=1
#hint.map.5.at="flash/spi1"
-hint.map.5.at="flash/spi0"
+hint.map.5.at="flash/spi1"
hint.map.5.start=0x00FF0000
hint.map.5.end= 0x01000000
hint.map.5.name="cfg"
OpenPOWER on IntegriCloud