aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-19 15:57:06 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-19 15:57:06 +0000
commitb50cfe077c9a0e2d5060e575be3675ccc02840d0 (patch)
treed4727fd20173a9355cd02580ef5345a1b54984fe
parent8a2e4b49dee0cb5289581375929147e9d72c7b9b (diff)
downloadupstream-b50cfe077c9a0e2d5060e575be3675ccc02840d0.tar.gz
upstream-b50cfe077c9a0e2d5060e575be3675ccc02840d0.tar.bz2
upstream-b50cfe077c9a0e2d5060e575be3675ccc02840d0.zip
ar71xx: sync kernel configs
SVN-Revision: 31026
-rw-r--r--target/linux/ar71xx/config-3.21
-rw-r--r--target/linux/ar71xx/nand/config-default14
2 files changed, 8 insertions, 7 deletions
diff --git a/target/linux/ar71xx/config-3.2 b/target/linux/ar71xx/config-3.2
index dd05e9401e..ec9086ac01 100644
--- a/target/linux/ar71xx/config-3.2
+++ b/target/linux/ar71xx/config-3.2
@@ -149,6 +149,7 @@ CONFIG_IRQ_FORCED_THREADING=y
# CONFIG_LEDS_WNDR3700_USB is not set
# CONFIG_M25PXX_USE_FAST_READ is not set
CONFIG_MARVELL_PHY=y
+CONFIG_MDIO_BOARDINFO=y
CONFIG_MICREL_PHY=y
# CONFIG_MINIX_FS_NATIVE_ENDIAN is not set
CONFIG_MIPS=y
diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
index 49302fb81c..f558df36fc 100644
--- a/target/linux/ar71xx/nand/config-default
+++ b/target/linux/ar71xx/nand/config-default
@@ -1,22 +1,22 @@
-CONFIG_IP17XX_PHY=y
CONFIG_MDIO_BITBANG=y
CONFIG_MDIO_GPIO=y
CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND_RB4XX=y
CONFIG_MTD_NAND_RB750=y
+# CONFIG_MTD_SM_COMMON is not set
CONFIG_SPI_RB4XX=y
CONFIG_SPI_RB4XX_CPLD=y
CONFIG_YAFFS_9BYTE_TAGS=y
CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED=y
CONFIG_YAFFS_AUTO_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
+# CONFIG_YAFFS_DISABLE_BACKGROUND is not set
+# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set
+# CONFIG_YAFFS_DISABLE_TAGS_ECC is not set
# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
+# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set
CONFIG_YAFFS_FS=y
CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
+CONFIG_YAFFS_XATTR=y
CONFIG_YAFFS_YAFFS1=y
CONFIG_YAFFS_YAFFS2=y
-# CONFIG_YAFFS_DISABLE_TAGS_ECC is not set
-# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set
-# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set
-# CONFIG_YAFFS_DISABLE_BACKGROUND is not set
-CONFIG_YAFFS_XATTR=y