From 082afa63f6e85af35e8e63bd0f5a0838dcef0948 Mon Sep 17 00:00:00 2001 From: Sean Bruno Date: Sun, 7 Sep 2014 20:27:48 +0000 Subject: [PATCH] Remove redundant kern conf entries that are inherited via include Move cfg to spi1 as that's where it is located from the factory --- sys/mips/conf/WZR-300HP | 6 ------ sys/mips/conf/WZR-300HP.hints | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/mips/conf/WZR-300HP b/sys/mips/conf/WZR-300HP index ce864035f2df..8f84776a7f63 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 070f38172577..07d8a7170242 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"