aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-06-08 20:19:20 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-06-08 20:19:20 +0000
commit2666ae6f0e7626a589ba3e7a81ed87bfde0f1ab5 (patch)
treed417785ff5c913780002d4fea5dd22f7d6bdbd57
parentd55ebf3a8a0241ae7fe2354dbfd7103f9fbfb243 (diff)
downloadupstream-2666ae6f0e7626a589ba3e7a81ed87bfde0f1ab5.tar.gz
upstream-2666ae6f0e7626a589ba3e7a81ed87bfde0f1ab5.tar.bz2
upstream-2666ae6f0e7626a589ba3e7a81ed87bfde0f1ab5.zip
ar71xx: enable the IP17xx driver for the nand subtarget
Also disable the old ICPlus driver. SVN-Revision: 21729
-rw-r--r--target/linux/ar71xx/config-2.6.321
-rw-r--r--target/linux/ar71xx/config-2.6.331
-rw-r--r--target/linux/ar71xx/config-2.6.341
-rw-r--r--target/linux/ar71xx/nand/config-default2
4 files changed, 1 insertions, 4 deletions
diff --git a/target/linux/ar71xx/config-2.6.32 b/target/linux/ar71xx/config-2.6.32
index 5c29816afa..af8f36bd66 100644
--- a/target/linux/ar71xx/config-2.6.32
+++ b/target/linux/ar71xx/config-2.6.32
@@ -129,7 +129,6 @@ CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_GPIO=y
-CONFIG_ICPLUS_PHY=y
CONFIG_IMAGE_CMDLINE_HACK=y
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
CONFIG_INITRAMFS_ROOT_GID=0
diff --git a/target/linux/ar71xx/config-2.6.33 b/target/linux/ar71xx/config-2.6.33
index f9172b773f..fbea210bc7 100644
--- a/target/linux/ar71xx/config-2.6.33
+++ b/target/linux/ar71xx/config-2.6.33
@@ -139,7 +139,6 @@ CONFIG_I2C=y
CONFIG_I2C_ALGOBIT=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_GPIO=y
-CONFIG_ICPLUS_PHY=y
CONFIG_IMAGE_CMDLINE_HACK=y
# CONFIG_INITRAMFS_COMPRESSION_LZO is not set
CONFIG_INITRAMFS_ROOT_GID=0
diff --git a/target/linux/ar71xx/config-2.6.34 b/target/linux/ar71xx/config-2.6.34
index b458149cb2..98fdd7c6f9 100644
--- a/target/linux/ar71xx/config-2.6.34
+++ b/target/linux/ar71xx/config-2.6.34
@@ -152,7 +152,6 @@ CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_GPIO=y
# CONFIG_I2C_SMBUS is not set
# CONFIG_I2C_XILINX is not set
-CONFIG_ICPLUS_PHY=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_IMAGE_CMDLINE_HACK=y
diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
index 3fa8d7b160..bde9171128 100644
--- a/target/linux/ar71xx/nand/config-default
+++ b/target/linux/ar71xx/nand/config-default
@@ -1,3 +1,4 @@
+CONFIG_IP17XX_PHY=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_RB4XX=y
CONFIG_MTD_NAND_RB750=y
@@ -10,4 +11,3 @@ CONFIG_YAFFS_FS=y
CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
CONFIG_YAFFS_YAFFS1=y
CONFIG_YAFFS_YAFFS2=y
-