aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Brunck <holger.brunck@keymile.com>2012-05-08 09:57:21 -0400
committerKumar Gala <galak@kernel.crashing.org>2012-07-10 08:07:20 -0400
commit7ee0bf533606f6ac5bc33f4ae60a4b04914675fb (patch)
tree87b7f27cac94478e0d261f89fd6bc7ee5f16b8f0
parent4bfc1dd9d67492fb127cc054c7d2b8ca9c3f76f8 (diff)
powerpc/83xx: update defconfig for kmeter1
Switch on UBIFS, HOTPLUG and TIPC and update the config to the latest kernel version. Signed-off-by: Holger Brunck <holger.brunck@keymile.com> cc: Heiko Schocher <hs@denx.de> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/configs/83xx/kmeter1_defconfig22
1 files changed, 8 insertions, 14 deletions
diff --git a/arch/powerpc/configs/83xx/kmeter1_defconfig b/arch/powerpc/configs/83xx/kmeter1_defconfig
index 07e1bbadebfe..a0dfef1fcdb7 100644
--- a/arch/powerpc/configs/83xx/kmeter1_defconfig
+++ b/arch/powerpc/configs/83xx/kmeter1_defconfig
@@ -2,14 +2,14 @@ CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 2# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 3CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 4CONFIG_POSIX_MQUEUE=y
5CONFIG_SPARSE_IRQ=y
6CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
7CONFIG_EXPERT=y 6CONFIG_EXPERT=y
8# CONFIG_HOTPLUG is not set
9CONFIG_SLAB=y 7CONFIG_SLAB=y
10CONFIG_MODULES=y 8CONFIG_MODULES=y
11CONFIG_MODULE_UNLOAD=y 9CONFIG_MODULE_UNLOAD=y
12# CONFIG_BLK_DEV_BSG is not set 10# CONFIG_BLK_DEV_BSG is not set
11CONFIG_PARTITION_ADVANCED=y
12# CONFIG_MSDOS_PARTITION is not set
13# CONFIG_IOSCHED_DEADLINE is not set 13# CONFIG_IOSCHED_DEADLINE is not set
14# CONFIG_IOSCHED_CFQ is not set 14# CONFIG_IOSCHED_CFQ is not set
15# CONFIG_PPC_CHRP is not set 15# CONFIG_PPC_CHRP is not set
@@ -31,11 +31,10 @@ CONFIG_IP_PNP=y
31# CONFIG_INET_XFRM_MODE_BEET is not set 31# CONFIG_INET_XFRM_MODE_BEET is not set
32# CONFIG_INET_LRO is not set 32# CONFIG_INET_LRO is not set
33# CONFIG_IPV6 is not set 33# CONFIG_IPV6 is not set
34CONFIG_TIPC=y
34CONFIG_BRIDGE=m 35CONFIG_BRIDGE=m
35CONFIG_VLAN_8021Q=y 36CONFIG_VLAN_8021Q=y
36CONFIG_MTD=y 37CONFIG_MTD=y
37CONFIG_MTD_CONCAT=y
38CONFIG_MTD_PARTITIONS=y
39CONFIG_MTD_CMDLINE_PARTS=y 38CONFIG_MTD_CMDLINE_PARTS=y
40CONFIG_MTD_CHAR=y 39CONFIG_MTD_CHAR=y
41CONFIG_MTD_BLOCK=y 40CONFIG_MTD_BLOCK=y
@@ -50,17 +49,15 @@ CONFIG_MTD_UBI_DEBUG=y
50CONFIG_PROC_DEVICETREE=y 49CONFIG_PROC_DEVICETREE=y
51CONFIG_NETDEVICES=y 50CONFIG_NETDEVICES=y
52CONFIG_DUMMY=y 51CONFIG_DUMMY=y
53CONFIG_TUN=y
54CONFIG_MII=y 52CONFIG_MII=y
55CONFIG_MARVELL_PHY=y 53CONFIG_TUN=y
56CONFIG_NET_ETHERNET=y
57CONFIG_UCC_GETH=y 54CONFIG_UCC_GETH=y
58# CONFIG_NETDEV_10000 is not set 55CONFIG_MARVELL_PHY=y
59CONFIG_WAN=y
60CONFIG_HDLC=y
61CONFIG_PPP=y 56CONFIG_PPP=y
62CONFIG_PPP_MULTILINK=y 57CONFIG_PPP_MULTILINK=y
63CONFIG_PPPOE=y 58CONFIG_PPPOE=y
59CONFIG_WAN=y
60CONFIG_HDLC=y
64# CONFIG_INPUT is not set 61# CONFIG_INPUT is not set
65# CONFIG_SERIO is not set 62# CONFIG_SERIO is not set
66# CONFIG_VT is not set 63# CONFIG_VT is not set
@@ -77,10 +74,7 @@ CONFIG_UIO=y
77# CONFIG_DNOTIFY is not set 74# CONFIG_DNOTIFY is not set
78CONFIG_TMPFS=y 75CONFIG_TMPFS=y
79CONFIG_JFFS2_FS=y 76CONFIG_JFFS2_FS=y
77CONFIG_UBIFS_FS=y
80CONFIG_NFS_FS=y 78CONFIG_NFS_FS=y
81CONFIG_NFS_V3=y 79CONFIG_NFS_V3=y
82CONFIG_ROOT_NFS=y 80CONFIG_ROOT_NFS=y
83CONFIG_PARTITION_ADVANCED=y
84# CONFIG_MSDOS_PARTITION is not set
85# CONFIG_RCU_CPU_STALL_DETECTOR is not set
86CONFIG_SYSCTL_SYSCALL_CHECK=y