aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/powerpc/boot/cuboot-warp.c43
-rw-r--r--arch/powerpc/boot/dts/haleakala.dts5
-rw-r--r--arch/powerpc/boot/dts/kilauea.dts5
-rw-r--r--arch/powerpc/boot/dts/makalu.dts5
-rw-r--r--arch/powerpc/boot/dts/warp.dts42
-rw-r--r--arch/powerpc/configs/40x/acadia_defconfig76
-rw-r--r--arch/powerpc/configs/40x/ep405_defconfig87
-rw-r--r--arch/powerpc/configs/40x/hcu4_defconfig78
-rw-r--r--arch/powerpc/configs/40x/kilauea_defconfig76
-rw-r--r--arch/powerpc/configs/40x/makalu_defconfig76
-rw-r--r--arch/powerpc/configs/40x/virtex_defconfig53
-rw-r--r--arch/powerpc/configs/40x/walnut_defconfig84
-rw-r--r--arch/powerpc/configs/44x/arches_defconfig60
-rw-r--r--arch/powerpc/configs/44x/bamboo_defconfig76
-rw-r--r--arch/powerpc/configs/44x/canyonlands_defconfig60
-rw-r--r--arch/powerpc/configs/44x/ebony_defconfig84
-rw-r--r--arch/powerpc/configs/44x/katmai_defconfig76
-rw-r--r--arch/powerpc/configs/44x/rainier_defconfig83
-rw-r--r--arch/powerpc/configs/44x/sam440ep_defconfig77
-rw-r--r--arch/powerpc/configs/44x/sequoia_defconfig83
-rw-r--r--arch/powerpc/configs/44x/taishan_defconfig83
-rw-r--r--arch/powerpc/configs/44x/virtex5_defconfig53
-rw-r--r--arch/powerpc/configs/44x/warp_defconfig138
-rw-r--r--arch/powerpc/configs/ppc40x_defconfig77
-rw-r--r--arch/powerpc/configs/ppc44x_defconfig79
-rw-r--r--arch/powerpc/platforms/44x/Makefile1
-rw-r--r--arch/powerpc/platforms/44x/warp-nand.c135
27 files changed, 1203 insertions, 592 deletions
diff --git a/arch/powerpc/boot/cuboot-warp.c b/arch/powerpc/boot/cuboot-warp.c
index 21780210057d..806df693fea6 100644
--- a/arch/powerpc/boot/cuboot-warp.c
+++ b/arch/powerpc/boot/cuboot-warp.c
@@ -18,57 +18,14 @@
18 18
19static bd_t bd; 19static bd_t bd;
20 20
21static void warp_fixup_one_nor(u32 from, u32 to)
22{
23 void *devp;
24 char name[50];
25 u32 v[2];
26
27 sprintf(name, "/plb/opb/ebc/nor_flash@0,0/partition@%x", from);
28
29 devp = finddevice(name);
30 if (!devp)
31 return;
32
33 if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
34 v[0] = to;
35 setprop(devp, "reg", v, sizeof(v));
36
37 printf("NOR 64M fixup %x -> %x\r\n", from, to);
38 }
39}
40
41
42static void warp_fixups(void) 21static void warp_fixups(void)
43{ 22{
44 ibm440ep_fixup_clocks(66000000, 11059200, 50000000); 23 ibm440ep_fixup_clocks(66000000, 11059200, 50000000);
45 ibm4xx_sdram_fixup_memsize(); 24 ibm4xx_sdram_fixup_memsize();
46 ibm4xx_fixup_ebc_ranges("/plb/opb/ebc"); 25 ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
47 dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr); 26 dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
48
49 /* Fixup for 64M flash on Rev A boards. */
50 if (bd.bi_flashsize == 0x4000000) {
51 void *devp;
52 u32 v[3];
53
54 devp = finddevice("/plb/opb/ebc/nor_flash@0,0");
55 if (!devp)
56 return;
57
58 /* Fixup the size */
59 if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
60 v[2] = bd.bi_flashsize;
61 setprop(devp, "reg", v, sizeof(v));
62 }
63
64 /* Fixup parition offsets */
65 warp_fixup_one_nor(0x300000, 0x3f00000);
66 warp_fixup_one_nor(0x340000, 0x3f40000);
67 warp_fixup_one_nor(0x380000, 0x3f80000);
68 }
69} 27}
70 28
71
72void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 29void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
73 unsigned long r6, unsigned long r7) 30 unsigned long r6, unsigned long r7)
74{ 31{
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index 513bc43a71af..5b2a4947bf82 100644
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -89,8 +89,11 @@
89 clock-frequency = <0>; /* Filled in by U-Boot */ 89 clock-frequency = <0>; /* Filled in by U-Boot */
90 90
91 SDRAM0: memory-controller { 91 SDRAM0: memory-controller {
92 compatible = "ibm,sdram-405exr"; 92 compatible = "ibm,sdram-405exr", "ibm,sdram-4xx-ddr2";
93 dcr-reg = <0x010 0x002>; 93 dcr-reg = <0x010 0x002>;
94 interrupt-parent = <&UIC2>;
95 interrupts = <0x5 0x4 /* ECC DED Error */
96 0x6 0x4>; /* ECC SEC Error */
94 }; 97 };
95 98
96 MAL0: mcmal { 99 MAL0: mcmal {
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index dececc4b5ff2..2804444812e5 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -90,8 +90,11 @@
90 clock-frequency = <0>; /* Filled in by U-Boot */ 90 clock-frequency = <0>; /* Filled in by U-Boot */
91 91
92 SDRAM0: memory-controller { 92 SDRAM0: memory-controller {
93 compatible = "ibm,sdram-405ex"; 93 compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2";
94 dcr-reg = <0x010 0x002>; 94 dcr-reg = <0x010 0x002>;
95 interrupt-parent = <&UIC2>;
96 interrupts = <0x5 0x4 /* ECC DED Error */
97 0x6 0x4>; /* ECC SEC Error */
95 }; 98 };
96 99
97 MAL0: mcmal { 100 MAL0: mcmal {
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index 945508c7e7d8..ffc246e72670 100644
--- a/arch/powerpc/boot/dts/makalu.dts
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -90,8 +90,11 @@
90 clock-frequency = <0>; /* Filled in by U-Boot */ 90 clock-frequency = <0>; /* Filled in by U-Boot */
91 91
92 SDRAM0: memory-controller { 92 SDRAM0: memory-controller {
93 compatible = "ibm,sdram-405ex"; 93 compatible = "ibm,sdram-405ex", "ibm,sdram-4xx-ddr2";
94 dcr-reg = <0x010 0x002>; 94 dcr-reg = <0x010 0x002>;
95 interrupt-parent = <&UIC2>;
96 interrupts = <0x5 0x4 /* ECC DED Error */
97 0x6 0x4 /* ECC SEC Error */ >;
95 }; 98 };
96 99
97 MAL0: mcmal { 100 MAL0: mcmal {
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
index f4e4ba69eef7..7e183ff9a317 100644
--- a/arch/powerpc/boot/dts/warp.dts
+++ b/arch/powerpc/boot/dts/warp.dts
@@ -149,12 +149,17 @@
149 reg = <0x00000002 0x00004000 0x00000A00>; 149 reg = <0x00000002 0x00004000 0x00000A00>;
150 }; 150 };
151 151
152 nor_flash@0,0 { 152 nor@0,0 {
153 compatible = "amd,s29gl032a", "cfi-flash"; 153 compatible = "amd,s29gl032a", "cfi-flash";
154 bank-width = <2>; 154 bank-width = <2>;
155 reg = <0x00000000 0x00000000 0x00400000>; 155 reg = <0x00000000 0x00000000 0x00400000>;
156 #address-cells = <1>; 156 #address-cells = <1>;
157 #size-cells = <1>; 157 #size-cells = <1>;
158
159 partition@0 {
160 label = "splash";
161 reg = <0x00000000 0x00020000>;
162 };
158 partition@300000 { 163 partition@300000 {
159 label = "fpga"; 164 label = "fpga";
160 reg = <0x0300000 0x00040000>; 165 reg = <0x0300000 0x00040000>;
@@ -168,6 +173,41 @@
168 reg = <0x0380000 0x00080000>; 173 reg = <0x0380000 0x00080000>;
169 }; 174 };
170 }; 175 };
176
177 ndfc@1,0 {
178 compatible = "ibm,ndfc";
179 reg = <0x00000001 0x00000000 0x00002000>;
180 ccr = <0x00001000>;
181 bank-settings = <0x80002222>;
182 #address-cells = <1>;
183 #size-cells = <1>;
184
185 nand {
186 #address-cells = <1>;
187 #size-cells = <1>;
188
189 partition@0 {
190 label = "kernel";
191 reg = <0x00000000 0x00200000>;
192 };
193 partition@200000 {
194 label = "root";
195 reg = <0x00200000 0x03E00000>;
196 };
197 partition@40000000 {
198 label = "persistent";
199 reg = <0x04000000 0x04000000>;
200 };
201 partition@80000000 {
202 label = "persistent1";
203 reg = <0x08000000 0x04000000>;
204 };
205 partition@C0000000 {
206 label = "persistent2";
207 reg = <0x0C000000 0x04000000>;
208 };
209 };
210 };
171 }; 211 };
172 212
173 UART0: serial@ef600300 { 213 UART0: serial@ef600300 {
diff --git a/arch/powerpc/configs/40x/acadia_defconfig b/arch/powerpc/configs/40x/acadia_defconfig
index 25572cc837ca..a32ec8d323a0 100644
--- a/arch/powerpc/configs/40x/acadia_defconfig
+++ b/arch/powerpc/configs/40x/acadia_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:18 2008 4# Tue Jan 20 08:17:46 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155# CONFIG_PPC4xx_PCI_EXPRESS is not set 157# CONFIG_PPC4xx_PCI_EXPRESS is not set
156 158
@@ -182,6 +184,7 @@ CONFIG_405EZ=y
182# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_SIMPLE_GPIO is not set
185 188
186# 189#
187# Kernel options 190# Kernel options
@@ -205,6 +208,7 @@ CONFIG_BINFMT_ELF=y
205# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
211CONFIG_PPC_NEED_DMA_SYNC_OPS=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
209CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -219,12 +223,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y 230CONFIG_UNEVICTABLE_LRU=y
231CONFIG_PPC_4K_PAGES=y
232# CONFIG_PPC_16K_PAGES is not set
233# CONFIG_PPC_64K_PAGES is not set
228CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -248,6 +254,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
248# CONFIG_PCI_MSI is not set 254# CONFIG_PCI_MSI is not set
249CONFIG_PCI_LEGACY=y 255CONFIG_PCI_LEGACY=y
250# CONFIG_PCI_DEBUG is not set 256# CONFIG_PCI_DEBUG is not set
257# CONFIG_PCI_STUB is not set
251# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -272,6 +279,7 @@ CONFIG_NET=y
272# 279#
273# Networking options 280# Networking options
274# 281#
282CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 283CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 284# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 285CONFIG_UNIX=y
@@ -322,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_ECONET is not set 330# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 331# CONFIG_WAN_ROUTER is not set
324# CONFIG_NET_SCHED is not set 332# CONFIG_NET_SCHED is not set
333# CONFIG_DCB is not set
325 334
326# 335#
327# Network testing 336# Network testing
@@ -334,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
335# CONFIG_PHONET is not set 344# CONFIG_PHONET is not set
336# CONFIG_WIRELESS is not set 345# CONFIG_WIRELESS is not set
346# CONFIG_WIMAX is not set
337# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
338# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
339 349
@@ -359,6 +369,7 @@ CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set 369# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set 370# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y 371CONFIG_MTD_PARTITIONS=y
372# CONFIG_MTD_TESTS is not set
362# CONFIG_MTD_REDBOOT_PARTS is not set 373# CONFIG_MTD_REDBOOT_PARTS is not set
363CONFIG_MTD_CMDLINE_PARTS=y 374CONFIG_MTD_CMDLINE_PARTS=y
364CONFIG_MTD_OF_PARTS=y 375CONFIG_MTD_OF_PARTS=y
@@ -431,6 +442,12 @@ CONFIG_MTD_PHYSMAP_OF=y
431# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
432 443
433# 444#
445# LPDDR flash memory drivers
446#
447# CONFIG_MTD_LPDDR is not set
448# CONFIG_MTD_QINFO_PROBE is not set
449
450#
434# UBI - Unsorted block images 451# UBI - Unsorted block images
435# 452#
436# CONFIG_MTD_UBI is not set 453# CONFIG_MTD_UBI is not set
@@ -524,6 +541,10 @@ CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR=y
524# CONFIG_WLAN_PRE80211 is not set 541# CONFIG_WLAN_PRE80211 is not set
525# CONFIG_WLAN_80211 is not set 542# CONFIG_WLAN_80211 is not set
526# CONFIG_IWLWIFI_LEDS is not set 543# CONFIG_IWLWIFI_LEDS is not set
544
545#
546# Enable WiMAX (Networking options) to see the WiMAX drivers
547#
527# CONFIG_WAN is not set 548# CONFIG_WAN is not set
528# CONFIG_FDDI is not set 549# CONFIG_FDDI is not set
529# CONFIG_HIPPI is not set 550# CONFIG_HIPPI is not set
@@ -576,9 +597,12 @@ CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 597CONFIG_SERIAL_CORE_CONSOLE=y
577# CONFIG_SERIAL_JSM is not set 598# CONFIG_SERIAL_JSM is not set
578CONFIG_SERIAL_OF_PLATFORM=y 599CONFIG_SERIAL_OF_PLATFORM=y
600# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
579CONFIG_UNIX98_PTYS=y 601CONFIG_UNIX98_PTYS=y
602# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
580CONFIG_LEGACY_PTYS=y 603CONFIG_LEGACY_PTYS=y
581CONFIG_LEGACY_PTY_COUNT=256 604CONFIG_LEGACY_PTY_COUNT=256
605# CONFIG_HVC_UDBG is not set
582# CONFIG_IPMI_HANDLER is not set 606# CONFIG_IPMI_HANDLER is not set
583# CONFIG_HW_RANDOM is not set 607# CONFIG_HW_RANDOM is not set
584# CONFIG_NVRAM is not set 608# CONFIG_NVRAM is not set
@@ -597,11 +621,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
597# CONFIG_HWMON is not set 621# CONFIG_HWMON is not set
598CONFIG_THERMAL=y 622CONFIG_THERMAL=y
599# CONFIG_WATCHDOG is not set 623# CONFIG_WATCHDOG is not set
624CONFIG_SSB_POSSIBLE=y
600 625
601# 626#
602# Sonics Silicon Backplane 627# Sonics Silicon Backplane
603# 628#
604CONFIG_SSB_POSSIBLE=y
605# CONFIG_SSB is not set 629# CONFIG_SSB is not set
606 630
607# 631#
@@ -611,7 +635,7 @@ CONFIG_SSB_POSSIBLE=y
611# CONFIG_MFD_SM501 is not set 635# CONFIG_MFD_SM501 is not set
612# CONFIG_HTC_PASIC3 is not set 636# CONFIG_HTC_PASIC3 is not set
613# CONFIG_MFD_TMIO is not set 637# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set 638# CONFIG_REGULATOR is not set
615 639
616# 640#
617# Multimedia devices 641# Multimedia devices
@@ -670,7 +694,9 @@ CONFIG_EXT2_FS=y
670# CONFIG_FS_POSIX_ACL is not set 694# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y 695CONFIG_FILE_LOCKING=y
672# CONFIG_XFS_FS is not set 696# CONFIG_XFS_FS is not set
697# CONFIG_GFS2_FS is not set
673# CONFIG_OCFS2_FS is not set 698# CONFIG_OCFS2_FS is not set
699# CONFIG_BTRFS_FS is not set
674CONFIG_DNOTIFY=y 700CONFIG_DNOTIFY=y
675CONFIG_INOTIFY=y 701CONFIG_INOTIFY=y
676CONFIG_INOTIFY_USER=y 702CONFIG_INOTIFY_USER=y
@@ -704,10 +730,7 @@ CONFIG_TMPFS=y
704# CONFIG_TMPFS_POSIX_ACL is not set 730# CONFIG_TMPFS_POSIX_ACL is not set
705# CONFIG_HUGETLB_PAGE is not set 731# CONFIG_HUGETLB_PAGE is not set
706# CONFIG_CONFIGFS_FS is not set 732# CONFIG_CONFIGFS_FS is not set
707 733CONFIG_MISC_FILESYSTEMS=y
708#
709# Miscellaneous filesystems
710#
711# CONFIG_ADFS_FS is not set 734# CONFIG_ADFS_FS is not set
712# CONFIG_AFFS_FS is not set 735# CONFIG_AFFS_FS is not set
713# CONFIG_HFS_FS is not set 736# CONFIG_HFS_FS is not set
@@ -717,6 +740,7 @@ CONFIG_TMPFS=y
717# CONFIG_EFS_FS is not set 740# CONFIG_EFS_FS is not set
718# CONFIG_JFFS2_FS is not set 741# CONFIG_JFFS2_FS is not set
719CONFIG_CRAMFS=y 742CONFIG_CRAMFS=y
743# CONFIG_SQUASHFS is not set
720# CONFIG_VXFS_FS is not set 744# CONFIG_VXFS_FS is not set
721# CONFIG_MINIX_FS is not set 745# CONFIG_MINIX_FS is not set
722# CONFIG_OMFS_FS is not set 746# CONFIG_OMFS_FS is not set
@@ -757,6 +781,7 @@ CONFIG_MSDOS_PARTITION=y
757# Library routines 781# Library routines
758# 782#
759CONFIG_BITREVERSE=y 783CONFIG_BITREVERSE=y
784CONFIG_GENERIC_FIND_LAST_BIT=y
760# CONFIG_CRC_CCITT is not set 785# CONFIG_CRC_CCITT is not set
761# CONFIG_CRC16 is not set 786# CONFIG_CRC16 is not set
762# CONFIG_CRC_T10DIF is not set 787# CONFIG_CRC_T10DIF is not set
@@ -807,6 +832,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
807# CONFIG_DEBUG_MEMORY_INIT is not set 832# CONFIG_DEBUG_MEMORY_INIT is not set
808# CONFIG_DEBUG_LIST is not set 833# CONFIG_DEBUG_LIST is not set
809# CONFIG_DEBUG_SG is not set 834# CONFIG_DEBUG_SG is not set
835# CONFIG_DEBUG_NOTIFIERS is not set
810# CONFIG_BOOT_PRINTK_DELAY is not set 836# CONFIG_BOOT_PRINTK_DELAY is not set
811# CONFIG_RCU_TORTURE_TEST is not set 837# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set 838# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -815,18 +841,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
815# CONFIG_FAULT_INJECTION is not set 841# CONFIG_FAULT_INJECTION is not set
816# CONFIG_LATENCYTOP is not set 842# CONFIG_LATENCYTOP is not set
817CONFIG_SYSCTL_SYSCALL_CHECK=y 843CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y 844CONFIG_HAVE_FUNCTION_TRACER=y
819CONFIG_HAVE_FTRACE=y
820CONFIG_HAVE_DYNAMIC_FTRACE=y 845CONFIG_HAVE_DYNAMIC_FTRACE=y
821# CONFIG_FTRACE is not set 846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
847
848#
849# Tracers
850#
851# CONFIG_FUNCTION_TRACER is not set
822# CONFIG_SCHED_TRACER is not set 852# CONFIG_SCHED_TRACER is not set
823# CONFIG_CONTEXT_SWITCH_TRACER is not set 853# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set 854# CONFIG_BOOT_TRACER is not set
855# CONFIG_TRACE_BRANCH_PROFILING is not set
825# CONFIG_STACK_TRACER is not set 856# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 857# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
827# CONFIG_SAMPLES is not set 858# CONFIG_SAMPLES is not set
828CONFIG_HAVE_ARCH_KGDB=y 859CONFIG_HAVE_ARCH_KGDB=y
829# CONFIG_KGDB is not set 860# CONFIG_KGDB is not set
861CONFIG_PRINT_STACK_DEPTH=64
830# CONFIG_DEBUG_STACKOVERFLOW is not set 862# CONFIG_DEBUG_STACKOVERFLOW is not set
831# CONFIG_DEBUG_STACK_USAGE is not set 863# CONFIG_DEBUG_STACK_USAGE is not set
832# CONFIG_DEBUG_PAGEALLOC is not set 864# CONFIG_DEBUG_PAGEALLOC is not set
@@ -853,11 +885,15 @@ CONFIG_CRYPTO=y
853# 885#
854# CONFIG_CRYPTO_FIPS is not set 886# CONFIG_CRYPTO_FIPS is not set
855CONFIG_CRYPTO_ALGAPI=y 887CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y 888CONFIG_CRYPTO_ALGAPI2=y
889CONFIG_CRYPTO_AEAD2=y
857CONFIG_CRYPTO_BLKCIPHER=y 890CONFIG_CRYPTO_BLKCIPHER=y
891CONFIG_CRYPTO_BLKCIPHER2=y
858CONFIG_CRYPTO_HASH=y 892CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y 893CONFIG_CRYPTO_HASH2=y
894CONFIG_CRYPTO_RNG2=y
860CONFIG_CRYPTO_MANAGER=y 895CONFIG_CRYPTO_MANAGER=y
896CONFIG_CRYPTO_MANAGER2=y
861# CONFIG_CRYPTO_GF128MUL is not set 897# CONFIG_CRYPTO_GF128MUL is not set
862# CONFIG_CRYPTO_NULL is not set 898# CONFIG_CRYPTO_NULL is not set
863# CONFIG_CRYPTO_CRYPTD is not set 899# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/ep405_defconfig b/arch/powerpc/configs/40x/ep405_defconfig
index b80ba7aa3129..4e9d85f39da0 100644
--- a/arch/powerpc/configs/40x/ep405_defconfig
+++ b/arch/powerpc/configs/40x/ep405_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:20 2008 4# Tue Jan 20 08:17:48 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155# CONFIG_PPC4xx_PCI_EXPRESS is not set 157# CONFIG_PPC4xx_PCI_EXPRESS is not set
156 158
@@ -184,6 +186,7 @@ CONFIG_IBM405_ERR51=y
184# CONFIG_GENERIC_IOMAP is not set 186# CONFIG_GENERIC_IOMAP is not set
185# CONFIG_CPU_FREQ is not set 187# CONFIG_CPU_FREQ is not set
186# CONFIG_FSL_ULI1575 is not set 188# CONFIG_FSL_ULI1575 is not set
189# CONFIG_SIMPLE_GPIO is not set
187 190
188# 191#
189# Kernel options 192# Kernel options
@@ -207,6 +210,7 @@ CONFIG_BINFMT_ELF=y
207# CONFIG_BINFMT_MISC is not set 210# CONFIG_BINFMT_MISC is not set
208# CONFIG_MATH_EMULATION is not set 211# CONFIG_MATH_EMULATION is not set
209# CONFIG_IOMMU_HELPER is not set 212# CONFIG_IOMMU_HELPER is not set
213CONFIG_PPC_NEED_DMA_SYNC_OPS=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
211CONFIG_ARCH_HAS_WALK_MEMORY=y 215CONFIG_ARCH_HAS_WALK_MEMORY=y
212CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -221,12 +225,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
221CONFIG_PAGEFLAGS_EXTENDED=y 225CONFIG_PAGEFLAGS_EXTENDED=y
222CONFIG_SPLIT_PTLOCK_CPUS=4 226CONFIG_SPLIT_PTLOCK_CPUS=4
223CONFIG_MIGRATION=y 227CONFIG_MIGRATION=y
224# CONFIG_RESOURCES_64BIT is not set
225# CONFIG_PHYS_ADDR_T_64BIT is not set 228# CONFIG_PHYS_ADDR_T_64BIT is not set
226CONFIG_ZONE_DMA_FLAG=1 229CONFIG_ZONE_DMA_FLAG=1
227CONFIG_BOUNCE=y 230CONFIG_BOUNCE=y
228CONFIG_VIRT_TO_BUS=y 231CONFIG_VIRT_TO_BUS=y
229CONFIG_UNEVICTABLE_LRU=y 232CONFIG_UNEVICTABLE_LRU=y
233CONFIG_PPC_4K_PAGES=y
234# CONFIG_PPC_16K_PAGES is not set
235# CONFIG_PPC_64K_PAGES is not set
230CONFIG_FORCE_MAX_ZONEORDER=11 236CONFIG_FORCE_MAX_ZONEORDER=11
231CONFIG_PROC_DEVICETREE=y 237CONFIG_PROC_DEVICETREE=y
232# CONFIG_CMDLINE_BOOL is not set 238# CONFIG_CMDLINE_BOOL is not set
@@ -250,6 +256,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
250# CONFIG_PCI_MSI is not set 256# CONFIG_PCI_MSI is not set
251CONFIG_PCI_LEGACY=y 257CONFIG_PCI_LEGACY=y
252# CONFIG_PCI_DEBUG is not set 258# CONFIG_PCI_DEBUG is not set
259# CONFIG_PCI_STUB is not set
253# CONFIG_PCCARD is not set 260# CONFIG_PCCARD is not set
254# CONFIG_HOTPLUG_PCI is not set 261# CONFIG_HOTPLUG_PCI is not set
255# CONFIG_HAS_RAPIDIO is not set 262# CONFIG_HAS_RAPIDIO is not set
@@ -274,6 +281,7 @@ CONFIG_NET=y
274# 281#
275# Networking options 282# Networking options
276# 283#
284CONFIG_COMPAT_NET_DEV_OPS=y
277CONFIG_PACKET=y 285CONFIG_PACKET=y
278# CONFIG_PACKET_MMAP is not set 286# CONFIG_PACKET_MMAP is not set
279CONFIG_UNIX=y 287CONFIG_UNIX=y
@@ -324,6 +332,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
324# CONFIG_ECONET is not set 332# CONFIG_ECONET is not set
325# CONFIG_WAN_ROUTER is not set 333# CONFIG_WAN_ROUTER is not set
326# CONFIG_NET_SCHED is not set 334# CONFIG_NET_SCHED is not set
335# CONFIG_DCB is not set
327 336
328# 337#
329# Network testing 338# Network testing
@@ -336,6 +345,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
336# CONFIG_AF_RXRPC is not set 345# CONFIG_AF_RXRPC is not set
337# CONFIG_PHONET is not set 346# CONFIG_PHONET is not set
338# CONFIG_WIRELESS is not set 347# CONFIG_WIRELESS is not set
348# CONFIG_WIMAX is not set
339# CONFIG_RFKILL is not set 349# CONFIG_RFKILL is not set
340# CONFIG_NET_9P is not set 350# CONFIG_NET_9P is not set
341 351
@@ -361,6 +371,7 @@ CONFIG_MTD=y
361# CONFIG_MTD_DEBUG is not set 371# CONFIG_MTD_DEBUG is not set
362# CONFIG_MTD_CONCAT is not set 372# CONFIG_MTD_CONCAT is not set
363CONFIG_MTD_PARTITIONS=y 373CONFIG_MTD_PARTITIONS=y
374# CONFIG_MTD_TESTS is not set
364# CONFIG_MTD_REDBOOT_PARTS is not set 375# CONFIG_MTD_REDBOOT_PARTS is not set
365CONFIG_MTD_CMDLINE_PARTS=y 376CONFIG_MTD_CMDLINE_PARTS=y
366CONFIG_MTD_OF_PARTS=y 377CONFIG_MTD_OF_PARTS=y
@@ -433,6 +444,12 @@ CONFIG_MTD_PHYSMAP_OF=y
433# CONFIG_MTD_ONENAND is not set 444# CONFIG_MTD_ONENAND is not set
434 445
435# 446#
447# LPDDR flash memory drivers
448#
449# CONFIG_MTD_LPDDR is not set
450# CONFIG_MTD_QINFO_PROBE is not set
451
452#
436# UBI - Unsorted block images 453# UBI - Unsorted block images
437# 454#
438# CONFIG_MTD_UBI is not set 455# CONFIG_MTD_UBI is not set
@@ -464,6 +481,7 @@ CONFIG_MISC_DEVICES=y
464# CONFIG_TIFM_CORE is not set 481# CONFIG_TIFM_CORE is not set
465# CONFIG_ENCLOSURE_SERVICES is not set 482# CONFIG_ENCLOSURE_SERVICES is not set
466# CONFIG_HP_ILO is not set 483# CONFIG_HP_ILO is not set
484# CONFIG_C2PORT is not set
467CONFIG_HAVE_IDE=y 485CONFIG_HAVE_IDE=y
468# CONFIG_IDE is not set 486# CONFIG_IDE is not set
469 487
@@ -546,6 +564,7 @@ CONFIG_NETDEV_1000=y
546# CONFIG_JME is not set 564# CONFIG_JME is not set
547CONFIG_NETDEV_10000=y 565CONFIG_NETDEV_10000=y
548# CONFIG_CHELSIO_T1 is not set 566# CONFIG_CHELSIO_T1 is not set
567CONFIG_CHELSIO_T3_DEPENDS=y
549# CONFIG_CHELSIO_T3 is not set 568# CONFIG_CHELSIO_T3 is not set
550# CONFIG_ENIC is not set 569# CONFIG_ENIC is not set
551# CONFIG_IXGBE is not set 570# CONFIG_IXGBE is not set
@@ -570,6 +589,10 @@ CONFIG_NETDEV_10000=y
570# CONFIG_IWLWIFI_LEDS is not set 589# CONFIG_IWLWIFI_LEDS is not set
571 590
572# 591#
592# Enable WiMAX (Networking options) to see the WiMAX drivers
593#
594
595#
573# USB Network Adapters 596# USB Network Adapters
574# 597#
575# CONFIG_USB_CATC is not set 598# CONFIG_USB_CATC is not set
@@ -629,9 +652,12 @@ CONFIG_SERIAL_CORE=y
629CONFIG_SERIAL_CORE_CONSOLE=y 652CONFIG_SERIAL_CORE_CONSOLE=y
630# CONFIG_SERIAL_JSM is not set 653# CONFIG_SERIAL_JSM is not set
631CONFIG_SERIAL_OF_PLATFORM=y 654CONFIG_SERIAL_OF_PLATFORM=y
655# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
632CONFIG_UNIX98_PTYS=y 656CONFIG_UNIX98_PTYS=y
657# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
633CONFIG_LEGACY_PTYS=y 658CONFIG_LEGACY_PTYS=y
634CONFIG_LEGACY_PTY_COUNT=256 659CONFIG_LEGACY_PTY_COUNT=256
660# CONFIG_HVC_UDBG is not set
635# CONFIG_IPMI_HANDLER is not set 661# CONFIG_IPMI_HANDLER is not set
636# CONFIG_HW_RANDOM is not set 662# CONFIG_HW_RANDOM is not set
637# CONFIG_NVRAM is not set 663# CONFIG_NVRAM is not set
@@ -650,11 +676,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
650# CONFIG_HWMON is not set 676# CONFIG_HWMON is not set
651CONFIG_THERMAL=y 677CONFIG_THERMAL=y
652# CONFIG_WATCHDOG is not set 678# CONFIG_WATCHDOG is not set
679CONFIG_SSB_POSSIBLE=y
653 680
654# 681#
655# Sonics Silicon Backplane 682# Sonics Silicon Backplane
656# 683#
657CONFIG_SSB_POSSIBLE=y
658# CONFIG_SSB is not set 684# CONFIG_SSB is not set
659 685
660# 686#
@@ -664,7 +690,7 @@ CONFIG_SSB_POSSIBLE=y
664# CONFIG_MFD_SM501 is not set 690# CONFIG_MFD_SM501 is not set
665# CONFIG_HTC_PASIC3 is not set 691# CONFIG_HTC_PASIC3 is not set
666# CONFIG_MFD_TMIO is not set 692# CONFIG_MFD_TMIO is not set
667# CONFIG_MFD_WM8400 is not set 693# CONFIG_REGULATOR is not set
668 694
669# 695#
670# Multimedia devices 696# Multimedia devices
@@ -723,6 +749,7 @@ CONFIG_USB_MON=y
723# 749#
724# CONFIG_USB_C67X00_HCD is not set 750# CONFIG_USB_C67X00_HCD is not set
725# CONFIG_USB_EHCI_HCD is not set 751# CONFIG_USB_EHCI_HCD is not set
752# CONFIG_USB_OXU210HP_HCD is not set
726# CONFIG_USB_ISP116X_HCD is not set 753# CONFIG_USB_ISP116X_HCD is not set
727# CONFIG_USB_ISP1760_HCD is not set 754# CONFIG_USB_ISP1760_HCD is not set
728CONFIG_USB_OHCI_HCD=y 755CONFIG_USB_OHCI_HCD=y
@@ -748,11 +775,11 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
748# CONFIG_USB_TMC is not set 775# CONFIG_USB_TMC is not set
749 776
750# 777#
751# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 778# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
752# 779#
753 780
754# 781#
755# may also be needed; see USB_STORAGE Help for more information 782# see USB_STORAGE Help for more information
756# 783#
757# CONFIG_USB_LIBUSUAL is not set 784# CONFIG_USB_LIBUSUAL is not set
758 785
@@ -791,6 +818,10 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
791# CONFIG_USB_ISIGHTFW is not set 818# CONFIG_USB_ISIGHTFW is not set
792# CONFIG_USB_VST is not set 819# CONFIG_USB_VST is not set
793# CONFIG_USB_GADGET is not set 820# CONFIG_USB_GADGET is not set
821
822#
823# OTG and related infrastructure
824#
794# CONFIG_UWB is not set 825# CONFIG_UWB is not set
795# CONFIG_MMC is not set 826# CONFIG_MMC is not set
796# CONFIG_MEMSTICK is not set 827# CONFIG_MEMSTICK is not set
@@ -816,7 +847,9 @@ CONFIG_EXT2_FS=y
816# CONFIG_FS_POSIX_ACL is not set 847# CONFIG_FS_POSIX_ACL is not set
817CONFIG_FILE_LOCKING=y 848CONFIG_FILE_LOCKING=y
818# CONFIG_XFS_FS is not set 849# CONFIG_XFS_FS is not set
850# CONFIG_GFS2_FS is not set
819# CONFIG_OCFS2_FS is not set 851# CONFIG_OCFS2_FS is not set
852# CONFIG_BTRFS_FS is not set
820CONFIG_DNOTIFY=y 853CONFIG_DNOTIFY=y
821CONFIG_INOTIFY=y 854CONFIG_INOTIFY=y
822CONFIG_INOTIFY_USER=y 855CONFIG_INOTIFY_USER=y
@@ -850,10 +883,7 @@ CONFIG_TMPFS=y
850# CONFIG_TMPFS_POSIX_ACL is not set 883# CONFIG_TMPFS_POSIX_ACL is not set
851# CONFIG_HUGETLB_PAGE is not set 884# CONFIG_HUGETLB_PAGE is not set
852# CONFIG_CONFIGFS_FS is not set 885# CONFIG_CONFIGFS_FS is not set
853 886CONFIG_MISC_FILESYSTEMS=y
854#
855# Miscellaneous filesystems
856#
857# CONFIG_ADFS_FS is not set 887# CONFIG_ADFS_FS is not set
858# CONFIG_AFFS_FS is not set 888# CONFIG_AFFS_FS is not set
859# CONFIG_HFS_FS is not set 889# CONFIG_HFS_FS is not set
@@ -863,6 +893,7 @@ CONFIG_TMPFS=y
863# CONFIG_EFS_FS is not set 893# CONFIG_EFS_FS is not set
864# CONFIG_JFFS2_FS is not set 894# CONFIG_JFFS2_FS is not set
865CONFIG_CRAMFS=y 895CONFIG_CRAMFS=y
896# CONFIG_SQUASHFS is not set
866# CONFIG_VXFS_FS is not set 897# CONFIG_VXFS_FS is not set
867# CONFIG_MINIX_FS is not set 898# CONFIG_MINIX_FS is not set
868# CONFIG_OMFS_FS is not set 899# CONFIG_OMFS_FS is not set
@@ -903,6 +934,7 @@ CONFIG_MSDOS_PARTITION=y
903# Library routines 934# Library routines
904# 935#
905CONFIG_BITREVERSE=y 936CONFIG_BITREVERSE=y
937CONFIG_GENERIC_FIND_LAST_BIT=y
906# CONFIG_CRC_CCITT is not set 938# CONFIG_CRC_CCITT is not set
907# CONFIG_CRC16 is not set 939# CONFIG_CRC16 is not set
908# CONFIG_CRC_T10DIF is not set 940# CONFIG_CRC_T10DIF is not set
@@ -953,6 +985,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
953# CONFIG_DEBUG_MEMORY_INIT is not set 985# CONFIG_DEBUG_MEMORY_INIT is not set
954# CONFIG_DEBUG_LIST is not set 986# CONFIG_DEBUG_LIST is not set
955# CONFIG_DEBUG_SG is not set 987# CONFIG_DEBUG_SG is not set
988# CONFIG_DEBUG_NOTIFIERS is not set
956# CONFIG_BOOT_PRINTK_DELAY is not set 989# CONFIG_BOOT_PRINTK_DELAY is not set
957# CONFIG_RCU_TORTURE_TEST is not set 990# CONFIG_RCU_TORTURE_TEST is not set
958# CONFIG_RCU_CPU_STALL_DETECTOR is not set 991# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -961,18 +994,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
961# CONFIG_FAULT_INJECTION is not set 994# CONFIG_FAULT_INJECTION is not set
962# CONFIG_LATENCYTOP is not set 995# CONFIG_LATENCYTOP is not set
963CONFIG_SYSCTL_SYSCALL_CHECK=y 996CONFIG_SYSCTL_SYSCALL_CHECK=y
964CONFIG_NOP_TRACER=y 997CONFIG_HAVE_FUNCTION_TRACER=y
965CONFIG_HAVE_FTRACE=y
966CONFIG_HAVE_DYNAMIC_FTRACE=y 998CONFIG_HAVE_DYNAMIC_FTRACE=y
967# CONFIG_FTRACE is not set 999CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1000
1001#
1002# Tracers
1003#
1004# CONFIG_FUNCTION_TRACER is not set
968# CONFIG_SCHED_TRACER is not set 1005# CONFIG_SCHED_TRACER is not set
969# CONFIG_CONTEXT_SWITCH_TRACER is not set 1006# CONFIG_CONTEXT_SWITCH_TRACER is not set
970# CONFIG_BOOT_TRACER is not set 1007# CONFIG_BOOT_TRACER is not set
1008# CONFIG_TRACE_BRANCH_PROFILING is not set
971# CONFIG_STACK_TRACER is not set 1009# CONFIG_STACK_TRACER is not set
972# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1010# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
973# CONFIG_SAMPLES is not set 1011# CONFIG_SAMPLES is not set
974CONFIG_HAVE_ARCH_KGDB=y 1012CONFIG_HAVE_ARCH_KGDB=y
975# CONFIG_KGDB is not set 1013# CONFIG_KGDB is not set
1014CONFIG_PRINT_STACK_DEPTH=64
976# CONFIG_DEBUG_STACKOVERFLOW is not set 1015# CONFIG_DEBUG_STACKOVERFLOW is not set
977# CONFIG_DEBUG_STACK_USAGE is not set 1016# CONFIG_DEBUG_STACK_USAGE is not set
978# CONFIG_DEBUG_PAGEALLOC is not set 1017# CONFIG_DEBUG_PAGEALLOC is not set
@@ -999,11 +1038,15 @@ CONFIG_CRYPTO=y
999# 1038#
1000# CONFIG_CRYPTO_FIPS is not set 1039# CONFIG_CRYPTO_FIPS is not set
1001CONFIG_CRYPTO_ALGAPI=y 1040CONFIG_CRYPTO_ALGAPI=y
1002CONFIG_CRYPTO_AEAD=y 1041CONFIG_CRYPTO_ALGAPI2=y
1042CONFIG_CRYPTO_AEAD2=y
1003CONFIG_CRYPTO_BLKCIPHER=y 1043CONFIG_CRYPTO_BLKCIPHER=y
1044CONFIG_CRYPTO_BLKCIPHER2=y
1004CONFIG_CRYPTO_HASH=y 1045CONFIG_CRYPTO_HASH=y
1005CONFIG_CRYPTO_RNG=y 1046CONFIG_CRYPTO_HASH2=y
1047CONFIG_CRYPTO_RNG2=y
1006CONFIG_CRYPTO_MANAGER=y 1048CONFIG_CRYPTO_MANAGER=y
1049CONFIG_CRYPTO_MANAGER2=y
1007# CONFIG_CRYPTO_GF128MUL is not set 1050# CONFIG_CRYPTO_GF128MUL is not set
1008# CONFIG_CRYPTO_NULL is not set 1051# CONFIG_CRYPTO_NULL is not set
1009# CONFIG_CRYPTO_CRYPTD is not set 1052# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/hcu4_defconfig b/arch/powerpc/configs/40x/hcu4_defconfig
index 45dcb824503f..8c019d79bf2a 100644
--- a/arch/powerpc/configs/40x/hcu4_defconfig
+++ b/arch/powerpc/configs/40x/hcu4_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:22 2008 4# Tue Jan 20 08:17:50 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155# CONFIG_PPC4xx_PCI_EXPRESS is not set 157# CONFIG_PPC4xx_PCI_EXPRESS is not set
156 158
@@ -182,6 +184,7 @@ CONFIG_405GPR=y
182# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_SIMPLE_GPIO is not set
185 188
186# 189#
187# Kernel options 190# Kernel options
@@ -205,6 +208,7 @@ CONFIG_BINFMT_ELF=y
205# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
211CONFIG_PPC_NEED_DMA_SYNC_OPS=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
209CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -219,12 +223,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
222CONFIG_RESOURCES_64BIT=y
223# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y 230CONFIG_UNEVICTABLE_LRU=y
231CONFIG_PPC_4K_PAGES=y
232# CONFIG_PPC_16K_PAGES is not set
233# CONFIG_PPC_64K_PAGES is not set
228CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -248,6 +254,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
248# CONFIG_PCI_MSI is not set 254# CONFIG_PCI_MSI is not set
249# CONFIG_PCI_LEGACY is not set 255# CONFIG_PCI_LEGACY is not set
250# CONFIG_PCI_DEBUG is not set 256# CONFIG_PCI_DEBUG is not set
257# CONFIG_PCI_STUB is not set
251# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -272,6 +279,7 @@ CONFIG_NET=y
272# 279#
273# Networking options 280# Networking options
274# 281#
282CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 283CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 284# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 285CONFIG_UNIX=y
@@ -322,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_ECONET is not set 330# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 331# CONFIG_WAN_ROUTER is not set
324# CONFIG_NET_SCHED is not set 332# CONFIG_NET_SCHED is not set
333# CONFIG_DCB is not set
325 334
326# 335#
327# Network testing 336# Network testing
@@ -334,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
335# CONFIG_PHONET is not set 344# CONFIG_PHONET is not set
336# CONFIG_WIRELESS is not set 345# CONFIG_WIRELESS is not set
346# CONFIG_WIMAX is not set
337# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
338# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
339 349
@@ -359,6 +369,7 @@ CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set 369# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set 370# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y 371CONFIG_MTD_PARTITIONS=y
372# CONFIG_MTD_TESTS is not set
362# CONFIG_MTD_REDBOOT_PARTS is not set 373# CONFIG_MTD_REDBOOT_PARTS is not set
363CONFIG_MTD_CMDLINE_PARTS=y 374CONFIG_MTD_CMDLINE_PARTS=y
364CONFIG_MTD_OF_PARTS=y 375CONFIG_MTD_OF_PARTS=y
@@ -431,6 +442,12 @@ CONFIG_MTD_PHYSMAP_OF=y
431# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
432 443
433# 444#
445# LPDDR flash memory drivers
446#
447# CONFIG_MTD_LPDDR is not set
448# CONFIG_MTD_QINFO_PROBE is not set
449
450#
434# UBI - Unsorted block images 451# UBI - Unsorted block images
435# 452#
436# CONFIG_MTD_UBI is not set 453# CONFIG_MTD_UBI is not set
@@ -461,6 +478,7 @@ CONFIG_MISC_DEVICES=y
461# CONFIG_TIFM_CORE is not set 478# CONFIG_TIFM_CORE is not set
462# CONFIG_ENCLOSURE_SERVICES is not set 479# CONFIG_ENCLOSURE_SERVICES is not set
463# CONFIG_HP_ILO is not set 480# CONFIG_HP_ILO is not set
481# CONFIG_C2PORT is not set
464CONFIG_HAVE_IDE=y 482CONFIG_HAVE_IDE=y
465# CONFIG_IDE is not set 483# CONFIG_IDE is not set
466 484
@@ -543,6 +561,7 @@ CONFIG_NETDEV_1000=y
543# CONFIG_JME is not set 561# CONFIG_JME is not set
544CONFIG_NETDEV_10000=y 562CONFIG_NETDEV_10000=y
545# CONFIG_CHELSIO_T1 is not set 563# CONFIG_CHELSIO_T1 is not set
564CONFIG_CHELSIO_T3_DEPENDS=y
546# CONFIG_CHELSIO_T3 is not set 565# CONFIG_CHELSIO_T3 is not set
547# CONFIG_ENIC is not set 566# CONFIG_ENIC is not set
548# CONFIG_IXGBE is not set 567# CONFIG_IXGBE is not set
@@ -565,6 +584,10 @@ CONFIG_NETDEV_10000=y
565# CONFIG_WLAN_PRE80211 is not set 584# CONFIG_WLAN_PRE80211 is not set
566# CONFIG_WLAN_80211 is not set 585# CONFIG_WLAN_80211 is not set
567# CONFIG_IWLWIFI_LEDS is not set 586# CONFIG_IWLWIFI_LEDS is not set
587
588#
589# Enable WiMAX (Networking options) to see the WiMAX drivers
590#
568# CONFIG_WAN is not set 591# CONFIG_WAN is not set
569# CONFIG_FDDI is not set 592# CONFIG_FDDI is not set
570# CONFIG_HIPPI is not set 593# CONFIG_HIPPI is not set
@@ -617,9 +640,12 @@ CONFIG_SERIAL_CORE=y
617CONFIG_SERIAL_CORE_CONSOLE=y 640CONFIG_SERIAL_CORE_CONSOLE=y
618# CONFIG_SERIAL_JSM is not set 641# CONFIG_SERIAL_JSM is not set
619CONFIG_SERIAL_OF_PLATFORM=y 642CONFIG_SERIAL_OF_PLATFORM=y
643# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
620CONFIG_UNIX98_PTYS=y 644CONFIG_UNIX98_PTYS=y
645# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
621CONFIG_LEGACY_PTYS=y 646CONFIG_LEGACY_PTYS=y
622CONFIG_LEGACY_PTY_COUNT=256 647CONFIG_LEGACY_PTY_COUNT=256
648# CONFIG_HVC_UDBG is not set
623# CONFIG_IPMI_HANDLER is not set 649# CONFIG_IPMI_HANDLER is not set
624# CONFIG_HW_RANDOM is not set 650# CONFIG_HW_RANDOM is not set
625# CONFIG_NVRAM is not set 651# CONFIG_NVRAM is not set
@@ -639,11 +665,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
639# CONFIG_THERMAL is not set 665# CONFIG_THERMAL is not set
640# CONFIG_THERMAL_HWMON is not set 666# CONFIG_THERMAL_HWMON is not set
641# CONFIG_WATCHDOG is not set 667# CONFIG_WATCHDOG is not set
668CONFIG_SSB_POSSIBLE=y
642 669
643# 670#
644# Sonics Silicon Backplane 671# Sonics Silicon Backplane
645# 672#
646CONFIG_SSB_POSSIBLE=y
647# CONFIG_SSB is not set 673# CONFIG_SSB is not set
648 674
649# 675#
@@ -653,7 +679,7 @@ CONFIG_SSB_POSSIBLE=y
653# CONFIG_MFD_SM501 is not set 679# CONFIG_MFD_SM501 is not set
654# CONFIG_HTC_PASIC3 is not set 680# CONFIG_HTC_PASIC3 is not set
655# CONFIG_MFD_TMIO is not set 681# CONFIG_MFD_TMIO is not set
656# CONFIG_MFD_WM8400 is not set 682# CONFIG_REGULATOR is not set
657 683
658# 684#
659# Multimedia devices 685# Multimedia devices
@@ -712,7 +738,9 @@ CONFIG_EXT2_FS=y
712# CONFIG_FS_POSIX_ACL is not set 738# CONFIG_FS_POSIX_ACL is not set
713CONFIG_FILE_LOCKING=y 739CONFIG_FILE_LOCKING=y
714# CONFIG_XFS_FS is not set 740# CONFIG_XFS_FS is not set
741# CONFIG_GFS2_FS is not set
715# CONFIG_OCFS2_FS is not set 742# CONFIG_OCFS2_FS is not set
743# CONFIG_BTRFS_FS is not set
716CONFIG_DNOTIFY=y 744CONFIG_DNOTIFY=y
717CONFIG_INOTIFY=y 745CONFIG_INOTIFY=y
718CONFIG_INOTIFY_USER=y 746CONFIG_INOTIFY_USER=y
@@ -746,10 +774,7 @@ CONFIG_TMPFS=y
746# CONFIG_TMPFS_POSIX_ACL is not set 774# CONFIG_TMPFS_POSIX_ACL is not set
747# CONFIG_HUGETLB_PAGE is not set 775# CONFIG_HUGETLB_PAGE is not set
748# CONFIG_CONFIGFS_FS is not set 776# CONFIG_CONFIGFS_FS is not set
749 777CONFIG_MISC_FILESYSTEMS=y
750#
751# Miscellaneous filesystems
752#
753# CONFIG_ADFS_FS is not set 778# CONFIG_ADFS_FS is not set
754# CONFIG_AFFS_FS is not set 779# CONFIG_AFFS_FS is not set
755# CONFIG_HFS_FS is not set 780# CONFIG_HFS_FS is not set
@@ -759,6 +784,7 @@ CONFIG_TMPFS=y
759# CONFIG_EFS_FS is not set 784# CONFIG_EFS_FS is not set
760# CONFIG_JFFS2_FS is not set 785# CONFIG_JFFS2_FS is not set
761CONFIG_CRAMFS=y 786CONFIG_CRAMFS=y
787# CONFIG_SQUASHFS is not set
762# CONFIG_VXFS_FS is not set 788# CONFIG_VXFS_FS is not set
763# CONFIG_MINIX_FS is not set 789# CONFIG_MINIX_FS is not set
764# CONFIG_OMFS_FS is not set 790# CONFIG_OMFS_FS is not set
@@ -799,6 +825,7 @@ CONFIG_MSDOS_PARTITION=y
799# Library routines 825# Library routines
800# 826#
801CONFIG_BITREVERSE=y 827CONFIG_BITREVERSE=y
828CONFIG_GENERIC_FIND_LAST_BIT=y
802# CONFIG_CRC_CCITT is not set 829# CONFIG_CRC_CCITT is not set
803# CONFIG_CRC16 is not set 830# CONFIG_CRC16 is not set
804# CONFIG_CRC_T10DIF is not set 831# CONFIG_CRC_T10DIF is not set
@@ -849,6 +876,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
849# CONFIG_DEBUG_MEMORY_INIT is not set 876# CONFIG_DEBUG_MEMORY_INIT is not set
850# CONFIG_DEBUG_LIST is not set 877# CONFIG_DEBUG_LIST is not set
851# CONFIG_DEBUG_SG is not set 878# CONFIG_DEBUG_SG is not set
879# CONFIG_DEBUG_NOTIFIERS is not set
852# CONFIG_BOOT_PRINTK_DELAY is not set 880# CONFIG_BOOT_PRINTK_DELAY is not set
853# CONFIG_RCU_TORTURE_TEST is not set 881# CONFIG_RCU_TORTURE_TEST is not set
854# CONFIG_RCU_CPU_STALL_DETECTOR is not set 882# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -857,18 +885,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
857# CONFIG_FAULT_INJECTION is not set 885# CONFIG_FAULT_INJECTION is not set
858# CONFIG_LATENCYTOP is not set 886# CONFIG_LATENCYTOP is not set
859CONFIG_SYSCTL_SYSCALL_CHECK=y 887CONFIG_SYSCTL_SYSCALL_CHECK=y
860CONFIG_NOP_TRACER=y 888CONFIG_HAVE_FUNCTION_TRACER=y
861CONFIG_HAVE_FTRACE=y
862CONFIG_HAVE_DYNAMIC_FTRACE=y 889CONFIG_HAVE_DYNAMIC_FTRACE=y
863# CONFIG_FTRACE is not set 890CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
891
892#
893# Tracers
894#
895# CONFIG_FUNCTION_TRACER is not set
864# CONFIG_SCHED_TRACER is not set 896# CONFIG_SCHED_TRACER is not set
865# CONFIG_CONTEXT_SWITCH_TRACER is not set 897# CONFIG_CONTEXT_SWITCH_TRACER is not set
866# CONFIG_BOOT_TRACER is not set 898# CONFIG_BOOT_TRACER is not set
899# CONFIG_TRACE_BRANCH_PROFILING is not set
867# CONFIG_STACK_TRACER is not set 900# CONFIG_STACK_TRACER is not set
868# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 901# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
869# CONFIG_SAMPLES is not set 902# CONFIG_SAMPLES is not set
870CONFIG_HAVE_ARCH_KGDB=y 903CONFIG_HAVE_ARCH_KGDB=y
871# CONFIG_KGDB is not set 904# CONFIG_KGDB is not set
905CONFIG_PRINT_STACK_DEPTH=64
872# CONFIG_DEBUG_STACKOVERFLOW is not set 906# CONFIG_DEBUG_STACKOVERFLOW is not set
873# CONFIG_DEBUG_STACK_USAGE is not set 907# CONFIG_DEBUG_STACK_USAGE is not set
874# CONFIG_DEBUG_PAGEALLOC is not set 908# CONFIG_DEBUG_PAGEALLOC is not set
@@ -895,11 +929,15 @@ CONFIG_CRYPTO=y
895# 929#
896# CONFIG_CRYPTO_FIPS is not set 930# CONFIG_CRYPTO_FIPS is not set
897CONFIG_CRYPTO_ALGAPI=y 931CONFIG_CRYPTO_ALGAPI=y
898CONFIG_CRYPTO_AEAD=y 932CONFIG_CRYPTO_ALGAPI2=y
933CONFIG_CRYPTO_AEAD2=y
899CONFIG_CRYPTO_BLKCIPHER=y 934CONFIG_CRYPTO_BLKCIPHER=y
935CONFIG_CRYPTO_BLKCIPHER2=y
900CONFIG_CRYPTO_HASH=y 936CONFIG_CRYPTO_HASH=y
901CONFIG_CRYPTO_RNG=y 937CONFIG_CRYPTO_HASH2=y
938CONFIG_CRYPTO_RNG2=y
902CONFIG_CRYPTO_MANAGER=y 939CONFIG_CRYPTO_MANAGER=y
940CONFIG_CRYPTO_MANAGER2=y
903# CONFIG_CRYPTO_GF128MUL is not set 941# CONFIG_CRYPTO_GF128MUL is not set
904# CONFIG_CRYPTO_NULL is not set 942# CONFIG_CRYPTO_NULL is not set
905# CONFIG_CRYPTO_CRYPTD is not set 943# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/kilauea_defconfig b/arch/powerpc/configs/40x/kilauea_defconfig
index e2f3695d9d0b..9917a09bad3a 100644
--- a/arch/powerpc/configs/40x/kilauea_defconfig
+++ b/arch/powerpc/configs/40x/kilauea_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:23 2008 4# Tue Jan 20 08:17:52 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155CONFIG_PPC4xx_PCI_EXPRESS=y 157CONFIG_PPC4xx_PCI_EXPRESS=y
156 158
@@ -182,6 +184,7 @@ CONFIG_405EX=y
182# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_SIMPLE_GPIO is not set
185 188
186# 189#
187# Kernel options 190# Kernel options
@@ -205,6 +208,7 @@ CONFIG_BINFMT_ELF=y
205# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
211CONFIG_PPC_NEED_DMA_SYNC_OPS=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
209CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -219,12 +223,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y 230CONFIG_UNEVICTABLE_LRU=y
231CONFIG_PPC_4K_PAGES=y
232# CONFIG_PPC_16K_PAGES is not set
233# CONFIG_PPC_64K_PAGES is not set
228CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -248,6 +254,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
248# CONFIG_PCI_MSI is not set 254# CONFIG_PCI_MSI is not set
249CONFIG_PCI_LEGACY=y 255CONFIG_PCI_LEGACY=y
250# CONFIG_PCI_DEBUG is not set 256# CONFIG_PCI_DEBUG is not set
257# CONFIG_PCI_STUB is not set
251# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -272,6 +279,7 @@ CONFIG_NET=y
272# 279#
273# Networking options 280# Networking options
274# 281#
282CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 283CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 284# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 285CONFIG_UNIX=y
@@ -322,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_ECONET is not set 330# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 331# CONFIG_WAN_ROUTER is not set
324# CONFIG_NET_SCHED is not set 332# CONFIG_NET_SCHED is not set
333# CONFIG_DCB is not set
325 334
326# 335#
327# Network testing 336# Network testing
@@ -334,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
335# CONFIG_PHONET is not set 344# CONFIG_PHONET is not set
336# CONFIG_WIRELESS is not set 345# CONFIG_WIRELESS is not set
346# CONFIG_WIMAX is not set
337# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
338# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
339 349
@@ -359,6 +369,7 @@ CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set 369# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set 370# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y 371CONFIG_MTD_PARTITIONS=y
372# CONFIG_MTD_TESTS is not set
362# CONFIG_MTD_REDBOOT_PARTS is not set 373# CONFIG_MTD_REDBOOT_PARTS is not set
363CONFIG_MTD_CMDLINE_PARTS=y 374CONFIG_MTD_CMDLINE_PARTS=y
364CONFIG_MTD_OF_PARTS=y 375CONFIG_MTD_OF_PARTS=y
@@ -431,6 +442,12 @@ CONFIG_MTD_PHYSMAP_OF=y
431# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
432 443
433# 444#
445# LPDDR flash memory drivers
446#
447# CONFIG_MTD_LPDDR is not set
448# CONFIG_MTD_QINFO_PROBE is not set
449
450#
434# UBI - Unsorted block images 451# UBI - Unsorted block images
435# 452#
436# CONFIG_MTD_UBI is not set 453# CONFIG_MTD_UBI is not set
@@ -524,6 +541,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
524# CONFIG_WLAN_PRE80211 is not set 541# CONFIG_WLAN_PRE80211 is not set
525# CONFIG_WLAN_80211 is not set 542# CONFIG_WLAN_80211 is not set
526# CONFIG_IWLWIFI_LEDS is not set 543# CONFIG_IWLWIFI_LEDS is not set
544
545#
546# Enable WiMAX (Networking options) to see the WiMAX drivers
547#
527# CONFIG_WAN is not set 548# CONFIG_WAN is not set
528# CONFIG_FDDI is not set 549# CONFIG_FDDI is not set
529# CONFIG_HIPPI is not set 550# CONFIG_HIPPI is not set
@@ -576,9 +597,12 @@ CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 597CONFIG_SERIAL_CORE_CONSOLE=y
577# CONFIG_SERIAL_JSM is not set 598# CONFIG_SERIAL_JSM is not set
578CONFIG_SERIAL_OF_PLATFORM=y 599CONFIG_SERIAL_OF_PLATFORM=y
600# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
579CONFIG_UNIX98_PTYS=y 601CONFIG_UNIX98_PTYS=y
602# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
580CONFIG_LEGACY_PTYS=y 603CONFIG_LEGACY_PTYS=y
581CONFIG_LEGACY_PTY_COUNT=256 604CONFIG_LEGACY_PTY_COUNT=256
605# CONFIG_HVC_UDBG is not set
582# CONFIG_IPMI_HANDLER is not set 606# CONFIG_IPMI_HANDLER is not set
583# CONFIG_HW_RANDOM is not set 607# CONFIG_HW_RANDOM is not set
584# CONFIG_NVRAM is not set 608# CONFIG_NVRAM is not set
@@ -597,11 +621,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
597# CONFIG_HWMON is not set 621# CONFIG_HWMON is not set
598CONFIG_THERMAL=y 622CONFIG_THERMAL=y
599# CONFIG_WATCHDOG is not set 623# CONFIG_WATCHDOG is not set
624CONFIG_SSB_POSSIBLE=y
600 625
601# 626#
602# Sonics Silicon Backplane 627# Sonics Silicon Backplane
603# 628#
604CONFIG_SSB_POSSIBLE=y
605# CONFIG_SSB is not set 629# CONFIG_SSB is not set
606 630
607# 631#
@@ -611,7 +635,7 @@ CONFIG_SSB_POSSIBLE=y
611# CONFIG_MFD_SM501 is not set 635# CONFIG_MFD_SM501 is not set
612# CONFIG_HTC_PASIC3 is not set 636# CONFIG_HTC_PASIC3 is not set
613# CONFIG_MFD_TMIO is not set 637# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set 638# CONFIG_REGULATOR is not set
615 639
616# 640#
617# Multimedia devices 641# Multimedia devices
@@ -670,7 +694,9 @@ CONFIG_EXT2_FS=y
670# CONFIG_FS_POSIX_ACL is not set 694# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y 695CONFIG_FILE_LOCKING=y
672# CONFIG_XFS_FS is not set 696# CONFIG_XFS_FS is not set
697# CONFIG_GFS2_FS is not set
673# CONFIG_OCFS2_FS is not set 698# CONFIG_OCFS2_FS is not set
699# CONFIG_BTRFS_FS is not set
674CONFIG_DNOTIFY=y 700CONFIG_DNOTIFY=y
675CONFIG_INOTIFY=y 701CONFIG_INOTIFY=y
676CONFIG_INOTIFY_USER=y 702CONFIG_INOTIFY_USER=y
@@ -704,10 +730,7 @@ CONFIG_TMPFS=y
704# CONFIG_TMPFS_POSIX_ACL is not set 730# CONFIG_TMPFS_POSIX_ACL is not set
705# CONFIG_HUGETLB_PAGE is not set 731# CONFIG_HUGETLB_PAGE is not set
706# CONFIG_CONFIGFS_FS is not set 732# CONFIG_CONFIGFS_FS is not set
707 733CONFIG_MISC_FILESYSTEMS=y
708#
709# Miscellaneous filesystems
710#
711# CONFIG_ADFS_FS is not set 734# CONFIG_ADFS_FS is not set
712# CONFIG_AFFS_FS is not set 735# CONFIG_AFFS_FS is not set
713# CONFIG_HFS_FS is not set 736# CONFIG_HFS_FS is not set
@@ -717,6 +740,7 @@ CONFIG_TMPFS=y
717# CONFIG_EFS_FS is not set 740# CONFIG_EFS_FS is not set
718# CONFIG_JFFS2_FS is not set 741# CONFIG_JFFS2_FS is not set
719CONFIG_CRAMFS=y 742CONFIG_CRAMFS=y
743# CONFIG_SQUASHFS is not set
720# CONFIG_VXFS_FS is not set 744# CONFIG_VXFS_FS is not set
721# CONFIG_MINIX_FS is not set 745# CONFIG_MINIX_FS is not set
722# CONFIG_OMFS_FS is not set 746# CONFIG_OMFS_FS is not set
@@ -757,6 +781,7 @@ CONFIG_MSDOS_PARTITION=y
757# Library routines 781# Library routines
758# 782#
759CONFIG_BITREVERSE=y 783CONFIG_BITREVERSE=y
784CONFIG_GENERIC_FIND_LAST_BIT=y
760# CONFIG_CRC_CCITT is not set 785# CONFIG_CRC_CCITT is not set
761# CONFIG_CRC16 is not set 786# CONFIG_CRC16 is not set
762# CONFIG_CRC_T10DIF is not set 787# CONFIG_CRC_T10DIF is not set
@@ -807,6 +832,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
807# CONFIG_DEBUG_MEMORY_INIT is not set 832# CONFIG_DEBUG_MEMORY_INIT is not set
808# CONFIG_DEBUG_LIST is not set 833# CONFIG_DEBUG_LIST is not set
809# CONFIG_DEBUG_SG is not set 834# CONFIG_DEBUG_SG is not set
835# CONFIG_DEBUG_NOTIFIERS is not set
810# CONFIG_BOOT_PRINTK_DELAY is not set 836# CONFIG_BOOT_PRINTK_DELAY is not set
811# CONFIG_RCU_TORTURE_TEST is not set 837# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set 838# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -815,18 +841,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
815# CONFIG_FAULT_INJECTION is not set 841# CONFIG_FAULT_INJECTION is not set
816# CONFIG_LATENCYTOP is not set 842# CONFIG_LATENCYTOP is not set
817CONFIG_SYSCTL_SYSCALL_CHECK=y 843CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y 844CONFIG_HAVE_FUNCTION_TRACER=y
819CONFIG_HAVE_FTRACE=y
820CONFIG_HAVE_DYNAMIC_FTRACE=y 845CONFIG_HAVE_DYNAMIC_FTRACE=y
821# CONFIG_FTRACE is not set 846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
847
848#
849# Tracers
850#
851# CONFIG_FUNCTION_TRACER is not set
822# CONFIG_SCHED_TRACER is not set 852# CONFIG_SCHED_TRACER is not set
823# CONFIG_CONTEXT_SWITCH_TRACER is not set 853# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set 854# CONFIG_BOOT_TRACER is not set
855# CONFIG_TRACE_BRANCH_PROFILING is not set
825# CONFIG_STACK_TRACER is not set 856# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 857# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
827# CONFIG_SAMPLES is not set 858# CONFIG_SAMPLES is not set
828CONFIG_HAVE_ARCH_KGDB=y 859CONFIG_HAVE_ARCH_KGDB=y
829# CONFIG_KGDB is not set 860# CONFIG_KGDB is not set
861CONFIG_PRINT_STACK_DEPTH=64
830# CONFIG_DEBUG_STACKOVERFLOW is not set 862# CONFIG_DEBUG_STACKOVERFLOW is not set
831# CONFIG_DEBUG_STACK_USAGE is not set 863# CONFIG_DEBUG_STACK_USAGE is not set
832# CONFIG_DEBUG_PAGEALLOC is not set 864# CONFIG_DEBUG_PAGEALLOC is not set
@@ -853,11 +885,15 @@ CONFIG_CRYPTO=y
853# 885#
854# CONFIG_CRYPTO_FIPS is not set 886# CONFIG_CRYPTO_FIPS is not set
855CONFIG_CRYPTO_ALGAPI=y 887CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y 888CONFIG_CRYPTO_ALGAPI2=y
889CONFIG_CRYPTO_AEAD2=y
857CONFIG_CRYPTO_BLKCIPHER=y 890CONFIG_CRYPTO_BLKCIPHER=y
891CONFIG_CRYPTO_BLKCIPHER2=y
858CONFIG_CRYPTO_HASH=y 892CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y 893CONFIG_CRYPTO_HASH2=y
894CONFIG_CRYPTO_RNG2=y
860CONFIG_CRYPTO_MANAGER=y 895CONFIG_CRYPTO_MANAGER=y
896CONFIG_CRYPTO_MANAGER2=y
861# CONFIG_CRYPTO_GF128MUL is not set 897# CONFIG_CRYPTO_GF128MUL is not set
862# CONFIG_CRYPTO_NULL is not set 898# CONFIG_CRYPTO_NULL is not set
863# CONFIG_CRYPTO_CRYPTD is not set 899# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/makalu_defconfig b/arch/powerpc/configs/40x/makalu_defconfig
index 413c778ecd7c..58bf2ac2e0dd 100644
--- a/arch/powerpc/configs/40x/makalu_defconfig
+++ b/arch/powerpc/configs/40x/makalu_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:25 2008 4# Tue Jan 20 08:17:53 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76# CONFIG_FAIR_GROUP_SCHED is not set 76# CONFIG_FAIR_GROUP_SCHED is not set
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155CONFIG_PPC4xx_PCI_EXPRESS=y 157CONFIG_PPC4xx_PCI_EXPRESS=y
156 158
@@ -182,6 +184,7 @@ CONFIG_405EX=y
182# CONFIG_GENERIC_IOMAP is not set 184# CONFIG_GENERIC_IOMAP is not set
183# CONFIG_CPU_FREQ is not set 185# CONFIG_CPU_FREQ is not set
184# CONFIG_FSL_ULI1575 is not set 186# CONFIG_FSL_ULI1575 is not set
187# CONFIG_SIMPLE_GPIO is not set
185 188
186# 189#
187# Kernel options 190# Kernel options
@@ -205,6 +208,7 @@ CONFIG_BINFMT_ELF=y
205# CONFIG_BINFMT_MISC is not set 208# CONFIG_BINFMT_MISC is not set
206# CONFIG_MATH_EMULATION is not set 209# CONFIG_MATH_EMULATION is not set
207# CONFIG_IOMMU_HELPER is not set 210# CONFIG_IOMMU_HELPER is not set
211CONFIG_PPC_NEED_DMA_SYNC_OPS=y
208CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 212CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
209CONFIG_ARCH_HAS_WALK_MEMORY=y 213CONFIG_ARCH_HAS_WALK_MEMORY=y
210CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 214CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -219,12 +223,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
219CONFIG_PAGEFLAGS_EXTENDED=y 223CONFIG_PAGEFLAGS_EXTENDED=y
220CONFIG_SPLIT_PTLOCK_CPUS=4 224CONFIG_SPLIT_PTLOCK_CPUS=4
221CONFIG_MIGRATION=y 225CONFIG_MIGRATION=y
222# CONFIG_RESOURCES_64BIT is not set
223# CONFIG_PHYS_ADDR_T_64BIT is not set 226# CONFIG_PHYS_ADDR_T_64BIT is not set
224CONFIG_ZONE_DMA_FLAG=1 227CONFIG_ZONE_DMA_FLAG=1
225CONFIG_BOUNCE=y 228CONFIG_BOUNCE=y
226CONFIG_VIRT_TO_BUS=y 229CONFIG_VIRT_TO_BUS=y
227CONFIG_UNEVICTABLE_LRU=y 230CONFIG_UNEVICTABLE_LRU=y
231CONFIG_PPC_4K_PAGES=y
232# CONFIG_PPC_16K_PAGES is not set
233# CONFIG_PPC_64K_PAGES is not set
228CONFIG_FORCE_MAX_ZONEORDER=11 234CONFIG_FORCE_MAX_ZONEORDER=11
229CONFIG_PROC_DEVICETREE=y 235CONFIG_PROC_DEVICETREE=y
230# CONFIG_CMDLINE_BOOL is not set 236# CONFIG_CMDLINE_BOOL is not set
@@ -248,6 +254,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
248# CONFIG_PCI_MSI is not set 254# CONFIG_PCI_MSI is not set
249CONFIG_PCI_LEGACY=y 255CONFIG_PCI_LEGACY=y
250# CONFIG_PCI_DEBUG is not set 256# CONFIG_PCI_DEBUG is not set
257# CONFIG_PCI_STUB is not set
251# CONFIG_PCCARD is not set 258# CONFIG_PCCARD is not set
252# CONFIG_HOTPLUG_PCI is not set 259# CONFIG_HOTPLUG_PCI is not set
253# CONFIG_HAS_RAPIDIO is not set 260# CONFIG_HAS_RAPIDIO is not set
@@ -272,6 +279,7 @@ CONFIG_NET=y
272# 279#
273# Networking options 280# Networking options
274# 281#
282CONFIG_COMPAT_NET_DEV_OPS=y
275CONFIG_PACKET=y 283CONFIG_PACKET=y
276# CONFIG_PACKET_MMAP is not set 284# CONFIG_PACKET_MMAP is not set
277CONFIG_UNIX=y 285CONFIG_UNIX=y
@@ -322,6 +330,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
322# CONFIG_ECONET is not set 330# CONFIG_ECONET is not set
323# CONFIG_WAN_ROUTER is not set 331# CONFIG_WAN_ROUTER is not set
324# CONFIG_NET_SCHED is not set 332# CONFIG_NET_SCHED is not set
333# CONFIG_DCB is not set
325 334
326# 335#
327# Network testing 336# Network testing
@@ -334,6 +343,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
334# CONFIG_AF_RXRPC is not set 343# CONFIG_AF_RXRPC is not set
335# CONFIG_PHONET is not set 344# CONFIG_PHONET is not set
336# CONFIG_WIRELESS is not set 345# CONFIG_WIRELESS is not set
346# CONFIG_WIMAX is not set
337# CONFIG_RFKILL is not set 347# CONFIG_RFKILL is not set
338# CONFIG_NET_9P is not set 348# CONFIG_NET_9P is not set
339 349
@@ -359,6 +369,7 @@ CONFIG_MTD=y
359# CONFIG_MTD_DEBUG is not set 369# CONFIG_MTD_DEBUG is not set
360# CONFIG_MTD_CONCAT is not set 370# CONFIG_MTD_CONCAT is not set
361CONFIG_MTD_PARTITIONS=y 371CONFIG_MTD_PARTITIONS=y
372# CONFIG_MTD_TESTS is not set
362# CONFIG_MTD_REDBOOT_PARTS is not set 373# CONFIG_MTD_REDBOOT_PARTS is not set
363CONFIG_MTD_CMDLINE_PARTS=y 374CONFIG_MTD_CMDLINE_PARTS=y
364CONFIG_MTD_OF_PARTS=y 375CONFIG_MTD_OF_PARTS=y
@@ -431,6 +442,12 @@ CONFIG_MTD_PHYSMAP_OF=y
431# CONFIG_MTD_ONENAND is not set 442# CONFIG_MTD_ONENAND is not set
432 443
433# 444#
445# LPDDR flash memory drivers
446#
447# CONFIG_MTD_LPDDR is not set
448# CONFIG_MTD_QINFO_PROBE is not set
449
450#
434# UBI - Unsorted block images 451# UBI - Unsorted block images
435# 452#
436# CONFIG_MTD_UBI is not set 453# CONFIG_MTD_UBI is not set
@@ -524,6 +541,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
524# CONFIG_WLAN_PRE80211 is not set 541# CONFIG_WLAN_PRE80211 is not set
525# CONFIG_WLAN_80211 is not set 542# CONFIG_WLAN_80211 is not set
526# CONFIG_IWLWIFI_LEDS is not set 543# CONFIG_IWLWIFI_LEDS is not set
544
545#
546# Enable WiMAX (Networking options) to see the WiMAX drivers
547#
527# CONFIG_WAN is not set 548# CONFIG_WAN is not set
528# CONFIG_FDDI is not set 549# CONFIG_FDDI is not set
529# CONFIG_HIPPI is not set 550# CONFIG_HIPPI is not set
@@ -576,9 +597,12 @@ CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y 597CONFIG_SERIAL_CORE_CONSOLE=y
577# CONFIG_SERIAL_JSM is not set 598# CONFIG_SERIAL_JSM is not set
578CONFIG_SERIAL_OF_PLATFORM=y 599CONFIG_SERIAL_OF_PLATFORM=y
600# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
579CONFIG_UNIX98_PTYS=y 601CONFIG_UNIX98_PTYS=y
602# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
580CONFIG_LEGACY_PTYS=y 603CONFIG_LEGACY_PTYS=y
581CONFIG_LEGACY_PTY_COUNT=256 604CONFIG_LEGACY_PTY_COUNT=256
605# CONFIG_HVC_UDBG is not set
582# CONFIG_IPMI_HANDLER is not set 606# CONFIG_IPMI_HANDLER is not set
583# CONFIG_HW_RANDOM is not set 607# CONFIG_HW_RANDOM is not set
584# CONFIG_NVRAM is not set 608# CONFIG_NVRAM is not set
@@ -597,11 +621,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
597# CONFIG_HWMON is not set 621# CONFIG_HWMON is not set
598CONFIG_THERMAL=y 622CONFIG_THERMAL=y
599# CONFIG_WATCHDOG is not set 623# CONFIG_WATCHDOG is not set
624CONFIG_SSB_POSSIBLE=y
600 625
601# 626#
602# Sonics Silicon Backplane 627# Sonics Silicon Backplane
603# 628#
604CONFIG_SSB_POSSIBLE=y
605# CONFIG_SSB is not set 629# CONFIG_SSB is not set
606 630
607# 631#
@@ -611,7 +635,7 @@ CONFIG_SSB_POSSIBLE=y
611# CONFIG_MFD_SM501 is not set 635# CONFIG_MFD_SM501 is not set
612# CONFIG_HTC_PASIC3 is not set 636# CONFIG_HTC_PASIC3 is not set
613# CONFIG_MFD_TMIO is not set 637# CONFIG_MFD_TMIO is not set
614# CONFIG_MFD_WM8400 is not set 638# CONFIG_REGULATOR is not set
615 639
616# 640#
617# Multimedia devices 641# Multimedia devices
@@ -670,7 +694,9 @@ CONFIG_EXT2_FS=y
670# CONFIG_FS_POSIX_ACL is not set 694# CONFIG_FS_POSIX_ACL is not set
671CONFIG_FILE_LOCKING=y 695CONFIG_FILE_LOCKING=y
672# CONFIG_XFS_FS is not set 696# CONFIG_XFS_FS is not set
697# CONFIG_GFS2_FS is not set
673# CONFIG_OCFS2_FS is not set 698# CONFIG_OCFS2_FS is not set
699# CONFIG_BTRFS_FS is not set
674CONFIG_DNOTIFY=y 700CONFIG_DNOTIFY=y
675CONFIG_INOTIFY=y 701CONFIG_INOTIFY=y
676CONFIG_INOTIFY_USER=y 702CONFIG_INOTIFY_USER=y
@@ -704,10 +730,7 @@ CONFIG_TMPFS=y
704# CONFIG_TMPFS_POSIX_ACL is not set 730# CONFIG_TMPFS_POSIX_ACL is not set
705# CONFIG_HUGETLB_PAGE is not set 731# CONFIG_HUGETLB_PAGE is not set
706# CONFIG_CONFIGFS_FS is not set 732# CONFIG_CONFIGFS_FS is not set
707 733CONFIG_MISC_FILESYSTEMS=y
708#
709# Miscellaneous filesystems
710#
711# CONFIG_ADFS_FS is not set 734# CONFIG_ADFS_FS is not set
712# CONFIG_AFFS_FS is not set 735# CONFIG_AFFS_FS is not set
713# CONFIG_HFS_FS is not set 736# CONFIG_HFS_FS is not set
@@ -717,6 +740,7 @@ CONFIG_TMPFS=y
717# CONFIG_EFS_FS is not set 740# CONFIG_EFS_FS is not set
718# CONFIG_JFFS2_FS is not set 741# CONFIG_JFFS2_FS is not set
719CONFIG_CRAMFS=y 742CONFIG_CRAMFS=y
743# CONFIG_SQUASHFS is not set
720# CONFIG_VXFS_FS is not set 744# CONFIG_VXFS_FS is not set
721# CONFIG_MINIX_FS is not set 745# CONFIG_MINIX_FS is not set
722# CONFIG_OMFS_FS is not set 746# CONFIG_OMFS_FS is not set
@@ -757,6 +781,7 @@ CONFIG_MSDOS_PARTITION=y
757# Library routines 781# Library routines
758# 782#
759CONFIG_BITREVERSE=y 783CONFIG_BITREVERSE=y
784CONFIG_GENERIC_FIND_LAST_BIT=y
760# CONFIG_CRC_CCITT is not set 785# CONFIG_CRC_CCITT is not set
761# CONFIG_CRC16 is not set 786# CONFIG_CRC16 is not set
762# CONFIG_CRC_T10DIF is not set 787# CONFIG_CRC_T10DIF is not set
@@ -807,6 +832,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
807# CONFIG_DEBUG_MEMORY_INIT is not set 832# CONFIG_DEBUG_MEMORY_INIT is not set
808# CONFIG_DEBUG_LIST is not set 833# CONFIG_DEBUG_LIST is not set
809# CONFIG_DEBUG_SG is not set 834# CONFIG_DEBUG_SG is not set
835# CONFIG_DEBUG_NOTIFIERS is not set
810# CONFIG_BOOT_PRINTK_DELAY is not set 836# CONFIG_BOOT_PRINTK_DELAY is not set
811# CONFIG_RCU_TORTURE_TEST is not set 837# CONFIG_RCU_TORTURE_TEST is not set
812# CONFIG_RCU_CPU_STALL_DETECTOR is not set 838# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -815,18 +841,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
815# CONFIG_FAULT_INJECTION is not set 841# CONFIG_FAULT_INJECTION is not set
816# CONFIG_LATENCYTOP is not set 842# CONFIG_LATENCYTOP is not set
817CONFIG_SYSCTL_SYSCALL_CHECK=y 843CONFIG_SYSCTL_SYSCALL_CHECK=y
818CONFIG_NOP_TRACER=y 844CONFIG_HAVE_FUNCTION_TRACER=y
819CONFIG_HAVE_FTRACE=y
820CONFIG_HAVE_DYNAMIC_FTRACE=y 845CONFIG_HAVE_DYNAMIC_FTRACE=y
821# CONFIG_FTRACE is not set 846CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
847
848#
849# Tracers
850#
851# CONFIG_FUNCTION_TRACER is not set
822# CONFIG_SCHED_TRACER is not set 852# CONFIG_SCHED_TRACER is not set
823# CONFIG_CONTEXT_SWITCH_TRACER is not set 853# CONFIG_CONTEXT_SWITCH_TRACER is not set
824# CONFIG_BOOT_TRACER is not set 854# CONFIG_BOOT_TRACER is not set
855# CONFIG_TRACE_BRANCH_PROFILING is not set
825# CONFIG_STACK_TRACER is not set 856# CONFIG_STACK_TRACER is not set
826# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 857# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
827# CONFIG_SAMPLES is not set 858# CONFIG_SAMPLES is not set
828CONFIG_HAVE_ARCH_KGDB=y 859CONFIG_HAVE_ARCH_KGDB=y
829# CONFIG_KGDB is not set 860# CONFIG_KGDB is not set
861CONFIG_PRINT_STACK_DEPTH=64
830# CONFIG_DEBUG_STACKOVERFLOW is not set 862# CONFIG_DEBUG_STACKOVERFLOW is not set
831# CONFIG_DEBUG_STACK_USAGE is not set 863# CONFIG_DEBUG_STACK_USAGE is not set
832# CONFIG_DEBUG_PAGEALLOC is not set 864# CONFIG_DEBUG_PAGEALLOC is not set
@@ -853,11 +885,15 @@ CONFIG_CRYPTO=y
853# 885#
854# CONFIG_CRYPTO_FIPS is not set 886# CONFIG_CRYPTO_FIPS is not set
855CONFIG_CRYPTO_ALGAPI=y 887CONFIG_CRYPTO_ALGAPI=y
856CONFIG_CRYPTO_AEAD=y 888CONFIG_CRYPTO_ALGAPI2=y
889CONFIG_CRYPTO_AEAD2=y
857CONFIG_CRYPTO_BLKCIPHER=y 890CONFIG_CRYPTO_BLKCIPHER=y
891CONFIG_CRYPTO_BLKCIPHER2=y
858CONFIG_CRYPTO_HASH=y 892CONFIG_CRYPTO_HASH=y
859CONFIG_CRYPTO_RNG=y 893CONFIG_CRYPTO_HASH2=y
894CONFIG_CRYPTO_RNG2=y
860CONFIG_CRYPTO_MANAGER=y 895CONFIG_CRYPTO_MANAGER=y
896CONFIG_CRYPTO_MANAGER2=y
861# CONFIG_CRYPTO_GF128MUL is not set 897# CONFIG_CRYPTO_GF128MUL is not set
862# CONFIG_CRYPTO_NULL is not set 898# CONFIG_CRYPTO_NULL is not set
863# CONFIG_CRYPTO_CRYPTD is not set 899# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/virtex_defconfig b/arch/powerpc/configs/40x/virtex_defconfig
index 9a9350ded292..b6888384dd74 100644
--- a/arch/powerpc/configs/40x/virtex_defconfig
+++ b/arch/powerpc/configs/40x/virtex_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc4 3# Linux kernel version: 2.6.29-rc2
4# Fri Nov 14 10:49:16 2008 4# Tue Jan 20 08:17:55 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -41,7 +42,7 @@ CONFIG_GENERIC_GPIO=y
41CONFIG_PPC=y 42CONFIG_PPC=y
42CONFIG_EARLY_PRINTK=y 43CONFIG_EARLY_PRINTK=y
43CONFIG_GENERIC_NVRAM=y 44CONFIG_GENERIC_NVRAM=y
44CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 45CONFIG_SCHED_OMIT_FRAME_POINTER=y
45CONFIG_ARCH_MAY_HAVE_PC_FDC=y 46CONFIG_ARCH_MAY_HAVE_PC_FDC=y
46CONFIG_PPC_OF=y 47CONFIG_PPC_OF=y
47CONFIG_OF=y 48CONFIG_OF=y
@@ -74,8 +75,8 @@ CONFIG_POSIX_MQUEUE=y
74CONFIG_IKCONFIG=y 75CONFIG_IKCONFIG=y
75CONFIG_IKCONFIG_PROC=y 76CONFIG_IKCONFIG_PROC=y
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78# CONFIG_GROUP_SCHED is not set 78# CONFIG_GROUP_SCHED is not set
79# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
@@ -113,7 +114,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -124,7 +124,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 128CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 129# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +131,9 @@ CONFIG_MODULE_UNLOAD=y
132CONFIG_MODULE_FORCE_UNLOAD=y 131CONFIG_MODULE_FORCE_UNLOAD=y
133CONFIG_MODVERSIONS=y 132CONFIG_MODVERSIONS=y
134# CONFIG_MODULE_SRCVERSION_ALL is not set 133# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 134CONFIG_BLOCK=y
137# CONFIG_LBD is not set 135# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 136# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
142 139
@@ -153,6 +150,10 @@ CONFIG_DEFAULT_CFQ=y
153# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="cfq" 151CONFIG_DEFAULT_IOSCHED="cfq"
155CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_TREE_RCU is not set
154# CONFIG_PREEMPT_RCU is not set
155# CONFIG_TREE_RCU_TRACE is not set
156# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 157# CONFIG_FREEZER is not set
157# CONFIG_PPC4xx_PCI_EXPRESS is not set 158# CONFIG_PPC4xx_PCI_EXPRESS is not set
158 159
@@ -188,6 +189,7 @@ CONFIG_IBM405_ERR51=y
188# CONFIG_GENERIC_IOMAP is not set 189# CONFIG_GENERIC_IOMAP is not set
189# CONFIG_CPU_FREQ is not set 190# CONFIG_CPU_FREQ is not set
190# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
192# CONFIG_SIMPLE_GPIO is not set
191 193
192# 194#
193# Kernel options 195# Kernel options
@@ -205,13 +207,13 @@ CONFIG_HZ=250
205# CONFIG_PREEMPT_NONE is not set 207# CONFIG_PREEMPT_NONE is not set
206# CONFIG_PREEMPT_VOLUNTARY is not set 208# CONFIG_PREEMPT_VOLUNTARY is not set
207CONFIG_PREEMPT=y 209CONFIG_PREEMPT=y
208# CONFIG_PREEMPT_RCU is not set
209CONFIG_BINFMT_ELF=y 210CONFIG_BINFMT_ELF=y
210# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 211# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
211# CONFIG_HAVE_AOUT is not set 212# CONFIG_HAVE_AOUT is not set
212# CONFIG_BINFMT_MISC is not set 213# CONFIG_BINFMT_MISC is not set
213CONFIG_MATH_EMULATION=y 214CONFIG_MATH_EMULATION=y
214# CONFIG_IOMMU_HELPER is not set 215# CONFIG_IOMMU_HELPER is not set
216CONFIG_PPC_NEED_DMA_SYNC_OPS=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216CONFIG_ARCH_HAS_WALK_MEMORY=y 218CONFIG_ARCH_HAS_WALK_MEMORY=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -226,12 +228,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 228CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 229CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 230CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y
230# CONFIG_PHYS_ADDR_T_64BIT is not set 231# CONFIG_PHYS_ADDR_T_64BIT is not set
231CONFIG_ZONE_DMA_FLAG=1 232CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 233CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 234CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 235CONFIG_UNEVICTABLE_LRU=y
236CONFIG_PPC_4K_PAGES=y
237# CONFIG_PPC_16K_PAGES is not set
238# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 239CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 240CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 241CONFIG_CMDLINE_BOOL=y
@@ -256,6 +260,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
256# CONFIG_PCI_MSI is not set 260# CONFIG_PCI_MSI is not set
257CONFIG_PCI_LEGACY=y 261CONFIG_PCI_LEGACY=y
258# CONFIG_PCI_DEBUG is not set 262# CONFIG_PCI_DEBUG is not set
263# CONFIG_PCI_STUB is not set
259# CONFIG_PCCARD is not set 264# CONFIG_PCCARD is not set
260# CONFIG_HOTPLUG_PCI is not set 265# CONFIG_HOTPLUG_PCI is not set
261# CONFIG_HAS_RAPIDIO is not set 266# CONFIG_HAS_RAPIDIO is not set
@@ -280,6 +285,8 @@ CONFIG_NET=y
280# 285#
281# Networking options 286# Networking options
282# 287#
288# CONFIG_NET_NS is not set
289CONFIG_COMPAT_NET_DEV_OPS=y
283CONFIG_PACKET=y 290CONFIG_PACKET=y
284# CONFIG_PACKET_MMAP is not set 291# CONFIG_PACKET_MMAP is not set
285CONFIG_UNIX=y 292CONFIG_UNIX=y
@@ -423,6 +430,7 @@ CONFIG_IP_NF_MANGLE=m
423# CONFIG_ECONET is not set 430# CONFIG_ECONET is not set
424# CONFIG_WAN_ROUTER is not set 431# CONFIG_WAN_ROUTER is not set
425# CONFIG_NET_SCHED is not set 432# CONFIG_NET_SCHED is not set
433# CONFIG_DCB is not set
426 434
427# 435#
428# Network testing 436# Network testing
@@ -438,8 +446,9 @@ CONFIG_WIRELESS=y
438# CONFIG_CFG80211 is not set 446# CONFIG_CFG80211 is not set
439CONFIG_WIRELESS_OLD_REGULATORY=y 447CONFIG_WIRELESS_OLD_REGULATORY=y
440# CONFIG_WIRELESS_EXT is not set 448# CONFIG_WIRELESS_EXT is not set
449# CONFIG_LIB80211 is not set
441# CONFIG_MAC80211 is not set 450# CONFIG_MAC80211 is not set
442# CONFIG_IEEE80211 is not set 451# CONFIG_WIMAX is not set
443# CONFIG_RFKILL is not set 452# CONFIG_RFKILL is not set
444# CONFIG_NET_9P is not set 453# CONFIG_NET_9P is not set
445 454
@@ -574,6 +583,10 @@ CONFIG_NETDEV_1000=y
574# CONFIG_WLAN_PRE80211 is not set 583# CONFIG_WLAN_PRE80211 is not set
575# CONFIG_WLAN_80211 is not set 584# CONFIG_WLAN_80211 is not set
576# CONFIG_IWLWIFI_LEDS is not set 585# CONFIG_IWLWIFI_LEDS is not set
586
587#
588# Enable WiMAX (Networking options) to see the WiMAX drivers
589#
577# CONFIG_WAN is not set 590# CONFIG_WAN is not set
578# CONFIG_FDDI is not set 591# CONFIG_FDDI is not set
579# CONFIG_HIPPI is not set 592# CONFIG_HIPPI is not set
@@ -674,9 +687,12 @@ CONFIG_SERIAL_CORE=y
674CONFIG_SERIAL_CORE_CONSOLE=y 687CONFIG_SERIAL_CORE_CONSOLE=y
675# CONFIG_SERIAL_JSM is not set 688# CONFIG_SERIAL_JSM is not set
676# CONFIG_SERIAL_OF_PLATFORM is not set 689# CONFIG_SERIAL_OF_PLATFORM is not set
690# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
677CONFIG_UNIX98_PTYS=y 691CONFIG_UNIX98_PTYS=y
692# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
678CONFIG_LEGACY_PTYS=y 693CONFIG_LEGACY_PTYS=y
679CONFIG_LEGACY_PTY_COUNT=256 694CONFIG_LEGACY_PTY_COUNT=256
695# CONFIG_HVC_UDBG is not set
680# CONFIG_IPMI_HANDLER is not set 696# CONFIG_IPMI_HANDLER is not set
681CONFIG_HW_RANDOM=m 697CONFIG_HW_RANDOM=m
682# CONFIG_NVRAM is not set 698# CONFIG_NVRAM is not set
@@ -854,7 +870,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
854# CONFIG_DMADEVICES is not set 870# CONFIG_DMADEVICES is not set
855# CONFIG_UIO is not set 871# CONFIG_UIO is not set
856# CONFIG_STAGING is not set 872# CONFIG_STAGING is not set
857CONFIG_STAGING_EXCLUDE_BUILD=y
858 873
859# 874#
860# File systems 875# File systems
@@ -870,6 +885,7 @@ CONFIG_EXT2_FS=y
870CONFIG_FILE_LOCKING=y 885CONFIG_FILE_LOCKING=y
871# CONFIG_XFS_FS is not set 886# CONFIG_XFS_FS is not set
872# CONFIG_OCFS2_FS is not set 887# CONFIG_OCFS2_FS is not set
888# CONFIG_BTRFS_FS is not set
873CONFIG_DNOTIFY=y 889CONFIG_DNOTIFY=y
874CONFIG_INOTIFY=y 890CONFIG_INOTIFY=y
875CONFIG_INOTIFY_USER=y 891CONFIG_INOTIFY_USER=y
@@ -906,10 +922,7 @@ CONFIG_TMPFS=y
906# CONFIG_TMPFS_POSIX_ACL is not set 922# CONFIG_TMPFS_POSIX_ACL is not set
907# CONFIG_HUGETLB_PAGE is not set 923# CONFIG_HUGETLB_PAGE is not set
908# CONFIG_CONFIGFS_FS is not set 924# CONFIG_CONFIGFS_FS is not set
909 925CONFIG_MISC_FILESYSTEMS=y
910#
911# Miscellaneous filesystems
912#
913# CONFIG_ADFS_FS is not set 926# CONFIG_ADFS_FS is not set
914# CONFIG_AFFS_FS is not set 927# CONFIG_AFFS_FS is not set
915# CONFIG_HFS_FS is not set 928# CONFIG_HFS_FS is not set
@@ -918,6 +931,7 @@ CONFIG_TMPFS=y
918# CONFIG_BFS_FS is not set 931# CONFIG_BFS_FS is not set
919# CONFIG_EFS_FS is not set 932# CONFIG_EFS_FS is not set
920CONFIG_CRAMFS=y 933CONFIG_CRAMFS=y
934# CONFIG_SQUASHFS is not set
921# CONFIG_VXFS_FS is not set 935# CONFIG_VXFS_FS is not set
922# CONFIG_MINIX_FS is not set 936# CONFIG_MINIX_FS is not set
923# CONFIG_OMFS_FS is not set 937# CONFIG_OMFS_FS is not set
@@ -997,6 +1011,7 @@ CONFIG_NLS_UTF8=m
997# Library routines 1011# Library routines
998# 1012#
999CONFIG_BITREVERSE=y 1013CONFIG_BITREVERSE=y
1014CONFIG_GENERIC_FIND_LAST_BIT=y
1000CONFIG_CRC_CCITT=y 1015CONFIG_CRC_CCITT=y
1001# CONFIG_CRC16 is not set 1016# CONFIG_CRC16 is not set
1002# CONFIG_CRC_T10DIF is not set 1017# CONFIG_CRC_T10DIF is not set
@@ -1046,6 +1061,7 @@ CONFIG_DEBUG_INFO=y
1046CONFIG_DEBUG_MEMORY_INIT=y 1061CONFIG_DEBUG_MEMORY_INIT=y
1047# CONFIG_DEBUG_LIST is not set 1062# CONFIG_DEBUG_LIST is not set
1048# CONFIG_DEBUG_SG is not set 1063# CONFIG_DEBUG_SG is not set
1064# CONFIG_DEBUG_NOTIFIERS is not set
1049# CONFIG_BOOT_PRINTK_DELAY is not set 1065# CONFIG_BOOT_PRINTK_DELAY is not set
1050# CONFIG_RCU_TORTURE_TEST is not set 1066# CONFIG_RCU_TORTURE_TEST is not set
1051# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1067# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1055,6 +1071,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
1055# CONFIG_LATENCYTOP is not set 1071# CONFIG_LATENCYTOP is not set
1056CONFIG_SYSCTL_SYSCALL_CHECK=y 1072CONFIG_SYSCTL_SYSCALL_CHECK=y
1057CONFIG_HAVE_FUNCTION_TRACER=y 1073CONFIG_HAVE_FUNCTION_TRACER=y
1074CONFIG_HAVE_DYNAMIC_FTRACE=y
1075CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1058 1076
1059# 1077#
1060# Tracers 1078# Tracers
@@ -1064,11 +1082,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1064# CONFIG_SCHED_TRACER is not set 1082# CONFIG_SCHED_TRACER is not set
1065# CONFIG_CONTEXT_SWITCH_TRACER is not set 1083# CONFIG_CONTEXT_SWITCH_TRACER is not set
1066# CONFIG_BOOT_TRACER is not set 1084# CONFIG_BOOT_TRACER is not set
1085# CONFIG_TRACE_BRANCH_PROFILING is not set
1067# CONFIG_STACK_TRACER is not set 1086# CONFIG_STACK_TRACER is not set
1068# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1087# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1069# CONFIG_SAMPLES is not set 1088# CONFIG_SAMPLES is not set
1070CONFIG_HAVE_ARCH_KGDB=y 1089CONFIG_HAVE_ARCH_KGDB=y
1071# CONFIG_KGDB is not set 1090# CONFIG_KGDB is not set
1091CONFIG_PRINT_STACK_DEPTH=64
1072# CONFIG_DEBUG_STACKOVERFLOW is not set 1092# CONFIG_DEBUG_STACKOVERFLOW is not set
1073# CONFIG_DEBUG_STACK_USAGE is not set 1093# CONFIG_DEBUG_STACK_USAGE is not set
1074# CONFIG_DEBUG_PAGEALLOC is not set 1094# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1094,6 +1114,7 @@ CONFIG_CRYPTO=y
1094# 1114#
1095# CONFIG_CRYPTO_FIPS is not set 1115# CONFIG_CRYPTO_FIPS is not set
1096# CONFIG_CRYPTO_MANAGER is not set 1116# CONFIG_CRYPTO_MANAGER is not set
1117# CONFIG_CRYPTO_MANAGER2 is not set
1097# CONFIG_CRYPTO_GF128MUL is not set 1118# CONFIG_CRYPTO_GF128MUL is not set
1098# CONFIG_CRYPTO_NULL is not set 1119# CONFIG_CRYPTO_NULL is not set
1099# CONFIG_CRYPTO_CRYPTD is not set 1120# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/40x/walnut_defconfig b/arch/powerpc/configs/40x/walnut_defconfig
index 5820e0a4fc55..5ab29dddd21c 100644
--- a/arch/powerpc/configs/40x/walnut_defconfig
+++ b/arch/powerpc/configs/40x/walnut_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 08:49:27 2008 4# Tue Jan 20 08:17:57 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -40,7 +41,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
40CONFIG_PPC=y 41CONFIG_PPC=y
41CONFIG_EARLY_PRINTK=y 42CONFIG_EARLY_PRINTK=y
42CONFIG_GENERIC_NVRAM=y 43CONFIG_GENERIC_NVRAM=y
43CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 44CONFIG_SCHED_OMIT_FRAME_POINTER=y
44CONFIG_ARCH_MAY_HAVE_PC_FDC=y 45CONFIG_ARCH_MAY_HAVE_PC_FDC=y
45CONFIG_PPC_OF=y 46CONFIG_PPC_OF=y
46CONFIG_OF=y 47CONFIG_OF=y
@@ -71,12 +72,12 @@ CONFIG_POSIX_MQUEUE=y
71# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
72# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
73CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
74# CONFIG_CGROUPS is not set
75CONFIG_GROUP_SCHED=y 75CONFIG_GROUP_SCHED=y
76CONFIG_FAIR_GROUP_SCHED=y 76CONFIG_FAIR_GROUP_SCHED=y
77# CONFIG_RT_GROUP_SCHED is not set 77# CONFIG_RT_GROUP_SCHED is not set
78CONFIG_USER_SCHED=y 78CONFIG_USER_SCHED=y
79# CONFIG_CGROUP_SCHED is not set 79# CONFIG_CGROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -89,6 +90,7 @@ CONFIG_EMBEDDED=y
89CONFIG_SYSCTL_SYSCALL=y 90CONFIG_SYSCTL_SYSCALL=y
90CONFIG_KALLSYMS=y 91CONFIG_KALLSYMS=y
91CONFIG_KALLSYMS_ALL=y 92CONFIG_KALLSYMS_ALL=y
93CONFIG_KALLSYMS_STRIP_GENERATED=y
92CONFIG_KALLSYMS_EXTRA_PASS=y 94CONFIG_KALLSYMS_EXTRA_PASS=y
93CONFIG_HOTPLUG=y 95CONFIG_HOTPLUG=y
94CONFIG_PRINTK=y 96CONFIG_PRINTK=y
@@ -111,7 +113,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 113CONFIG_SLUB=y
112# CONFIG_SLOB is not set 114# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 115# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 116CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 117# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +123,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 124CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 125CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 126CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 127CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 128# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +130,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 130# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 131# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 132# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 133CONFIG_BLOCK=y
135CONFIG_LBD=y 134CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 135# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 136# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 137# CONFIG_BLK_DEV_INTEGRITY is not set
140 138
@@ -151,6 +149,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 149# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 150CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 151CONFIG_CLASSIC_RCU=y
152# CONFIG_TREE_RCU is not set
153# CONFIG_PREEMPT_RCU is not set
154# CONFIG_TREE_RCU_TRACE is not set
155# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 156# CONFIG_FREEZER is not set
155# CONFIG_PPC4xx_PCI_EXPRESS is not set 157# CONFIG_PPC4xx_PCI_EXPRESS is not set
156 158
@@ -185,6 +187,7 @@ CONFIG_IBM405_ERR51=y
185# CONFIG_CPU_FREQ is not set 187# CONFIG_CPU_FREQ is not set
186# CONFIG_FSL_ULI1575 is not set 188# CONFIG_FSL_ULI1575 is not set
187CONFIG_OF_RTC=y 189CONFIG_OF_RTC=y
190# CONFIG_SIMPLE_GPIO is not set
188 191
189# 192#
190# Kernel options 193# Kernel options
@@ -208,6 +211,7 @@ CONFIG_BINFMT_ELF=y
208# CONFIG_BINFMT_MISC is not set 211# CONFIG_BINFMT_MISC is not set
209# CONFIG_MATH_EMULATION is not set 212# CONFIG_MATH_EMULATION is not set
210# CONFIG_IOMMU_HELPER is not set 213# CONFIG_IOMMU_HELPER is not set
214CONFIG_PPC_NEED_DMA_SYNC_OPS=y
211CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
212CONFIG_ARCH_HAS_WALK_MEMORY=y 216CONFIG_ARCH_HAS_WALK_MEMORY=y
213CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -222,12 +226,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
222CONFIG_PAGEFLAGS_EXTENDED=y 226CONFIG_PAGEFLAGS_EXTENDED=y
223CONFIG_SPLIT_PTLOCK_CPUS=4 227CONFIG_SPLIT_PTLOCK_CPUS=4
224CONFIG_MIGRATION=y 228CONFIG_MIGRATION=y
225CONFIG_RESOURCES_64BIT=y
226# CONFIG_PHYS_ADDR_T_64BIT is not set 229# CONFIG_PHYS_ADDR_T_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1 230CONFIG_ZONE_DMA_FLAG=1
228CONFIG_BOUNCE=y 231CONFIG_BOUNCE=y
229CONFIG_VIRT_TO_BUS=y 232CONFIG_VIRT_TO_BUS=y
230CONFIG_UNEVICTABLE_LRU=y 233CONFIG_UNEVICTABLE_LRU=y
234CONFIG_PPC_4K_PAGES=y
235# CONFIG_PPC_16K_PAGES is not set
236# CONFIG_PPC_64K_PAGES is not set
231CONFIG_FORCE_MAX_ZONEORDER=11 237CONFIG_FORCE_MAX_ZONEORDER=11
232CONFIG_PROC_DEVICETREE=y 238CONFIG_PROC_DEVICETREE=y
233# CONFIG_CMDLINE_BOOL is not set 239# CONFIG_CMDLINE_BOOL is not set
@@ -251,6 +257,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
251# CONFIG_PCI_MSI is not set 257# CONFIG_PCI_MSI is not set
252# CONFIG_PCI_LEGACY is not set 258# CONFIG_PCI_LEGACY is not set
253# CONFIG_PCI_DEBUG is not set 259# CONFIG_PCI_DEBUG is not set
260# CONFIG_PCI_STUB is not set
254# CONFIG_PCCARD is not set 261# CONFIG_PCCARD is not set
255# CONFIG_HOTPLUG_PCI is not set 262# CONFIG_HOTPLUG_PCI is not set
256# CONFIG_HAS_RAPIDIO is not set 263# CONFIG_HAS_RAPIDIO is not set
@@ -275,6 +282,7 @@ CONFIG_NET=y
275# 282#
276# Networking options 283# Networking options
277# 284#
285CONFIG_COMPAT_NET_DEV_OPS=y
278CONFIG_PACKET=y 286CONFIG_PACKET=y
279# CONFIG_PACKET_MMAP is not set 287# CONFIG_PACKET_MMAP is not set
280CONFIG_UNIX=y 288CONFIG_UNIX=y
@@ -325,6 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
325# CONFIG_ECONET is not set 333# CONFIG_ECONET is not set
326# CONFIG_WAN_ROUTER is not set 334# CONFIG_WAN_ROUTER is not set
327# CONFIG_NET_SCHED is not set 335# CONFIG_NET_SCHED is not set
336# CONFIG_DCB is not set
328 337
329# 338#
330# Network testing 339# Network testing
@@ -337,6 +346,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
337# CONFIG_AF_RXRPC is not set 346# CONFIG_AF_RXRPC is not set
338# CONFIG_PHONET is not set 347# CONFIG_PHONET is not set
339# CONFIG_WIRELESS is not set 348# CONFIG_WIRELESS is not set
349# CONFIG_WIMAX is not set
340# CONFIG_RFKILL is not set 350# CONFIG_RFKILL is not set
341# CONFIG_NET_9P is not set 351# CONFIG_NET_9P is not set
342 352
@@ -362,6 +372,7 @@ CONFIG_MTD=y
362# CONFIG_MTD_DEBUG is not set 372# CONFIG_MTD_DEBUG is not set
363# CONFIG_MTD_CONCAT is not set 373# CONFIG_MTD_CONCAT is not set
364CONFIG_MTD_PARTITIONS=y 374CONFIG_MTD_PARTITIONS=y
375# CONFIG_MTD_TESTS is not set
365# CONFIG_MTD_REDBOOT_PARTS is not set 376# CONFIG_MTD_REDBOOT_PARTS is not set
366CONFIG_MTD_CMDLINE_PARTS=y 377CONFIG_MTD_CMDLINE_PARTS=y
367CONFIG_MTD_OF_PARTS=y 378CONFIG_MTD_OF_PARTS=y
@@ -434,6 +445,12 @@ CONFIG_MTD_PHYSMAP_OF=y
434# CONFIG_MTD_ONENAND is not set 445# CONFIG_MTD_ONENAND is not set
435 446
436# 447#
448# LPDDR flash memory drivers
449#
450# CONFIG_MTD_LPDDR is not set
451# CONFIG_MTD_QINFO_PROBE is not set
452
453#
437# UBI - Unsorted block images 454# UBI - Unsorted block images
438# 455#
439# CONFIG_MTD_UBI is not set 456# CONFIG_MTD_UBI is not set
@@ -464,6 +481,7 @@ CONFIG_MISC_DEVICES=y
464# CONFIG_TIFM_CORE is not set 481# CONFIG_TIFM_CORE is not set
465# CONFIG_ENCLOSURE_SERVICES is not set 482# CONFIG_ENCLOSURE_SERVICES is not set
466# CONFIG_HP_ILO is not set 483# CONFIG_HP_ILO is not set
484# CONFIG_C2PORT is not set
467CONFIG_HAVE_IDE=y 485CONFIG_HAVE_IDE=y
468# CONFIG_IDE is not set 486# CONFIG_IDE is not set
469 487
@@ -546,6 +564,7 @@ CONFIG_NETDEV_1000=y
546# CONFIG_JME is not set 564# CONFIG_JME is not set
547CONFIG_NETDEV_10000=y 565CONFIG_NETDEV_10000=y
548# CONFIG_CHELSIO_T1 is not set 566# CONFIG_CHELSIO_T1 is not set
567CONFIG_CHELSIO_T3_DEPENDS=y
549# CONFIG_CHELSIO_T3 is not set 568# CONFIG_CHELSIO_T3 is not set
550# CONFIG_ENIC is not set 569# CONFIG_ENIC is not set
551# CONFIG_IXGBE is not set 570# CONFIG_IXGBE is not set
@@ -568,6 +587,10 @@ CONFIG_NETDEV_10000=y
568# CONFIG_WLAN_PRE80211 is not set 587# CONFIG_WLAN_PRE80211 is not set
569# CONFIG_WLAN_80211 is not set 588# CONFIG_WLAN_80211 is not set
570# CONFIG_IWLWIFI_LEDS is not set 589# CONFIG_IWLWIFI_LEDS is not set
590
591#
592# Enable WiMAX (Networking options) to see the WiMAX drivers
593#
571# CONFIG_WAN is not set 594# CONFIG_WAN is not set
572# CONFIG_FDDI is not set 595# CONFIG_FDDI is not set
573# CONFIG_HIPPI is not set 596# CONFIG_HIPPI is not set
@@ -620,9 +643,12 @@ CONFIG_SERIAL_CORE=y
620CONFIG_SERIAL_CORE_CONSOLE=y 643CONFIG_SERIAL_CORE_CONSOLE=y
621# CONFIG_SERIAL_JSM is not set 644# CONFIG_SERIAL_JSM is not set
622CONFIG_SERIAL_OF_PLATFORM=y 645CONFIG_SERIAL_OF_PLATFORM=y
646# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
623CONFIG_UNIX98_PTYS=y 647CONFIG_UNIX98_PTYS=y
648# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
624CONFIG_LEGACY_PTYS=y 649CONFIG_LEGACY_PTYS=y
625CONFIG_LEGACY_PTY_COUNT=256 650CONFIG_LEGACY_PTY_COUNT=256
651# CONFIG_HVC_UDBG is not set
626# CONFIG_IPMI_HANDLER is not set 652# CONFIG_IPMI_HANDLER is not set
627# CONFIG_HW_RANDOM is not set 653# CONFIG_HW_RANDOM is not set
628# CONFIG_NVRAM is not set 654# CONFIG_NVRAM is not set
@@ -641,11 +667,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
641# CONFIG_HWMON is not set 667# CONFIG_HWMON is not set
642CONFIG_THERMAL=y 668CONFIG_THERMAL=y
643# CONFIG_WATCHDOG is not set 669# CONFIG_WATCHDOG is not set
670CONFIG_SSB_POSSIBLE=y
644 671
645# 672#
646# Sonics Silicon Backplane 673# Sonics Silicon Backplane
647# 674#
648CONFIG_SSB_POSSIBLE=y
649# CONFIG_SSB is not set 675# CONFIG_SSB is not set
650 676
651# 677#
@@ -655,7 +681,7 @@ CONFIG_SSB_POSSIBLE=y
655# CONFIG_MFD_SM501 is not set 681# CONFIG_MFD_SM501 is not set
656# CONFIG_HTC_PASIC3 is not set 682# CONFIG_HTC_PASIC3 is not set
657# CONFIG_MFD_TMIO is not set 683# CONFIG_MFD_TMIO is not set
658# CONFIG_MFD_WM8400 is not set 684# CONFIG_REGULATOR is not set
659 685
660# 686#
661# Multimedia devices 687# Multimedia devices
@@ -701,9 +727,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
701# 727#
702 728
703# 729#
704# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 730# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
705# 731#
706# CONFIG_USB_GADGET is not set 732# CONFIG_USB_GADGET is not set
733
734#
735# OTG and related infrastructure
736#
707# CONFIG_UWB is not set 737# CONFIG_UWB is not set
708# CONFIG_MMC is not set 738# CONFIG_MMC is not set
709# CONFIG_MEMSTICK is not set 739# CONFIG_MEMSTICK is not set
@@ -729,7 +759,9 @@ CONFIG_EXT2_FS=y
729# CONFIG_FS_POSIX_ACL is not set 759# CONFIG_FS_POSIX_ACL is not set
730CONFIG_FILE_LOCKING=y 760CONFIG_FILE_LOCKING=y
731# CONFIG_XFS_FS is not set 761# CONFIG_XFS_FS is not set
762# CONFIG_GFS2_FS is not set
732# CONFIG_OCFS2_FS is not set 763# CONFIG_OCFS2_FS is not set
764# CONFIG_BTRFS_FS is not set
733CONFIG_DNOTIFY=y 765CONFIG_DNOTIFY=y
734CONFIG_INOTIFY=y 766CONFIG_INOTIFY=y
735CONFIG_INOTIFY_USER=y 767CONFIG_INOTIFY_USER=y
@@ -763,10 +795,7 @@ CONFIG_TMPFS=y
763# CONFIG_TMPFS_POSIX_ACL is not set 795# CONFIG_TMPFS_POSIX_ACL is not set
764# CONFIG_HUGETLB_PAGE is not set 796# CONFIG_HUGETLB_PAGE is not set
765# CONFIG_CONFIGFS_FS is not set 797# CONFIG_CONFIGFS_FS is not set
766 798CONFIG_MISC_FILESYSTEMS=y
767#
768# Miscellaneous filesystems
769#
770# CONFIG_ADFS_FS is not set 799# CONFIG_ADFS_FS is not set
771# CONFIG_AFFS_FS is not set 800# CONFIG_AFFS_FS is not set
772# CONFIG_HFS_FS is not set 801# CONFIG_HFS_FS is not set
@@ -776,6 +805,7 @@ CONFIG_TMPFS=y
776# CONFIG_EFS_FS is not set 805# CONFIG_EFS_FS is not set
777# CONFIG_JFFS2_FS is not set 806# CONFIG_JFFS2_FS is not set
778CONFIG_CRAMFS=y 807CONFIG_CRAMFS=y
808# CONFIG_SQUASHFS is not set
779# CONFIG_VXFS_FS is not set 809# CONFIG_VXFS_FS is not set
780# CONFIG_MINIX_FS is not set 810# CONFIG_MINIX_FS is not set
781# CONFIG_OMFS_FS is not set 811# CONFIG_OMFS_FS is not set
@@ -816,6 +846,7 @@ CONFIG_MSDOS_PARTITION=y
816# Library routines 846# Library routines
817# 847#
818CONFIG_BITREVERSE=y 848CONFIG_BITREVERSE=y
849CONFIG_GENERIC_FIND_LAST_BIT=y
819# CONFIG_CRC_CCITT is not set 850# CONFIG_CRC_CCITT is not set
820# CONFIG_CRC16 is not set 851# CONFIG_CRC16 is not set
821# CONFIG_CRC_T10DIF is not set 852# CONFIG_CRC_T10DIF is not set
@@ -866,6 +897,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
866# CONFIG_DEBUG_MEMORY_INIT is not set 897# CONFIG_DEBUG_MEMORY_INIT is not set
867# CONFIG_DEBUG_LIST is not set 898# CONFIG_DEBUG_LIST is not set
868# CONFIG_DEBUG_SG is not set 899# CONFIG_DEBUG_SG is not set
900# CONFIG_DEBUG_NOTIFIERS is not set
869# CONFIG_BOOT_PRINTK_DELAY is not set 901# CONFIG_BOOT_PRINTK_DELAY is not set
870# CONFIG_RCU_TORTURE_TEST is not set 902# CONFIG_RCU_TORTURE_TEST is not set
871# CONFIG_RCU_CPU_STALL_DETECTOR is not set 903# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -874,18 +906,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
874# CONFIG_FAULT_INJECTION is not set 906# CONFIG_FAULT_INJECTION is not set
875# CONFIG_LATENCYTOP is not set 907# CONFIG_LATENCYTOP is not set
876CONFIG_SYSCTL_SYSCALL_CHECK=y 908CONFIG_SYSCTL_SYSCALL_CHECK=y
877CONFIG_NOP_TRACER=y 909CONFIG_HAVE_FUNCTION_TRACER=y
878CONFIG_HAVE_FTRACE=y
879CONFIG_HAVE_DYNAMIC_FTRACE=y 910CONFIG_HAVE_DYNAMIC_FTRACE=y
880# CONFIG_FTRACE is not set 911CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
912
913#
914# Tracers
915#
916# CONFIG_FUNCTION_TRACER is not set
881# CONFIG_SCHED_TRACER is not set 917# CONFIG_SCHED_TRACER is not set
882# CONFIG_CONTEXT_SWITCH_TRACER is not set 918# CONFIG_CONTEXT_SWITCH_TRACER is not set
883# CONFIG_BOOT_TRACER is not set 919# CONFIG_BOOT_TRACER is not set
920# CONFIG_TRACE_BRANCH_PROFILING is not set
884# CONFIG_STACK_TRACER is not set 921# CONFIG_STACK_TRACER is not set
885# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 922# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
886# CONFIG_SAMPLES is not set 923# CONFIG_SAMPLES is not set
887CONFIG_HAVE_ARCH_KGDB=y 924CONFIG_HAVE_ARCH_KGDB=y
888# CONFIG_KGDB is not set 925# CONFIG_KGDB is not set
926CONFIG_PRINT_STACK_DEPTH=64
889# CONFIG_DEBUG_STACKOVERFLOW is not set 927# CONFIG_DEBUG_STACKOVERFLOW is not set
890# CONFIG_DEBUG_STACK_USAGE is not set 928# CONFIG_DEBUG_STACK_USAGE is not set
891# CONFIG_DEBUG_PAGEALLOC is not set 929# CONFIG_DEBUG_PAGEALLOC is not set
@@ -912,11 +950,15 @@ CONFIG_CRYPTO=y
912# 950#
913# CONFIG_CRYPTO_FIPS is not set 951# CONFIG_CRYPTO_FIPS is not set
914CONFIG_CRYPTO_ALGAPI=y 952CONFIG_CRYPTO_ALGAPI=y
915CONFIG_CRYPTO_AEAD=y 953CONFIG_CRYPTO_ALGAPI2=y
954CONFIG_CRYPTO_AEAD2=y
916CONFIG_CRYPTO_BLKCIPHER=y 955CONFIG_CRYPTO_BLKCIPHER=y
956CONFIG_CRYPTO_BLKCIPHER2=y
917CONFIG_CRYPTO_HASH=y 957CONFIG_CRYPTO_HASH=y
918CONFIG_CRYPTO_RNG=y 958CONFIG_CRYPTO_HASH2=y
959CONFIG_CRYPTO_RNG2=y
919CONFIG_CRYPTO_MANAGER=y 960CONFIG_CRYPTO_MANAGER=y
961CONFIG_CRYPTO_MANAGER2=y
920# CONFIG_CRYPTO_GF128MUL is not set 962# CONFIG_CRYPTO_GF128MUL is not set
921# CONFIG_CRYPTO_NULL is not set 963# CONFIG_CRYPTO_NULL is not set
922# CONFIG_CRYPTO_CRYPTD is not set 964# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig
index 082158d591c5..1d72b0ac3f25 100644
--- a/arch/powerpc/configs/44x/arches_defconfig
+++ b/arch/powerpc/configs/44x/arches_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:04 2008 4# Tue Jan 20 08:22:31 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,8 +76,8 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79# CONFIG_GROUP_SCHED is not set 79# CONFIG_GROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -111,7 +112,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 112CONFIG_SLUB=y
112# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 116# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 126CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 132CONFIG_BLOCK=y
135CONFIG_LBD=y 133CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
140 137
@@ -151,6 +148,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
155CONFIG_PPC4xx_PCI_EXPRESS=y 156CONFIG_PPC4xx_PCI_EXPRESS=y
156 157
@@ -188,6 +189,7 @@ CONFIG_460EX=y
188# CONFIG_GENERIC_IOMAP is not set 189# CONFIG_GENERIC_IOMAP is not set
189# CONFIG_CPU_FREQ is not set 190# CONFIG_CPU_FREQ is not set
190# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
192# CONFIG_SIMPLE_GPIO is not set
191 193
192# 194#
193# Kernel options 195# Kernel options
@@ -212,6 +214,7 @@ CONFIG_BINFMT_ELF=y
212# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
213# CONFIG_MATH_EMULATION is not set 215# CONFIG_MATH_EMULATION is not set
214# CONFIG_IOMMU_HELPER is not set 216# CONFIG_IOMMU_HELPER is not set
217CONFIG_PPC_NEED_DMA_SYNC_OPS=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216CONFIG_ARCH_HAS_WALK_MEMORY=y 219CONFIG_ARCH_HAS_WALK_MEMORY=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -226,12 +229,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 229CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 231CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y
230CONFIG_PHYS_ADDR_T_64BIT=y 232CONFIG_PHYS_ADDR_T_64BIT=y
231CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 236CONFIG_UNEVICTABLE_LRU=y
237CONFIG_PPC_4K_PAGES=y
238# CONFIG_PPC_16K_PAGES is not set
239# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 240CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 241CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 242CONFIG_CMDLINE_BOOL=y
@@ -255,6 +260,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
255# CONFIG_PCI_MSI is not set 260# CONFIG_PCI_MSI is not set
256CONFIG_PCI_LEGACY=y 261CONFIG_PCI_LEGACY=y
257# CONFIG_PCI_DEBUG is not set 262# CONFIG_PCI_DEBUG is not set
263# CONFIG_PCI_STUB is not set
258# CONFIG_PCCARD is not set 264# CONFIG_PCCARD is not set
259# CONFIG_HOTPLUG_PCI is not set 265# CONFIG_HOTPLUG_PCI is not set
260# CONFIG_HAS_RAPIDIO is not set 266# CONFIG_HAS_RAPIDIO is not set
@@ -279,6 +285,7 @@ CONFIG_NET=y
279# 285#
280# Networking options 286# Networking options
281# 287#
288CONFIG_COMPAT_NET_DEV_OPS=y
282CONFIG_PACKET=y 289CONFIG_PACKET=y
283# CONFIG_PACKET_MMAP is not set 290# CONFIG_PACKET_MMAP is not set
284CONFIG_UNIX=y 291CONFIG_UNIX=y
@@ -329,6 +336,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_ECONET is not set 336# CONFIG_ECONET is not set
330# CONFIG_WAN_ROUTER is not set 337# CONFIG_WAN_ROUTER is not set
331# CONFIG_NET_SCHED is not set 338# CONFIG_NET_SCHED is not set
339# CONFIG_DCB is not set
332 340
333# 341#
334# Network testing 342# Network testing
@@ -341,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
341# CONFIG_AF_RXRPC is not set 349# CONFIG_AF_RXRPC is not set
342# CONFIG_PHONET is not set 350# CONFIG_PHONET is not set
343# CONFIG_WIRELESS is not set 351# CONFIG_WIRELESS is not set
352# CONFIG_WIMAX is not set
344# CONFIG_RFKILL is not set 353# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 354# CONFIG_NET_9P is not set
346 355
@@ -453,6 +462,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
453# CONFIG_WLAN_PRE80211 is not set 462# CONFIG_WLAN_PRE80211 is not set
454# CONFIG_WLAN_80211 is not set 463# CONFIG_WLAN_80211 is not set
455# CONFIG_IWLWIFI_LEDS is not set 464# CONFIG_IWLWIFI_LEDS is not set
465
466#
467# Enable WiMAX (Networking options) to see the WiMAX drivers
468#
456# CONFIG_WAN is not set 469# CONFIG_WAN is not set
457# CONFIG_FDDI is not set 470# CONFIG_FDDI is not set
458# CONFIG_HIPPI is not set 471# CONFIG_HIPPI is not set
@@ -505,9 +518,12 @@ CONFIG_SERIAL_CORE=y
505CONFIG_SERIAL_CORE_CONSOLE=y 518CONFIG_SERIAL_CORE_CONSOLE=y
506# CONFIG_SERIAL_JSM is not set 519# CONFIG_SERIAL_JSM is not set
507CONFIG_SERIAL_OF_PLATFORM=y 520CONFIG_SERIAL_OF_PLATFORM=y
521# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
508CONFIG_UNIX98_PTYS=y 522CONFIG_UNIX98_PTYS=y
523# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
509CONFIG_LEGACY_PTYS=y 524CONFIG_LEGACY_PTYS=y
510CONFIG_LEGACY_PTY_COUNT=256 525CONFIG_LEGACY_PTY_COUNT=256
526# CONFIG_HVC_UDBG is not set
511# CONFIG_IPMI_HANDLER is not set 527# CONFIG_IPMI_HANDLER is not set
512# CONFIG_HW_RANDOM is not set 528# CONFIG_HW_RANDOM is not set
513# CONFIG_NVRAM is not set 529# CONFIG_NVRAM is not set
@@ -527,11 +543,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
527# CONFIG_THERMAL is not set 543# CONFIG_THERMAL is not set
528# CONFIG_THERMAL_HWMON is not set 544# CONFIG_THERMAL_HWMON is not set
529# CONFIG_WATCHDOG is not set 545# CONFIG_WATCHDOG is not set
546CONFIG_SSB_POSSIBLE=y
530 547
531# 548#
532# Sonics Silicon Backplane 549# Sonics Silicon Backplane
533# 550#
534CONFIG_SSB_POSSIBLE=y
535# CONFIG_SSB is not set 551# CONFIG_SSB is not set
536 552
537# 553#
@@ -541,7 +557,7 @@ CONFIG_SSB_POSSIBLE=y
541# CONFIG_MFD_SM501 is not set 557# CONFIG_MFD_SM501 is not set
542# CONFIG_HTC_PASIC3 is not set 558# CONFIG_HTC_PASIC3 is not set
543# CONFIG_MFD_TMIO is not set 559# CONFIG_MFD_TMIO is not set
544# CONFIG_MFD_WM8400 is not set 560# CONFIG_REGULATOR is not set
545 561
546# 562#
547# Multimedia devices 563# Multimedia devices
@@ -600,7 +616,9 @@ CONFIG_EXT2_FS=y
600# CONFIG_FS_POSIX_ACL is not set 616# CONFIG_FS_POSIX_ACL is not set
601CONFIG_FILE_LOCKING=y 617CONFIG_FILE_LOCKING=y
602# CONFIG_XFS_FS is not set 618# CONFIG_XFS_FS is not set
619# CONFIG_GFS2_FS is not set
603# CONFIG_OCFS2_FS is not set 620# CONFIG_OCFS2_FS is not set
621# CONFIG_BTRFS_FS is not set
604CONFIG_DNOTIFY=y 622CONFIG_DNOTIFY=y
605CONFIG_INOTIFY=y 623CONFIG_INOTIFY=y
606CONFIG_INOTIFY_USER=y 624CONFIG_INOTIFY_USER=y
@@ -634,10 +652,7 @@ CONFIG_TMPFS=y
634# CONFIG_TMPFS_POSIX_ACL is not set 652# CONFIG_TMPFS_POSIX_ACL is not set
635# CONFIG_HUGETLB_PAGE is not set 653# CONFIG_HUGETLB_PAGE is not set
636# CONFIG_CONFIGFS_FS is not set 654# CONFIG_CONFIGFS_FS is not set
637 655CONFIG_MISC_FILESYSTEMS=y
638#
639# Miscellaneous filesystems
640#
641# CONFIG_ADFS_FS is not set 656# CONFIG_ADFS_FS is not set
642# CONFIG_AFFS_FS is not set 657# CONFIG_AFFS_FS is not set
643# CONFIG_HFS_FS is not set 658# CONFIG_HFS_FS is not set
@@ -646,6 +661,7 @@ CONFIG_TMPFS=y
646# CONFIG_BFS_FS is not set 661# CONFIG_BFS_FS is not set
647# CONFIG_EFS_FS is not set 662# CONFIG_EFS_FS is not set
648CONFIG_CRAMFS=y 663CONFIG_CRAMFS=y
664# CONFIG_SQUASHFS is not set
649# CONFIG_VXFS_FS is not set 665# CONFIG_VXFS_FS is not set
650# CONFIG_MINIX_FS is not set 666# CONFIG_MINIX_FS is not set
651# CONFIG_OMFS_FS is not set 667# CONFIG_OMFS_FS is not set
@@ -686,6 +702,7 @@ CONFIG_MSDOS_PARTITION=y
686# Library routines 702# Library routines
687# 703#
688CONFIG_BITREVERSE=y 704CONFIG_BITREVERSE=y
705CONFIG_GENERIC_FIND_LAST_BIT=y
689# CONFIG_CRC_CCITT is not set 706# CONFIG_CRC_CCITT is not set
690# CONFIG_CRC16 is not set 707# CONFIG_CRC16 is not set
691# CONFIG_CRC_T10DIF is not set 708# CONFIG_CRC_T10DIF is not set
@@ -736,6 +753,7 @@ CONFIG_SCHED_DEBUG=y
736# CONFIG_DEBUG_MEMORY_INIT is not set 753# CONFIG_DEBUG_MEMORY_INIT is not set
737# CONFIG_DEBUG_LIST is not set 754# CONFIG_DEBUG_LIST is not set
738# CONFIG_DEBUG_SG is not set 755# CONFIG_DEBUG_SG is not set
756# CONFIG_DEBUG_NOTIFIERS is not set
739# CONFIG_BOOT_PRINTK_DELAY is not set 757# CONFIG_BOOT_PRINTK_DELAY is not set
740# CONFIG_RCU_TORTURE_TEST is not set 758# CONFIG_RCU_TORTURE_TEST is not set
741# CONFIG_RCU_CPU_STALL_DETECTOR is not set 759# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -744,18 +762,24 @@ CONFIG_SCHED_DEBUG=y
744# CONFIG_FAULT_INJECTION is not set 762# CONFIG_FAULT_INJECTION is not set
745# CONFIG_LATENCYTOP is not set 763# CONFIG_LATENCYTOP is not set
746CONFIG_SYSCTL_SYSCALL_CHECK=y 764CONFIG_SYSCTL_SYSCALL_CHECK=y
747CONFIG_NOP_TRACER=y 765CONFIG_HAVE_FUNCTION_TRACER=y
748CONFIG_HAVE_FTRACE=y
749CONFIG_HAVE_DYNAMIC_FTRACE=y 766CONFIG_HAVE_DYNAMIC_FTRACE=y
750# CONFIG_FTRACE is not set 767CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
768
769#
770# Tracers
771#
772# CONFIG_FUNCTION_TRACER is not set
751# CONFIG_SCHED_TRACER is not set 773# CONFIG_SCHED_TRACER is not set
752# CONFIG_CONTEXT_SWITCH_TRACER is not set 774# CONFIG_CONTEXT_SWITCH_TRACER is not set
753# CONFIG_BOOT_TRACER is not set 775# CONFIG_BOOT_TRACER is not set
776# CONFIG_TRACE_BRANCH_PROFILING is not set
754# CONFIG_STACK_TRACER is not set 777# CONFIG_STACK_TRACER is not set
755# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 778# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
756# CONFIG_SAMPLES is not set 779# CONFIG_SAMPLES is not set
757CONFIG_HAVE_ARCH_KGDB=y 780CONFIG_HAVE_ARCH_KGDB=y
758# CONFIG_KGDB is not set 781# CONFIG_KGDB is not set
782CONFIG_PRINT_STACK_DEPTH=64
759# CONFIG_DEBUG_STACKOVERFLOW is not set 783# CONFIG_DEBUG_STACKOVERFLOW is not set
760# CONFIG_DEBUG_STACK_USAGE is not set 784# CONFIG_DEBUG_STACK_USAGE is not set
761# CONFIG_DEBUG_PAGEALLOC is not set 785# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/44x/bamboo_defconfig b/arch/powerpc/configs/44x/bamboo_defconfig
index f47c2f3420f6..959bdc43a491 100644
--- a/arch/powerpc/configs/44x/bamboo_defconfig
+++ b/arch/powerpc/configs/44x/bamboo_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:06 2008 4# Tue Jan 20 08:22:33 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,12 +76,12 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 80CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -115,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 116CONFIG_SLUB=y
116# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +126,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 130CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 131# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +133,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 133# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 136CONFIG_BLOCK=y
139CONFIG_LBD=y 137CONFIG_LBD=y
140# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
144 141
@@ -155,6 +152,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_TREE_RCU is not set
156# CONFIG_PREEMPT_RCU is not set
157# CONFIG_TREE_RCU_TRACE is not set
158# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 159# CONFIG_FREEZER is not set
159# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
160 161
@@ -193,6 +194,7 @@ CONFIG_IBM440EP_ERR42=y
193# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
194# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
195# CONFIG_FSL_ULI1575 is not set 196# CONFIG_FSL_ULI1575 is not set
197# CONFIG_SIMPLE_GPIO is not set
196 198
197# 199#
198# Kernel options 200# Kernel options
@@ -216,6 +218,7 @@ CONFIG_BINFMT_ELF=y
216# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
217# CONFIG_MATH_EMULATION is not set 219# CONFIG_MATH_EMULATION is not set
218# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
220CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -230,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
230CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y 236CONFIG_PHYS_ADDR_T_64BIT=y
235CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
236CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
237CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
239CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
241CONFIG_CMDLINE_BOOL=y 246CONFIG_CMDLINE_BOOL=y
@@ -259,6 +264,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
259# CONFIG_PCI_MSI is not set 264# CONFIG_PCI_MSI is not set
260CONFIG_PCI_LEGACY=y 265CONFIG_PCI_LEGACY=y
261# CONFIG_PCI_DEBUG is not set 266# CONFIG_PCI_DEBUG is not set
267# CONFIG_PCI_STUB is not set
262# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
263# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
264# CONFIG_HAS_RAPIDIO is not set 270# CONFIG_HAS_RAPIDIO is not set
@@ -283,6 +289,7 @@ CONFIG_NET=y
283# 289#
284# Networking options 290# Networking options
285# 291#
292CONFIG_COMPAT_NET_DEV_OPS=y
286CONFIG_PACKET=y 293CONFIG_PACKET=y
287# CONFIG_PACKET_MMAP is not set 294# CONFIG_PACKET_MMAP is not set
288CONFIG_UNIX=y 295CONFIG_UNIX=y
@@ -333,6 +340,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
333# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
334# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
335# CONFIG_NET_SCHED is not set 342# CONFIG_NET_SCHED is not set
343# CONFIG_DCB is not set
336 344
337# 345#
338# Network testing 346# Network testing
@@ -345,6 +353,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_AF_RXRPC is not set 353# CONFIG_AF_RXRPC is not set
346# CONFIG_PHONET is not set 354# CONFIG_PHONET is not set
347# CONFIG_WIRELESS is not set 355# CONFIG_WIRELESS is not set
356# CONFIG_WIMAX is not set
348# CONFIG_RFKILL is not set 357# CONFIG_RFKILL is not set
349# CONFIG_NET_9P is not set 358# CONFIG_NET_9P is not set
350 359
@@ -394,6 +403,7 @@ CONFIG_MISC_DEVICES=y
394# CONFIG_TIFM_CORE is not set 403# CONFIG_TIFM_CORE is not set
395# CONFIG_ENCLOSURE_SERVICES is not set 404# CONFIG_ENCLOSURE_SERVICES is not set
396# CONFIG_HP_ILO is not set 405# CONFIG_HP_ILO is not set
406# CONFIG_C2PORT is not set
397CONFIG_HAVE_IDE=y 407CONFIG_HAVE_IDE=y
398# CONFIG_IDE is not set 408# CONFIG_IDE is not set
399 409
@@ -476,6 +486,7 @@ CONFIG_NETDEV_1000=y
476# CONFIG_JME is not set 486# CONFIG_JME is not set
477CONFIG_NETDEV_10000=y 487CONFIG_NETDEV_10000=y
478# CONFIG_CHELSIO_T1 is not set 488# CONFIG_CHELSIO_T1 is not set
489CONFIG_CHELSIO_T3_DEPENDS=y
479# CONFIG_CHELSIO_T3 is not set 490# CONFIG_CHELSIO_T3 is not set
480# CONFIG_ENIC is not set 491# CONFIG_ENIC is not set
481# CONFIG_IXGBE is not set 492# CONFIG_IXGBE is not set
@@ -498,6 +509,10 @@ CONFIG_NETDEV_10000=y
498# CONFIG_WLAN_PRE80211 is not set 509# CONFIG_WLAN_PRE80211 is not set
499# CONFIG_WLAN_80211 is not set 510# CONFIG_WLAN_80211 is not set
500# CONFIG_IWLWIFI_LEDS is not set 511# CONFIG_IWLWIFI_LEDS is not set
512
513#
514# Enable WiMAX (Networking options) to see the WiMAX drivers
515#
501# CONFIG_WAN is not set 516# CONFIG_WAN is not set
502# CONFIG_FDDI is not set 517# CONFIG_FDDI is not set
503# CONFIG_HIPPI is not set 518# CONFIG_HIPPI is not set
@@ -550,9 +565,12 @@ CONFIG_SERIAL_CORE=y
550CONFIG_SERIAL_CORE_CONSOLE=y 565CONFIG_SERIAL_CORE_CONSOLE=y
551# CONFIG_SERIAL_JSM is not set 566# CONFIG_SERIAL_JSM is not set
552CONFIG_SERIAL_OF_PLATFORM=y 567CONFIG_SERIAL_OF_PLATFORM=y
568# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
553CONFIG_UNIX98_PTYS=y 569CONFIG_UNIX98_PTYS=y
570# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
554CONFIG_LEGACY_PTYS=y 571CONFIG_LEGACY_PTYS=y
555CONFIG_LEGACY_PTY_COUNT=256 572CONFIG_LEGACY_PTY_COUNT=256
573# CONFIG_HVC_UDBG is not set
556# CONFIG_IPMI_HANDLER is not set 574# CONFIG_IPMI_HANDLER is not set
557# CONFIG_HW_RANDOM is not set 575# CONFIG_HW_RANDOM is not set
558# CONFIG_NVRAM is not set 576# CONFIG_NVRAM is not set
@@ -571,11 +589,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
571# CONFIG_HWMON is not set 589# CONFIG_HWMON is not set
572CONFIG_THERMAL=y 590CONFIG_THERMAL=y
573# CONFIG_WATCHDOG is not set 591# CONFIG_WATCHDOG is not set
592CONFIG_SSB_POSSIBLE=y
574 593
575# 594#
576# Sonics Silicon Backplane 595# Sonics Silicon Backplane
577# 596#
578CONFIG_SSB_POSSIBLE=y
579# CONFIG_SSB is not set 597# CONFIG_SSB is not set
580 598
581# 599#
@@ -585,7 +603,7 @@ CONFIG_SSB_POSSIBLE=y
585# CONFIG_MFD_SM501 is not set 603# CONFIG_MFD_SM501 is not set
586# CONFIG_HTC_PASIC3 is not set 604# CONFIG_HTC_PASIC3 is not set
587# CONFIG_MFD_TMIO is not set 605# CONFIG_MFD_TMIO is not set
588# CONFIG_MFD_WM8400 is not set 606# CONFIG_REGULATOR is not set
589 607
590# 608#
591# Multimedia devices 609# Multimedia devices
@@ -631,9 +649,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
631# 649#
632 650
633# 651#
634# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 652# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
635# 653#
636# CONFIG_USB_GADGET is not set 654# CONFIG_USB_GADGET is not set
655
656#
657# OTG and related infrastructure
658#
637# CONFIG_UWB is not set 659# CONFIG_UWB is not set
638# CONFIG_MMC is not set 660# CONFIG_MMC is not set
639# CONFIG_MEMSTICK is not set 661# CONFIG_MEMSTICK is not set
@@ -659,7 +681,9 @@ CONFIG_EXT2_FS=y
659# CONFIG_FS_POSIX_ACL is not set 681# CONFIG_FS_POSIX_ACL is not set
660CONFIG_FILE_LOCKING=y 682CONFIG_FILE_LOCKING=y
661# CONFIG_XFS_FS is not set 683# CONFIG_XFS_FS is not set
684# CONFIG_GFS2_FS is not set
662# CONFIG_OCFS2_FS is not set 685# CONFIG_OCFS2_FS is not set
686# CONFIG_BTRFS_FS is not set
663CONFIG_DNOTIFY=y 687CONFIG_DNOTIFY=y
664CONFIG_INOTIFY=y 688CONFIG_INOTIFY=y
665CONFIG_INOTIFY_USER=y 689CONFIG_INOTIFY_USER=y
@@ -693,10 +717,7 @@ CONFIG_TMPFS=y
693# CONFIG_TMPFS_POSIX_ACL is not set 717# CONFIG_TMPFS_POSIX_ACL is not set
694# CONFIG_HUGETLB_PAGE is not set 718# CONFIG_HUGETLB_PAGE is not set
695# CONFIG_CONFIGFS_FS is not set 719# CONFIG_CONFIGFS_FS is not set
696 720CONFIG_MISC_FILESYSTEMS=y
697#
698# Miscellaneous filesystems
699#
700# CONFIG_ADFS_FS is not set 721# CONFIG_ADFS_FS is not set
701# CONFIG_AFFS_FS is not set 722# CONFIG_AFFS_FS is not set
702# CONFIG_HFS_FS is not set 723# CONFIG_HFS_FS is not set
@@ -705,6 +726,7 @@ CONFIG_TMPFS=y
705# CONFIG_BFS_FS is not set 726# CONFIG_BFS_FS is not set
706# CONFIG_EFS_FS is not set 727# CONFIG_EFS_FS is not set
707CONFIG_CRAMFS=y 728CONFIG_CRAMFS=y
729# CONFIG_SQUASHFS is not set
708# CONFIG_VXFS_FS is not set 730# CONFIG_VXFS_FS is not set
709# CONFIG_MINIX_FS is not set 731# CONFIG_MINIX_FS is not set
710# CONFIG_OMFS_FS is not set 732# CONFIG_OMFS_FS is not set
@@ -745,6 +767,7 @@ CONFIG_MSDOS_PARTITION=y
745# Library routines 767# Library routines
746# 768#
747CONFIG_BITREVERSE=y 769CONFIG_BITREVERSE=y
770CONFIG_GENERIC_FIND_LAST_BIT=y
748# CONFIG_CRC_CCITT is not set 771# CONFIG_CRC_CCITT is not set
749# CONFIG_CRC16 is not set 772# CONFIG_CRC16 is not set
750# CONFIG_CRC_T10DIF is not set 773# CONFIG_CRC_T10DIF is not set
@@ -795,6 +818,7 @@ CONFIG_SCHED_DEBUG=y
795# CONFIG_DEBUG_MEMORY_INIT is not set 818# CONFIG_DEBUG_MEMORY_INIT is not set
796# CONFIG_DEBUG_LIST is not set 819# CONFIG_DEBUG_LIST is not set
797# CONFIG_DEBUG_SG is not set 820# CONFIG_DEBUG_SG is not set
821# CONFIG_DEBUG_NOTIFIERS is not set
798# CONFIG_BOOT_PRINTK_DELAY is not set 822# CONFIG_BOOT_PRINTK_DELAY is not set
799# CONFIG_RCU_TORTURE_TEST is not set 823# CONFIG_RCU_TORTURE_TEST is not set
800# CONFIG_RCU_CPU_STALL_DETECTOR is not set 824# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -803,18 +827,24 @@ CONFIG_SCHED_DEBUG=y
803# CONFIG_FAULT_INJECTION is not set 827# CONFIG_FAULT_INJECTION is not set
804# CONFIG_LATENCYTOP is not set 828# CONFIG_LATENCYTOP is not set
805CONFIG_SYSCTL_SYSCALL_CHECK=y 829CONFIG_SYSCTL_SYSCALL_CHECK=y
806CONFIG_NOP_TRACER=y 830CONFIG_HAVE_FUNCTION_TRACER=y
807CONFIG_HAVE_FTRACE=y
808CONFIG_HAVE_DYNAMIC_FTRACE=y 831CONFIG_HAVE_DYNAMIC_FTRACE=y
809# CONFIG_FTRACE is not set 832CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
833
834#
835# Tracers
836#
837# CONFIG_FUNCTION_TRACER is not set
810# CONFIG_SCHED_TRACER is not set 838# CONFIG_SCHED_TRACER is not set
811# CONFIG_CONTEXT_SWITCH_TRACER is not set 839# CONFIG_CONTEXT_SWITCH_TRACER is not set
812# CONFIG_BOOT_TRACER is not set 840# CONFIG_BOOT_TRACER is not set
841# CONFIG_TRACE_BRANCH_PROFILING is not set
813# CONFIG_STACK_TRACER is not set 842# CONFIG_STACK_TRACER is not set
814# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 843# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
815# CONFIG_SAMPLES is not set 844# CONFIG_SAMPLES is not set
816CONFIG_HAVE_ARCH_KGDB=y 845CONFIG_HAVE_ARCH_KGDB=y
817# CONFIG_KGDB is not set 846# CONFIG_KGDB is not set
847CONFIG_PRINT_STACK_DEPTH=64
818# CONFIG_DEBUG_STACKOVERFLOW is not set 848# CONFIG_DEBUG_STACKOVERFLOW is not set
819# CONFIG_DEBUG_STACK_USAGE is not set 849# CONFIG_DEBUG_STACK_USAGE is not set
820# CONFIG_DEBUG_PAGEALLOC is not set 850# CONFIG_DEBUG_PAGEALLOC is not set
@@ -841,11 +871,15 @@ CONFIG_CRYPTO=y
841# 871#
842# CONFIG_CRYPTO_FIPS is not set 872# CONFIG_CRYPTO_FIPS is not set
843CONFIG_CRYPTO_ALGAPI=y 873CONFIG_CRYPTO_ALGAPI=y
844CONFIG_CRYPTO_AEAD=y 874CONFIG_CRYPTO_ALGAPI2=y
875CONFIG_CRYPTO_AEAD2=y
845CONFIG_CRYPTO_BLKCIPHER=y 876CONFIG_CRYPTO_BLKCIPHER=y
877CONFIG_CRYPTO_BLKCIPHER2=y
846CONFIG_CRYPTO_HASH=y 878CONFIG_CRYPTO_HASH=y
847CONFIG_CRYPTO_RNG=y 879CONFIG_CRYPTO_HASH2=y
880CONFIG_CRYPTO_RNG2=y
848CONFIG_CRYPTO_MANAGER=y 881CONFIG_CRYPTO_MANAGER=y
882CONFIG_CRYPTO_MANAGER2=y
849# CONFIG_CRYPTO_GF128MUL is not set 883# CONFIG_CRYPTO_GF128MUL is not set
850# CONFIG_CRYPTO_NULL is not set 884# CONFIG_CRYPTO_NULL is not set
851# CONFIG_CRYPTO_CRYPTD is not set 885# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/canyonlands_defconfig b/arch/powerpc/configs/44x/canyonlands_defconfig
index 0694756ac759..81cdcc4b9278 100644
--- a/arch/powerpc/configs/44x/canyonlands_defconfig
+++ b/arch/powerpc/configs/44x/canyonlands_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:08 2008 4# Tue Jan 20 08:22:35 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,8 +76,8 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79# CONFIG_GROUP_SCHED is not set 79# CONFIG_GROUP_SCHED is not set
80# CONFIG_CGROUPS is not set
80CONFIG_SYSFS_DEPRECATED=y 81CONFIG_SYSFS_DEPRECATED=y
81CONFIG_SYSFS_DEPRECATED_V2=y 82CONFIG_SYSFS_DEPRECATED_V2=y
82# CONFIG_RELAY is not set 83# CONFIG_RELAY is not set
@@ -111,7 +112,6 @@ CONFIG_SLUB_DEBUG=y
111CONFIG_SLUB=y 112CONFIG_SLUB=y
112# CONFIG_SLOB is not set 113# CONFIG_SLOB is not set
113# CONFIG_PROFILING is not set 114# CONFIG_PROFILING is not set
114# CONFIG_MARKERS is not set
115CONFIG_HAVE_OPROFILE=y 115CONFIG_HAVE_OPROFILE=y
116# CONFIG_KPROBES is not set 116# CONFIG_KPROBES is not set
117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 117CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -122,7 +122,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 122# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
123CONFIG_SLABINFO=y 123CONFIG_SLABINFO=y
124CONFIG_RT_MUTEXES=y 124CONFIG_RT_MUTEXES=y
125# CONFIG_TINY_SHMEM is not set
126CONFIG_BASE_SMALL=0 125CONFIG_BASE_SMALL=0
127CONFIG_MODULES=y 126CONFIG_MODULES=y
128# CONFIG_MODULE_FORCE_LOAD is not set 127# CONFIG_MODULE_FORCE_LOAD is not set
@@ -130,11 +129,9 @@ CONFIG_MODULE_UNLOAD=y
130# CONFIG_MODULE_FORCE_UNLOAD is not set 129# CONFIG_MODULE_FORCE_UNLOAD is not set
131# CONFIG_MODVERSIONS is not set 130# CONFIG_MODVERSIONS is not set
132# CONFIG_MODULE_SRCVERSION_ALL is not set 131# CONFIG_MODULE_SRCVERSION_ALL is not set
133CONFIG_KMOD=y
134CONFIG_BLOCK=y 132CONFIG_BLOCK=y
135CONFIG_LBD=y 133CONFIG_LBD=y
136# CONFIG_BLK_DEV_IO_TRACE is not set 134# CONFIG_BLK_DEV_IO_TRACE is not set
137# CONFIG_LSF is not set
138# CONFIG_BLK_DEV_BSG is not set 135# CONFIG_BLK_DEV_BSG is not set
139# CONFIG_BLK_DEV_INTEGRITY is not set 136# CONFIG_BLK_DEV_INTEGRITY is not set
140 137
@@ -151,6 +148,10 @@ CONFIG_DEFAULT_AS=y
151# CONFIG_DEFAULT_NOOP is not set 148# CONFIG_DEFAULT_NOOP is not set
152CONFIG_DEFAULT_IOSCHED="anticipatory" 149CONFIG_DEFAULT_IOSCHED="anticipatory"
153CONFIG_CLASSIC_RCU=y 150CONFIG_CLASSIC_RCU=y
151# CONFIG_TREE_RCU is not set
152# CONFIG_PREEMPT_RCU is not set
153# CONFIG_TREE_RCU_TRACE is not set
154# CONFIG_PREEMPT_RCU_TRACE is not set
154# CONFIG_FREEZER is not set 155# CONFIG_FREEZER is not set
155CONFIG_PPC4xx_PCI_EXPRESS=y 156CONFIG_PPC4xx_PCI_EXPRESS=y
156 157
@@ -188,6 +189,7 @@ CONFIG_460EX=y
188# CONFIG_GENERIC_IOMAP is not set 189# CONFIG_GENERIC_IOMAP is not set
189# CONFIG_CPU_FREQ is not set 190# CONFIG_CPU_FREQ is not set
190# CONFIG_FSL_ULI1575 is not set 191# CONFIG_FSL_ULI1575 is not set
192# CONFIG_SIMPLE_GPIO is not set
191 193
192# 194#
193# Kernel options 195# Kernel options
@@ -212,6 +214,7 @@ CONFIG_BINFMT_ELF=y
212# CONFIG_BINFMT_MISC is not set 214# CONFIG_BINFMT_MISC is not set
213# CONFIG_MATH_EMULATION is not set 215# CONFIG_MATH_EMULATION is not set
214# CONFIG_IOMMU_HELPER is not set 216# CONFIG_IOMMU_HELPER is not set
217CONFIG_PPC_NEED_DMA_SYNC_OPS=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
216CONFIG_ARCH_HAS_WALK_MEMORY=y 219CONFIG_ARCH_HAS_WALK_MEMORY=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -226,12 +229,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
226CONFIG_PAGEFLAGS_EXTENDED=y 229CONFIG_PAGEFLAGS_EXTENDED=y
227CONFIG_SPLIT_PTLOCK_CPUS=4 230CONFIG_SPLIT_PTLOCK_CPUS=4
228CONFIG_MIGRATION=y 231CONFIG_MIGRATION=y
229CONFIG_RESOURCES_64BIT=y
230CONFIG_PHYS_ADDR_T_64BIT=y 232CONFIG_PHYS_ADDR_T_64BIT=y
231CONFIG_ZONE_DMA_FLAG=1 233CONFIG_ZONE_DMA_FLAG=1
232CONFIG_BOUNCE=y 234CONFIG_BOUNCE=y
233CONFIG_VIRT_TO_BUS=y 235CONFIG_VIRT_TO_BUS=y
234CONFIG_UNEVICTABLE_LRU=y 236CONFIG_UNEVICTABLE_LRU=y
237CONFIG_PPC_4K_PAGES=y
238# CONFIG_PPC_16K_PAGES is not set
239# CONFIG_PPC_64K_PAGES is not set
235CONFIG_FORCE_MAX_ZONEORDER=11 240CONFIG_FORCE_MAX_ZONEORDER=11
236CONFIG_PROC_DEVICETREE=y 241CONFIG_PROC_DEVICETREE=y
237CONFIG_CMDLINE_BOOL=y 242CONFIG_CMDLINE_BOOL=y
@@ -255,6 +260,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
255# CONFIG_PCI_MSI is not set 260# CONFIG_PCI_MSI is not set
256CONFIG_PCI_LEGACY=y 261CONFIG_PCI_LEGACY=y
257# CONFIG_PCI_DEBUG is not set 262# CONFIG_PCI_DEBUG is not set
263# CONFIG_PCI_STUB is not set
258# CONFIG_PCCARD is not set 264# CONFIG_PCCARD is not set
259# CONFIG_HOTPLUG_PCI is not set 265# CONFIG_HOTPLUG_PCI is not set
260# CONFIG_HAS_RAPIDIO is not set 266# CONFIG_HAS_RAPIDIO is not set
@@ -279,6 +285,7 @@ CONFIG_NET=y
279# 285#
280# Networking options 286# Networking options
281# 287#
288CONFIG_COMPAT_NET_DEV_OPS=y
282CONFIG_PACKET=y 289CONFIG_PACKET=y
283# CONFIG_PACKET_MMAP is not set 290# CONFIG_PACKET_MMAP is not set
284CONFIG_UNIX=y 291CONFIG_UNIX=y
@@ -329,6 +336,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
329# CONFIG_ECONET is not set 336# CONFIG_ECONET is not set
330# CONFIG_WAN_ROUTER is not set 337# CONFIG_WAN_ROUTER is not set
331# CONFIG_NET_SCHED is not set 338# CONFIG_NET_SCHED is not set
339# CONFIG_DCB is not set
332 340
333# 341#
334# Network testing 342# Network testing
@@ -341,6 +349,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
341# CONFIG_AF_RXRPC is not set 349# CONFIG_AF_RXRPC is not set
342# CONFIG_PHONET is not set 350# CONFIG_PHONET is not set
343# CONFIG_WIRELESS is not set 351# CONFIG_WIRELESS is not set
352# CONFIG_WIMAX is not set
344# CONFIG_RFKILL is not set 353# CONFIG_RFKILL is not set
345# CONFIG_NET_9P is not set 354# CONFIG_NET_9P is not set
346 355
@@ -453,6 +462,10 @@ CONFIG_IBM_NEW_EMAC_EMAC4=y
453# CONFIG_WLAN_PRE80211 is not set 462# CONFIG_WLAN_PRE80211 is not set
454# CONFIG_WLAN_80211 is not set 463# CONFIG_WLAN_80211 is not set
455# CONFIG_IWLWIFI_LEDS is not set 464# CONFIG_IWLWIFI_LEDS is not set
465
466#
467# Enable WiMAX (Networking options) to see the WiMAX drivers
468#
456# CONFIG_WAN is not set 469# CONFIG_WAN is not set
457# CONFIG_FDDI is not set 470# CONFIG_FDDI is not set
458# CONFIG_HIPPI is not set 471# CONFIG_HIPPI is not set
@@ -505,9 +518,12 @@ CONFIG_SERIAL_CORE=y
505CONFIG_SERIAL_CORE_CONSOLE=y 518CONFIG_SERIAL_CORE_CONSOLE=y
506# CONFIG_SERIAL_JSM is not set 519# CONFIG_SERIAL_JSM is not set
507CONFIG_SERIAL_OF_PLATFORM=y 520CONFIG_SERIAL_OF_PLATFORM=y
521# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
508CONFIG_UNIX98_PTYS=y 522CONFIG_UNIX98_PTYS=y
523# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
509CONFIG_LEGACY_PTYS=y 524CONFIG_LEGACY_PTYS=y
510CONFIG_LEGACY_PTY_COUNT=256 525CONFIG_LEGACY_PTY_COUNT=256
526# CONFIG_HVC_UDBG is not set
511# CONFIG_IPMI_HANDLER is not set 527# CONFIG_IPMI_HANDLER is not set
512# CONFIG_HW_RANDOM is not set 528# CONFIG_HW_RANDOM is not set
513# CONFIG_NVRAM is not set 529# CONFIG_NVRAM is not set
@@ -527,11 +543,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
527# CONFIG_THERMAL is not set 543# CONFIG_THERMAL is not set
528# CONFIG_THERMAL_HWMON is not set 544# CONFIG_THERMAL_HWMON is not set
529# CONFIG_WATCHDOG is not set 545# CONFIG_WATCHDOG is not set
546CONFIG_SSB_POSSIBLE=y
530 547
531# 548#
532# Sonics Silicon Backplane 549# Sonics Silicon Backplane
533# 550#
534CONFIG_SSB_POSSIBLE=y
535# CONFIG_SSB is not set 551# CONFIG_SSB is not set
536 552
537# 553#
@@ -541,7 +557,7 @@ CONFIG_SSB_POSSIBLE=y
541# CONFIG_MFD_SM501 is not set 557# CONFIG_MFD_SM501 is not set
542# CONFIG_HTC_PASIC3 is not set 558# CONFIG_HTC_PASIC3 is not set
543# CONFIG_MFD_TMIO is not set 559# CONFIG_MFD_TMIO is not set
544# CONFIG_MFD_WM8400 is not set 560# CONFIG_REGULATOR is not set
545 561
546# 562#
547# Multimedia devices 563# Multimedia devices
@@ -600,7 +616,9 @@ CONFIG_EXT2_FS=y
600# CONFIG_FS_POSIX_ACL is not set 616# CONFIG_FS_POSIX_ACL is not set
601CONFIG_FILE_LOCKING=y 617CONFIG_FILE_LOCKING=y
602# CONFIG_XFS_FS is not set 618# CONFIG_XFS_FS is not set
619# CONFIG_GFS2_FS is not set
603# CONFIG_OCFS2_FS is not set 620# CONFIG_OCFS2_FS is not set
621# CONFIG_BTRFS_FS is not set
604CONFIG_DNOTIFY=y 622CONFIG_DNOTIFY=y
605CONFIG_INOTIFY=y 623CONFIG_INOTIFY=y
606CONFIG_INOTIFY_USER=y 624CONFIG_INOTIFY_USER=y
@@ -634,10 +652,7 @@ CONFIG_TMPFS=y
634# CONFIG_TMPFS_POSIX_ACL is not set 652# CONFIG_TMPFS_POSIX_ACL is not set
635# CONFIG_HUGETLB_PAGE is not set 653# CONFIG_HUGETLB_PAGE is not set
636# CONFIG_CONFIGFS_FS is not set 654# CONFIG_CONFIGFS_FS is not set
637 655CONFIG_MISC_FILESYSTEMS=y
638#
639# Miscellaneous filesystems
640#
641# CONFIG_ADFS_FS is not set 656# CONFIG_ADFS_FS is not set
642# CONFIG_AFFS_FS is not set 657# CONFIG_AFFS_FS is not set
643# CONFIG_HFS_FS is not set 658# CONFIG_HFS_FS is not set
@@ -646,6 +661,7 @@ CONFIG_TMPFS=y
646# CONFIG_BFS_FS is not set 661# CONFIG_BFS_FS is not set
647# CONFIG_EFS_FS is not set 662# CONFIG_EFS_FS is not set
648CONFIG_CRAMFS=y 663CONFIG_CRAMFS=y
664# CONFIG_SQUASHFS is not set
649# CONFIG_VXFS_FS is not set 665# CONFIG_VXFS_FS is not set
650# CONFIG_MINIX_FS is not set 666# CONFIG_MINIX_FS is not set
651# CONFIG_OMFS_FS is not set 667# CONFIG_OMFS_FS is not set
@@ -686,6 +702,7 @@ CONFIG_MSDOS_PARTITION=y
686# Library routines 702# Library routines
687# 703#
688CONFIG_BITREVERSE=y 704CONFIG_BITREVERSE=y
705CONFIG_GENERIC_FIND_LAST_BIT=y
689# CONFIG_CRC_CCITT is not set 706# CONFIG_CRC_CCITT is not set
690# CONFIG_CRC16 is not set 707# CONFIG_CRC16 is not set
691# CONFIG_CRC_T10DIF is not set 708# CONFIG_CRC_T10DIF is not set
@@ -736,6 +753,7 @@ CONFIG_SCHED_DEBUG=y
736# CONFIG_DEBUG_MEMORY_INIT is not set 753# CONFIG_DEBUG_MEMORY_INIT is not set
737# CONFIG_DEBUG_LIST is not set 754# CONFIG_DEBUG_LIST is not set
738# CONFIG_DEBUG_SG is not set 755# CONFIG_DEBUG_SG is not set
756# CONFIG_DEBUG_NOTIFIERS is not set
739# CONFIG_BOOT_PRINTK_DELAY is not set 757# CONFIG_BOOT_PRINTK_DELAY is not set
740# CONFIG_RCU_TORTURE_TEST is not set 758# CONFIG_RCU_TORTURE_TEST is not set
741# CONFIG_RCU_CPU_STALL_DETECTOR is not set 759# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -744,18 +762,24 @@ CONFIG_SCHED_DEBUG=y
744# CONFIG_FAULT_INJECTION is not set 762# CONFIG_FAULT_INJECTION is not set
745# CONFIG_LATENCYTOP is not set 763# CONFIG_LATENCYTOP is not set
746CONFIG_SYSCTL_SYSCALL_CHECK=y 764CONFIG_SYSCTL_SYSCALL_CHECK=y
747CONFIG_NOP_TRACER=y 765CONFIG_HAVE_FUNCTION_TRACER=y
748CONFIG_HAVE_FTRACE=y
749CONFIG_HAVE_DYNAMIC_FTRACE=y 766CONFIG_HAVE_DYNAMIC_FTRACE=y
750# CONFIG_FTRACE is not set 767CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
768
769#
770# Tracers
771#
772# CONFIG_FUNCTION_TRACER is not set
751# CONFIG_SCHED_TRACER is not set 773# CONFIG_SCHED_TRACER is not set
752# CONFIG_CONTEXT_SWITCH_TRACER is not set 774# CONFIG_CONTEXT_SWITCH_TRACER is not set
753# CONFIG_BOOT_TRACER is not set 775# CONFIG_BOOT_TRACER is not set
776# CONFIG_TRACE_BRANCH_PROFILING is not set
754# CONFIG_STACK_TRACER is not set 777# CONFIG_STACK_TRACER is not set
755# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 778# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
756# CONFIG_SAMPLES is not set 779# CONFIG_SAMPLES is not set
757CONFIG_HAVE_ARCH_KGDB=y 780CONFIG_HAVE_ARCH_KGDB=y
758# CONFIG_KGDB is not set 781# CONFIG_KGDB is not set
782CONFIG_PRINT_STACK_DEPTH=64
759# CONFIG_DEBUG_STACKOVERFLOW is not set 783# CONFIG_DEBUG_STACKOVERFLOW is not set
760# CONFIG_DEBUG_STACK_USAGE is not set 784# CONFIG_DEBUG_STACK_USAGE is not set
761# CONFIG_DEBUG_PAGEALLOC is not set 785# CONFIG_DEBUG_PAGEALLOC is not set
diff --git a/arch/powerpc/configs/44x/ebony_defconfig b/arch/powerpc/configs/44x/ebony_defconfig
index c9937578ef7f..be64aa644d15 100644
--- a/arch/powerpc/configs/44x/ebony_defconfig
+++ b/arch/powerpc/configs/44x/ebony_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:09 2008 4# Tue Jan 20 08:22:36 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -43,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 44CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
49CONFIG_OF=y 50CONFIG_OF=y
@@ -74,12 +75,12 @@ CONFIG_POSIX_MQUEUE=y
74# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
75# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
79CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
80# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
83CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
85# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -92,6 +93,7 @@ CONFIG_EMBEDDED=y
92CONFIG_SYSCTL_SYSCALL=y 93CONFIG_SYSCTL_SYSCALL=y
93CONFIG_KALLSYMS=y 94CONFIG_KALLSYMS=y
94CONFIG_KALLSYMS_ALL=y 95CONFIG_KALLSYMS_ALL=y
96CONFIG_KALLSYMS_STRIP_GENERATED=y
95CONFIG_KALLSYMS_EXTRA_PASS=y 97CONFIG_KALLSYMS_EXTRA_PASS=y
96CONFIG_HOTPLUG=y 98CONFIG_HOTPLUG=y
97CONFIG_PRINTK=y 99CONFIG_PRINTK=y
@@ -114,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 116CONFIG_SLUB=y
115# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -125,7 +126,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
130CONFIG_MODULES=y 130CONFIG_MODULES=y
131# CONFIG_MODULE_FORCE_LOAD is not set 131# CONFIG_MODULE_FORCE_LOAD is not set
@@ -133,11 +133,9 @@ CONFIG_MODULE_UNLOAD=y
133# CONFIG_MODULE_FORCE_UNLOAD is not set 133# CONFIG_MODULE_FORCE_UNLOAD is not set
134# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
135# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
136CONFIG_KMOD=y
137CONFIG_BLOCK=y 136CONFIG_BLOCK=y
138CONFIG_LBD=y 137CONFIG_LBD=y
139# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
140# CONFIG_LSF is not set
141# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
142# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
143 141
@@ -154,6 +152,10 @@ CONFIG_DEFAULT_AS=y
154# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
155CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
156CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_TREE_RCU is not set
156# CONFIG_PREEMPT_RCU is not set
157# CONFIG_TREE_RCU_TRACE is not set
158# CONFIG_PREEMPT_RCU_TRACE is not set
157# CONFIG_FREEZER is not set 159# CONFIG_FREEZER is not set
158# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
159 161
@@ -192,6 +194,7 @@ CONFIG_440GP=y
192# CONFIG_CPU_FREQ is not set 194# CONFIG_CPU_FREQ is not set
193# CONFIG_FSL_ULI1575 is not set 195# CONFIG_FSL_ULI1575 is not set
194CONFIG_OF_RTC=y 196CONFIG_OF_RTC=y
197# CONFIG_SIMPLE_GPIO is not set
195 198
196# 199#
197# Kernel options 200# Kernel options
@@ -215,6 +218,7 @@ CONFIG_BINFMT_ELF=y
215# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
216CONFIG_MATH_EMULATION=y 219CONFIG_MATH_EMULATION=y
217# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
219CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -229,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
229CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
232CONFIG_RESOURCES_64BIT=y
233CONFIG_PHYS_ADDR_T_64BIT=y 236CONFIG_PHYS_ADDR_T_64BIT=y
234CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
237CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
238CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
239CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
240# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -257,6 +263,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 263# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 264CONFIG_PCI_LEGACY=y
259# CONFIG_PCI_DEBUG is not set 265# CONFIG_PCI_DEBUG is not set
266# CONFIG_PCI_STUB is not set
260# CONFIG_PCCARD is not set 267# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 268# CONFIG_HOTPLUG_PCI is not set
262# CONFIG_HAS_RAPIDIO is not set 269# CONFIG_HAS_RAPIDIO is not set
@@ -281,6 +288,7 @@ CONFIG_NET=y
281# 288#
282# Networking options 289# Networking options
283# 290#
291CONFIG_COMPAT_NET_DEV_OPS=y
284CONFIG_PACKET=y 292CONFIG_PACKET=y
285# CONFIG_PACKET_MMAP is not set 293# CONFIG_PACKET_MMAP is not set
286CONFIG_UNIX=y 294CONFIG_UNIX=y
@@ -331,6 +339,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_ECONET is not set 339# CONFIG_ECONET is not set
332# CONFIG_WAN_ROUTER is not set 340# CONFIG_WAN_ROUTER is not set
333# CONFIG_NET_SCHED is not set 341# CONFIG_NET_SCHED is not set
342# CONFIG_DCB is not set
334 343
335# 344#
336# Network testing 345# Network testing
@@ -343,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_AF_RXRPC is not set 352# CONFIG_AF_RXRPC is not set
344# CONFIG_PHONET is not set 353# CONFIG_PHONET is not set
345# CONFIG_WIRELESS is not set 354# CONFIG_WIRELESS is not set
355# CONFIG_WIMAX is not set
346# CONFIG_RFKILL is not set 356# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 357# CONFIG_NET_9P is not set
348 358
@@ -368,6 +378,7 @@ CONFIG_MTD=y
368# CONFIG_MTD_DEBUG is not set 378# CONFIG_MTD_DEBUG is not set
369# CONFIG_MTD_CONCAT is not set 379# CONFIG_MTD_CONCAT is not set
370CONFIG_MTD_PARTITIONS=y 380CONFIG_MTD_PARTITIONS=y
381# CONFIG_MTD_TESTS is not set
371# CONFIG_MTD_REDBOOT_PARTS is not set 382# CONFIG_MTD_REDBOOT_PARTS is not set
372# CONFIG_MTD_CMDLINE_PARTS is not set 383# CONFIG_MTD_CMDLINE_PARTS is not set
373CONFIG_MTD_OF_PARTS=y 384CONFIG_MTD_OF_PARTS=y
@@ -439,6 +450,12 @@ CONFIG_MTD_PHYSMAP_OF=y
439# CONFIG_MTD_ONENAND is not set 450# CONFIG_MTD_ONENAND is not set
440 451
441# 452#
453# LPDDR flash memory drivers
454#
455# CONFIG_MTD_LPDDR is not set
456# CONFIG_MTD_QINFO_PROBE is not set
457
458#
442# UBI - Unsorted block images 459# UBI - Unsorted block images
443# 460#
444# CONFIG_MTD_UBI is not set 461# CONFIG_MTD_UBI is not set
@@ -469,6 +486,7 @@ CONFIG_MISC_DEVICES=y
469# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
470# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
471# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
489# CONFIG_C2PORT is not set
472CONFIG_HAVE_IDE=y 490CONFIG_HAVE_IDE=y
473# CONFIG_IDE is not set 491# CONFIG_IDE is not set
474 492
@@ -551,6 +569,7 @@ CONFIG_NETDEV_1000=y
551# CONFIG_JME is not set 569# CONFIG_JME is not set
552CONFIG_NETDEV_10000=y 570CONFIG_NETDEV_10000=y
553# CONFIG_CHELSIO_T1 is not set 571# CONFIG_CHELSIO_T1 is not set
572CONFIG_CHELSIO_T3_DEPENDS=y
554# CONFIG_CHELSIO_T3 is not set 573# CONFIG_CHELSIO_T3 is not set
555# CONFIG_ENIC is not set 574# CONFIG_ENIC is not set
556# CONFIG_IXGBE is not set 575# CONFIG_IXGBE is not set
@@ -573,6 +592,10 @@ CONFIG_NETDEV_10000=y
573# CONFIG_WLAN_PRE80211 is not set 592# CONFIG_WLAN_PRE80211 is not set
574# CONFIG_WLAN_80211 is not set 593# CONFIG_WLAN_80211 is not set
575# CONFIG_IWLWIFI_LEDS is not set 594# CONFIG_IWLWIFI_LEDS is not set
595
596#
597# Enable WiMAX (Networking options) to see the WiMAX drivers
598#
576# CONFIG_WAN is not set 599# CONFIG_WAN is not set
577# CONFIG_FDDI is not set 600# CONFIG_FDDI is not set
578# CONFIG_HIPPI is not set 601# CONFIG_HIPPI is not set
@@ -625,9 +648,12 @@ CONFIG_SERIAL_CORE=y
625CONFIG_SERIAL_CORE_CONSOLE=y 648CONFIG_SERIAL_CORE_CONSOLE=y
626# CONFIG_SERIAL_JSM is not set 649# CONFIG_SERIAL_JSM is not set
627CONFIG_SERIAL_OF_PLATFORM=y 650CONFIG_SERIAL_OF_PLATFORM=y
651# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
628CONFIG_UNIX98_PTYS=y 652CONFIG_UNIX98_PTYS=y
653# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
629CONFIG_LEGACY_PTYS=y 654CONFIG_LEGACY_PTYS=y
630CONFIG_LEGACY_PTY_COUNT=256 655CONFIG_LEGACY_PTY_COUNT=256
656# CONFIG_HVC_UDBG is not set
631# CONFIG_IPMI_HANDLER is not set 657# CONFIG_IPMI_HANDLER is not set
632# CONFIG_HW_RANDOM is not set 658# CONFIG_HW_RANDOM is not set
633# CONFIG_NVRAM is not set 659# CONFIG_NVRAM is not set
@@ -646,11 +672,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
646# CONFIG_HWMON is not set 672# CONFIG_HWMON is not set
647CONFIG_THERMAL=y 673CONFIG_THERMAL=y
648# CONFIG_WATCHDOG is not set 674# CONFIG_WATCHDOG is not set
675CONFIG_SSB_POSSIBLE=y
649 676
650# 677#
651# Sonics Silicon Backplane 678# Sonics Silicon Backplane
652# 679#
653CONFIG_SSB_POSSIBLE=y
654# CONFIG_SSB is not set 680# CONFIG_SSB is not set
655 681
656# 682#
@@ -660,7 +686,7 @@ CONFIG_SSB_POSSIBLE=y
660# CONFIG_MFD_SM501 is not set 686# CONFIG_MFD_SM501 is not set
661# CONFIG_HTC_PASIC3 is not set 687# CONFIG_HTC_PASIC3 is not set
662# CONFIG_MFD_TMIO is not set 688# CONFIG_MFD_TMIO is not set
663# CONFIG_MFD_WM8400 is not set 689# CONFIG_REGULATOR is not set
664 690
665# 691#
666# Multimedia devices 692# Multimedia devices
@@ -706,9 +732,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
706# 732#
707 733
708# 734#
709# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 735# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
710# 736#
711# CONFIG_USB_GADGET is not set 737# CONFIG_USB_GADGET is not set
738
739#
740# OTG and related infrastructure
741#
712# CONFIG_UWB is not set 742# CONFIG_UWB is not set
713# CONFIG_MMC is not set 743# CONFIG_MMC is not set
714# CONFIG_MEMSTICK is not set 744# CONFIG_MEMSTICK is not set
@@ -734,7 +764,9 @@ CONFIG_EXT2_FS=y
734# CONFIG_FS_POSIX_ACL is not set 764# CONFIG_FS_POSIX_ACL is not set
735CONFIG_FILE_LOCKING=y 765CONFIG_FILE_LOCKING=y
736# CONFIG_XFS_FS is not set 766# CONFIG_XFS_FS is not set
767# CONFIG_GFS2_FS is not set
737# CONFIG_OCFS2_FS is not set 768# CONFIG_OCFS2_FS is not set
769# CONFIG_BTRFS_FS is not set
738CONFIG_DNOTIFY=y 770CONFIG_DNOTIFY=y
739CONFIG_INOTIFY=y 771CONFIG_INOTIFY=y
740CONFIG_INOTIFY_USER=y 772CONFIG_INOTIFY_USER=y
@@ -768,10 +800,7 @@ CONFIG_TMPFS=y
768# CONFIG_TMPFS_POSIX_ACL is not set 800# CONFIG_TMPFS_POSIX_ACL is not set
769# CONFIG_HUGETLB_PAGE is not set 801# CONFIG_HUGETLB_PAGE is not set
770# CONFIG_CONFIGFS_FS is not set 802# CONFIG_CONFIGFS_FS is not set
771 803CONFIG_MISC_FILESYSTEMS=y
772#
773# Miscellaneous filesystems
774#
775# CONFIG_ADFS_FS is not set 804# CONFIG_ADFS_FS is not set
776# CONFIG_AFFS_FS is not set 805# CONFIG_AFFS_FS is not set
777# CONFIG_HFS_FS is not set 806# CONFIG_HFS_FS is not set
@@ -791,6 +820,7 @@ CONFIG_JFFS2_ZLIB=y
791CONFIG_JFFS2_RTIME=y 820CONFIG_JFFS2_RTIME=y
792# CONFIG_JFFS2_RUBIN is not set 821# CONFIG_JFFS2_RUBIN is not set
793CONFIG_CRAMFS=y 822CONFIG_CRAMFS=y
823# CONFIG_SQUASHFS is not set
794# CONFIG_VXFS_FS is not set 824# CONFIG_VXFS_FS is not set
795# CONFIG_MINIX_FS is not set 825# CONFIG_MINIX_FS is not set
796# CONFIG_OMFS_FS is not set 826# CONFIG_OMFS_FS is not set
@@ -831,6 +861,7 @@ CONFIG_MSDOS_PARTITION=y
831# Library routines 861# Library routines
832# 862#
833CONFIG_BITREVERSE=y 863CONFIG_BITREVERSE=y
864CONFIG_GENERIC_FIND_LAST_BIT=y
834# CONFIG_CRC_CCITT is not set 865# CONFIG_CRC_CCITT is not set
835# CONFIG_CRC16 is not set 866# CONFIG_CRC16 is not set
836# CONFIG_CRC_T10DIF is not set 867# CONFIG_CRC_T10DIF is not set
@@ -882,6 +913,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
882# CONFIG_DEBUG_MEMORY_INIT is not set 913# CONFIG_DEBUG_MEMORY_INIT is not set
883# CONFIG_DEBUG_LIST is not set 914# CONFIG_DEBUG_LIST is not set
884# CONFIG_DEBUG_SG is not set 915# CONFIG_DEBUG_SG is not set
916# CONFIG_DEBUG_NOTIFIERS is not set
885# CONFIG_BOOT_PRINTK_DELAY is not set 917# CONFIG_BOOT_PRINTK_DELAY is not set
886# CONFIG_RCU_TORTURE_TEST is not set 918# CONFIG_RCU_TORTURE_TEST is not set
887# CONFIG_RCU_CPU_STALL_DETECTOR is not set 919# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -890,18 +922,24 @@ CONFIG_DEBUG_BUGVERBOSE=y
890# CONFIG_FAULT_INJECTION is not set 922# CONFIG_FAULT_INJECTION is not set
891# CONFIG_LATENCYTOP is not set 923# CONFIG_LATENCYTOP is not set
892CONFIG_SYSCTL_SYSCALL_CHECK=y 924CONFIG_SYSCTL_SYSCALL_CHECK=y
893CONFIG_NOP_TRACER=y 925CONFIG_HAVE_FUNCTION_TRACER=y
894CONFIG_HAVE_FTRACE=y
895CONFIG_HAVE_DYNAMIC_FTRACE=y 926CONFIG_HAVE_DYNAMIC_FTRACE=y
896# CONFIG_FTRACE is not set 927CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
928
929#
930# Tracers
931#
932# CONFIG_FUNCTION_TRACER is not set
897# CONFIG_SCHED_TRACER is not set 933# CONFIG_SCHED_TRACER is not set
898# CONFIG_CONTEXT_SWITCH_TRACER is not set 934# CONFIG_CONTEXT_SWITCH_TRACER is not set
899# CONFIG_BOOT_TRACER is not set 935# CONFIG_BOOT_TRACER is not set
936# CONFIG_TRACE_BRANCH_PROFILING is not set
900# CONFIG_STACK_TRACER is not set 937# CONFIG_STACK_TRACER is not set
901# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 938# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
902# CONFIG_SAMPLES is not set 939# CONFIG_SAMPLES is not set
903CONFIG_HAVE_ARCH_KGDB=y 940CONFIG_HAVE_ARCH_KGDB=y
904# CONFIG_KGDB is not set 941# CONFIG_KGDB is not set
942CONFIG_PRINT_STACK_DEPTH=64
905# CONFIG_DEBUG_STACKOVERFLOW is not set 943# CONFIG_DEBUG_STACKOVERFLOW is not set
906# CONFIG_DEBUG_STACK_USAGE is not set 944# CONFIG_DEBUG_STACK_USAGE is not set
907# CONFIG_DEBUG_PAGEALLOC is not set 945# CONFIG_DEBUG_PAGEALLOC is not set
@@ -928,11 +966,15 @@ CONFIG_CRYPTO=y
928# 966#
929# CONFIG_CRYPTO_FIPS is not set 967# CONFIG_CRYPTO_FIPS is not set
930CONFIG_CRYPTO_ALGAPI=y 968CONFIG_CRYPTO_ALGAPI=y
931CONFIG_CRYPTO_AEAD=y 969CONFIG_CRYPTO_ALGAPI2=y
970CONFIG_CRYPTO_AEAD2=y
932CONFIG_CRYPTO_BLKCIPHER=y 971CONFIG_CRYPTO_BLKCIPHER=y
972CONFIG_CRYPTO_BLKCIPHER2=y
933CONFIG_CRYPTO_HASH=y 973CONFIG_CRYPTO_HASH=y
934CONFIG_CRYPTO_RNG=y 974CONFIG_CRYPTO_HASH2=y
975CONFIG_CRYPTO_RNG2=y
935CONFIG_CRYPTO_MANAGER=y 976CONFIG_CRYPTO_MANAGER=y
977CONFIG_CRYPTO_MANAGER2=y
936# CONFIG_CRYPTO_GF128MUL is not set 978# CONFIG_CRYPTO_GF128MUL is not set
937# CONFIG_CRYPTO_NULL is not set 979# CONFIG_CRYPTO_NULL is not set
938# CONFIG_CRYPTO_CRYPTD is not set 980# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/katmai_defconfig b/arch/powerpc/configs/44x/katmai_defconfig
index e326ee8bd195..f67250b24ec5 100644
--- a/arch/powerpc/configs/44x/katmai_defconfig
+++ b/arch/powerpc/configs/44x/katmai_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:11 2008 4# Tue Jan 20 08:22:38 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -43,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 44CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
49CONFIG_OF=y 50CONFIG_OF=y
@@ -74,8 +75,8 @@ CONFIG_POSIX_MQUEUE=y
74# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
75# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78# CONFIG_GROUP_SCHED is not set 78# CONFIG_GROUP_SCHED is not set
79# CONFIG_CGROUPS is not set
79CONFIG_SYSFS_DEPRECATED=y 80CONFIG_SYSFS_DEPRECATED=y
80CONFIG_SYSFS_DEPRECATED_V2=y 81CONFIG_SYSFS_DEPRECATED_V2=y
81# CONFIG_RELAY is not set 82# CONFIG_RELAY is not set
@@ -110,7 +111,6 @@ CONFIG_SLUB_DEBUG=y
110CONFIG_SLUB=y 111CONFIG_SLUB=y
111# CONFIG_SLOB is not set 112# CONFIG_SLOB is not set
112# CONFIG_PROFILING is not set 113# CONFIG_PROFILING is not set
113# CONFIG_MARKERS is not set
114CONFIG_HAVE_OPROFILE=y 114CONFIG_HAVE_OPROFILE=y
115# CONFIG_KPROBES is not set 115# CONFIG_KPROBES is not set
116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 116CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -121,7 +121,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 121# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
122CONFIG_SLABINFO=y 122CONFIG_SLABINFO=y
123CONFIG_RT_MUTEXES=y 123CONFIG_RT_MUTEXES=y
124# CONFIG_TINY_SHMEM is not set
125CONFIG_BASE_SMALL=0 124CONFIG_BASE_SMALL=0
126CONFIG_MODULES=y 125CONFIG_MODULES=y
127# CONFIG_MODULE_FORCE_LOAD is not set 126# CONFIG_MODULE_FORCE_LOAD is not set
@@ -129,11 +128,9 @@ CONFIG_MODULE_UNLOAD=y
129# CONFIG_MODULE_FORCE_UNLOAD is not set 128# CONFIG_MODULE_FORCE_UNLOAD is not set
130# CONFIG_MODVERSIONS is not set 129# CONFIG_MODVERSIONS is not set
131# CONFIG_MODULE_SRCVERSION_ALL is not set 130# CONFIG_MODULE_SRCVERSION_ALL is not set
132CONFIG_KMOD=y
133CONFIG_BLOCK=y 131CONFIG_BLOCK=y
134CONFIG_LBD=y 132CONFIG_LBD=y
135# CONFIG_BLK_DEV_IO_TRACE is not set 133# CONFIG_BLK_DEV_IO_TRACE is not set
136# CONFIG_LSF is not set
137# CONFIG_BLK_DEV_BSG is not set 134# CONFIG_BLK_DEV_BSG is not set
138# CONFIG_BLK_DEV_INTEGRITY is not set 135# CONFIG_BLK_DEV_INTEGRITY is not set
139 136
@@ -150,6 +147,10 @@ CONFIG_DEFAULT_AS=y
150# CONFIG_DEFAULT_NOOP is not set 147# CONFIG_DEFAULT_NOOP is not set
151CONFIG_DEFAULT_IOSCHED="anticipatory" 148CONFIG_DEFAULT_IOSCHED="anticipatory"
152CONFIG_CLASSIC_RCU=y 149CONFIG_CLASSIC_RCU=y
150# CONFIG_TREE_RCU is not set
151# CONFIG_PREEMPT_RCU is not set
152# CONFIG_TREE_RCU_TRACE is not set
153# CONFIG_PREEMPT_RCU_TRACE is not set
153# CONFIG_FREEZER is not set 154# CONFIG_FREEZER is not set
154CONFIG_PPC4xx_PCI_EXPRESS=y 155CONFIG_PPC4xx_PCI_EXPRESS=y
155 156
@@ -187,6 +188,7 @@ CONFIG_440SPe=y
187# CONFIG_GENERIC_IOMAP is not set 188# CONFIG_GENERIC_IOMAP is not set
188# CONFIG_CPU_FREQ is not set 189# CONFIG_CPU_FREQ is not set
189# CONFIG_FSL_ULI1575 is not set 190# CONFIG_FSL_ULI1575 is not set
191# CONFIG_SIMPLE_GPIO is not set
190 192
191# 193#
192# Kernel options 194# Kernel options
@@ -210,6 +212,7 @@ CONFIG_BINFMT_ELF=y
210# CONFIG_BINFMT_MISC is not set 212# CONFIG_BINFMT_MISC is not set
211# CONFIG_MATH_EMULATION is not set 213# CONFIG_MATH_EMULATION is not set
212# CONFIG_IOMMU_HELPER is not set 214# CONFIG_IOMMU_HELPER is not set
215CONFIG_PPC_NEED_DMA_SYNC_OPS=y
213CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
214CONFIG_ARCH_HAS_WALK_MEMORY=y 217CONFIG_ARCH_HAS_WALK_MEMORY=y
215CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 218CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -224,12 +227,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
224CONFIG_PAGEFLAGS_EXTENDED=y 227CONFIG_PAGEFLAGS_EXTENDED=y
225CONFIG_SPLIT_PTLOCK_CPUS=4 228CONFIG_SPLIT_PTLOCK_CPUS=4
226CONFIG_MIGRATION=y 229CONFIG_MIGRATION=y
227CONFIG_RESOURCES_64BIT=y
228CONFIG_PHYS_ADDR_T_64BIT=y 230CONFIG_PHYS_ADDR_T_64BIT=y
229CONFIG_ZONE_DMA_FLAG=1 231CONFIG_ZONE_DMA_FLAG=1
230CONFIG_BOUNCE=y 232CONFIG_BOUNCE=y
231CONFIG_VIRT_TO_BUS=y 233CONFIG_VIRT_TO_BUS=y
232CONFIG_UNEVICTABLE_LRU=y 234CONFIG_UNEVICTABLE_LRU=y
235CONFIG_PPC_4K_PAGES=y
236# CONFIG_PPC_16K_PAGES is not set
237# CONFIG_PPC_64K_PAGES is not set
233CONFIG_FORCE_MAX_ZONEORDER=11 238CONFIG_FORCE_MAX_ZONEORDER=11
234CONFIG_PROC_DEVICETREE=y 239CONFIG_PROC_DEVICETREE=y
235CONFIG_CMDLINE_BOOL=y 240CONFIG_CMDLINE_BOOL=y
@@ -253,6 +258,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
253# CONFIG_PCI_MSI is not set 258# CONFIG_PCI_MSI is not set
254CONFIG_PCI_LEGACY=y 259CONFIG_PCI_LEGACY=y
255# CONFIG_PCI_DEBUG is not set 260# CONFIG_PCI_DEBUG is not set
261# CONFIG_PCI_STUB is not set
256# CONFIG_PCCARD is not set 262# CONFIG_PCCARD is not set
257# CONFIG_HOTPLUG_PCI is not set 263# CONFIG_HOTPLUG_PCI is not set
258# CONFIG_HAS_RAPIDIO is not set 264# CONFIG_HAS_RAPIDIO is not set
@@ -277,6 +283,7 @@ CONFIG_NET=y
277# 283#
278# Networking options 284# Networking options
279# 285#
286CONFIG_COMPAT_NET_DEV_OPS=y
280CONFIG_PACKET=y 287CONFIG_PACKET=y
281# CONFIG_PACKET_MMAP is not set 288# CONFIG_PACKET_MMAP is not set
282CONFIG_UNIX=y 289CONFIG_UNIX=y
@@ -327,6 +334,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
327# CONFIG_ECONET is not set 334# CONFIG_ECONET is not set
328# CONFIG_WAN_ROUTER is not set 335# CONFIG_WAN_ROUTER is not set
329# CONFIG_NET_SCHED is not set 336# CONFIG_NET_SCHED is not set
337# CONFIG_DCB is not set
330 338
331# 339#
332# Network testing 340# Network testing
@@ -339,6 +347,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
339# CONFIG_AF_RXRPC is not set 347# CONFIG_AF_RXRPC is not set
340# CONFIG_PHONET is not set 348# CONFIG_PHONET is not set
341# CONFIG_WIRELESS is not set 349# CONFIG_WIRELESS is not set
350# CONFIG_WIMAX is not set
342# CONFIG_RFKILL is not set 351# CONFIG_RFKILL is not set
343# CONFIG_NET_9P is not set 352# CONFIG_NET_9P is not set
344 353
@@ -388,6 +397,7 @@ CONFIG_MISC_DEVICES=y
388# CONFIG_TIFM_CORE is not set 397# CONFIG_TIFM_CORE is not set
389# CONFIG_ENCLOSURE_SERVICES is not set 398# CONFIG_ENCLOSURE_SERVICES is not set
390# CONFIG_HP_ILO is not set 399# CONFIG_HP_ILO is not set
400# CONFIG_C2PORT is not set
391CONFIG_HAVE_IDE=y 401CONFIG_HAVE_IDE=y
392# CONFIG_IDE is not set 402# CONFIG_IDE is not set
393 403
@@ -472,6 +482,7 @@ CONFIG_NETDEV_1000=y
472# CONFIG_JME is not set 482# CONFIG_JME is not set
473CONFIG_NETDEV_10000=y 483CONFIG_NETDEV_10000=y
474# CONFIG_CHELSIO_T1 is not set 484# CONFIG_CHELSIO_T1 is not set
485CONFIG_CHELSIO_T3_DEPENDS=y
475# CONFIG_CHELSIO_T3 is not set 486# CONFIG_CHELSIO_T3 is not set
476# CONFIG_ENIC is not set 487# CONFIG_ENIC is not set
477# CONFIG_IXGBE is not set 488# CONFIG_IXGBE is not set
@@ -494,6 +505,10 @@ CONFIG_NETDEV_10000=y
494# CONFIG_WLAN_PRE80211 is not set 505# CONFIG_WLAN_PRE80211 is not set
495# CONFIG_WLAN_80211 is not set 506# CONFIG_WLAN_80211 is not set
496# CONFIG_IWLWIFI_LEDS is not set 507# CONFIG_IWLWIFI_LEDS is not set
508
509#
510# Enable WiMAX (Networking options) to see the WiMAX drivers
511#
497# CONFIG_WAN is not set 512# CONFIG_WAN is not set
498# CONFIG_FDDI is not set 513# CONFIG_FDDI is not set
499# CONFIG_HIPPI is not set 514# CONFIG_HIPPI is not set
@@ -546,9 +561,12 @@ CONFIG_SERIAL_CORE=y
546CONFIG_SERIAL_CORE_CONSOLE=y 561CONFIG_SERIAL_CORE_CONSOLE=y
547# CONFIG_SERIAL_JSM is not set 562# CONFIG_SERIAL_JSM is not set
548CONFIG_SERIAL_OF_PLATFORM=y 563CONFIG_SERIAL_OF_PLATFORM=y
564# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
549CONFIG_UNIX98_PTYS=y 565CONFIG_UNIX98_PTYS=y
566# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
550CONFIG_LEGACY_PTYS=y 567CONFIG_LEGACY_PTYS=y
551CONFIG_LEGACY_PTY_COUNT=256 568CONFIG_LEGACY_PTY_COUNT=256
569# CONFIG_HVC_UDBG is not set
552# CONFIG_IPMI_HANDLER is not set 570# CONFIG_IPMI_HANDLER is not set
553# CONFIG_HW_RANDOM is not set 571# CONFIG_HW_RANDOM is not set
554# CONFIG_NVRAM is not set 572# CONFIG_NVRAM is not set
@@ -568,11 +586,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
568# CONFIG_THERMAL is not set 586# CONFIG_THERMAL is not set
569# CONFIG_THERMAL_HWMON is not set 587# CONFIG_THERMAL_HWMON is not set
570# CONFIG_WATCHDOG is not set 588# CONFIG_WATCHDOG is not set
589CONFIG_SSB_POSSIBLE=y
571 590
572# 591#
573# Sonics Silicon Backplane 592# Sonics Silicon Backplane
574# 593#
575CONFIG_SSB_POSSIBLE=y
576# CONFIG_SSB is not set 594# CONFIG_SSB is not set
577 595
578# 596#
@@ -582,7 +600,7 @@ CONFIG_SSB_POSSIBLE=y
582# CONFIG_MFD_SM501 is not set 600# CONFIG_MFD_SM501 is not set
583# CONFIG_HTC_PASIC3 is not set 601# CONFIG_HTC_PASIC3 is not set
584# CONFIG_MFD_TMIO is not set 602# CONFIG_MFD_TMIO is not set
585# CONFIG_MFD_WM8400 is not set 603# CONFIG_REGULATOR is not set
586 604
587# 605#
588# Multimedia devices 606# Multimedia devices
@@ -628,9 +646,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
628# 646#
629 647
630# 648#
631# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 649# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
632# 650#
633# CONFIG_USB_GADGET is not set 651# CONFIG_USB_GADGET is not set
652
653#
654# OTG and related infrastructure
655#
634# CONFIG_UWB is not set 656# CONFIG_UWB is not set
635# CONFIG_MMC is not set 657# CONFIG_MMC is not set
636# CONFIG_MEMSTICK is not set 658# CONFIG_MEMSTICK is not set
@@ -656,7 +678,9 @@ CONFIG_EXT2_FS=y
656# CONFIG_FS_POSIX_ACL is not set 678# CONFIG_FS_POSIX_ACL is not set
657CONFIG_FILE_LOCKING=y 679CONFIG_FILE_LOCKING=y
658# CONFIG_XFS_FS is not set 680# CONFIG_XFS_FS is not set
681# CONFIG_GFS2_FS is not set
659# CONFIG_OCFS2_FS is not set 682# CONFIG_OCFS2_FS is not set
683# CONFIG_BTRFS_FS is not set
660CONFIG_DNOTIFY=y 684CONFIG_DNOTIFY=y
661CONFIG_INOTIFY=y 685CONFIG_INOTIFY=y
662CONFIG_INOTIFY_USER=y 686CONFIG_INOTIFY_USER=y
@@ -690,10 +714,7 @@ CONFIG_TMPFS=y
690# CONFIG_TMPFS_POSIX_ACL is not set 714# CONFIG_TMPFS_POSIX_ACL is not set
691# CONFIG_HUGETLB_PAGE is not set 715# CONFIG_HUGETLB_PAGE is not set
692# CONFIG_CONFIGFS_FS is not set 716# CONFIG_CONFIGFS_FS is not set
693 717CONFIG_MISC_FILESYSTEMS=y
694#
695# Miscellaneous filesystems
696#
697# CONFIG_ADFS_FS is not set 718# CONFIG_ADFS_FS is not set
698# CONFIG_AFFS_FS is not set 719# CONFIG_AFFS_FS is not set
699# CONFIG_HFS_FS is not set 720# CONFIG_HFS_FS is not set
@@ -702,6 +723,7 @@ CONFIG_TMPFS=y
702# CONFIG_BFS_FS is not set 723# CONFIG_BFS_FS is not set
703# CONFIG_EFS_FS is not set 724# CONFIG_EFS_FS is not set
704CONFIG_CRAMFS=y 725CONFIG_CRAMFS=y
726# CONFIG_SQUASHFS is not set
705# CONFIG_VXFS_FS is not set 727# CONFIG_VXFS_FS is not set
706# CONFIG_MINIX_FS is not set 728# CONFIG_MINIX_FS is not set
707# CONFIG_OMFS_FS is not set 729# CONFIG_OMFS_FS is not set
@@ -742,6 +764,7 @@ CONFIG_MSDOS_PARTITION=y
742# Library routines 764# Library routines
743# 765#
744CONFIG_BITREVERSE=y 766CONFIG_BITREVERSE=y
767CONFIG_GENERIC_FIND_LAST_BIT=y
745# CONFIG_CRC_CCITT is not set 768# CONFIG_CRC_CCITT is not set
746# CONFIG_CRC16 is not set 769# CONFIG_CRC16 is not set
747# CONFIG_CRC_T10DIF is not set 770# CONFIG_CRC_T10DIF is not set
@@ -792,6 +815,7 @@ CONFIG_SCHED_DEBUG=y
792# CONFIG_DEBUG_MEMORY_INIT is not set 815# CONFIG_DEBUG_MEMORY_INIT is not set
793# CONFIG_DEBUG_LIST is not set 816# CONFIG_DEBUG_LIST is not set
794# CONFIG_DEBUG_SG is not set 817# CONFIG_DEBUG_SG is not set
818# CONFIG_DEBUG_NOTIFIERS is not set
795# CONFIG_BOOT_PRINTK_DELAY is not set 819# CONFIG_BOOT_PRINTK_DELAY is not set
796# CONFIG_RCU_TORTURE_TEST is not set 820# CONFIG_RCU_TORTURE_TEST is not set
797# CONFIG_RCU_CPU_STALL_DETECTOR is not set 821# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -800,18 +824,24 @@ CONFIG_SCHED_DEBUG=y
800# CONFIG_FAULT_INJECTION is not set 824# CONFIG_FAULT_INJECTION is not set
801# CONFIG_LATENCYTOP is not set 825# CONFIG_LATENCYTOP is not set
802CONFIG_SYSCTL_SYSCALL_CHECK=y 826CONFIG_SYSCTL_SYSCALL_CHECK=y
803CONFIG_NOP_TRACER=y 827CONFIG_HAVE_FUNCTION_TRACER=y
804CONFIG_HAVE_FTRACE=y
805CONFIG_HAVE_DYNAMIC_FTRACE=y 828CONFIG_HAVE_DYNAMIC_FTRACE=y
806# CONFIG_FTRACE is not set 829CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
830
831#
832# Tracers
833#
834# CONFIG_FUNCTION_TRACER is not set
807# CONFIG_SCHED_TRACER is not set 835# CONFIG_SCHED_TRACER is not set
808# CONFIG_CONTEXT_SWITCH_TRACER is not set 836# CONFIG_CONTEXT_SWITCH_TRACER is not set
809# CONFIG_BOOT_TRACER is not set 837# CONFIG_BOOT_TRACER is not set
838# CONFIG_TRACE_BRANCH_PROFILING is not set
810# CONFIG_STACK_TRACER is not set 839# CONFIG_STACK_TRACER is not set
811# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 840# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
812# CONFIG_SAMPLES is not set 841# CONFIG_SAMPLES is not set
813CONFIG_HAVE_ARCH_KGDB=y 842CONFIG_HAVE_ARCH_KGDB=y
814# CONFIG_KGDB is not set 843# CONFIG_KGDB is not set
844CONFIG_PRINT_STACK_DEPTH=64
815# CONFIG_DEBUG_STACKOVERFLOW is not set 845# CONFIG_DEBUG_STACKOVERFLOW is not set
816# CONFIG_DEBUG_STACK_USAGE is not set 846# CONFIG_DEBUG_STACK_USAGE is not set
817# CONFIG_DEBUG_PAGEALLOC is not set 847# CONFIG_DEBUG_PAGEALLOC is not set
@@ -837,11 +867,15 @@ CONFIG_CRYPTO=y
837# 867#
838# CONFIG_CRYPTO_FIPS is not set 868# CONFIG_CRYPTO_FIPS is not set
839CONFIG_CRYPTO_ALGAPI=y 869CONFIG_CRYPTO_ALGAPI=y
840CONFIG_CRYPTO_AEAD=y 870CONFIG_CRYPTO_ALGAPI2=y
871CONFIG_CRYPTO_AEAD2=y
841CONFIG_CRYPTO_BLKCIPHER=y 872CONFIG_CRYPTO_BLKCIPHER=y
873CONFIG_CRYPTO_BLKCIPHER2=y
842CONFIG_CRYPTO_HASH=y 874CONFIG_CRYPTO_HASH=y
843CONFIG_CRYPTO_RNG=y 875CONFIG_CRYPTO_HASH2=y
876CONFIG_CRYPTO_RNG2=y
844CONFIG_CRYPTO_MANAGER=y 877CONFIG_CRYPTO_MANAGER=y
878CONFIG_CRYPTO_MANAGER2=y
845# CONFIG_CRYPTO_GF128MUL is not set 879# CONFIG_CRYPTO_GF128MUL is not set
846# CONFIG_CRYPTO_NULL is not set 880# CONFIG_CRYPTO_NULL is not set
847# CONFIG_CRYPTO_CRYPTD is not set 881# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/rainier_defconfig b/arch/powerpc/configs/44x/rainier_defconfig
index 927f829e2087..9348c12bd7a6 100644
--- a/arch/powerpc/configs/44x/rainier_defconfig
+++ b/arch/powerpc/configs/44x/rainier_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:13 2008 4# Tue Jan 20 08:22:41 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -43,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 44CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
49CONFIG_OF=y 50CONFIG_OF=y
@@ -74,12 +75,12 @@ CONFIG_POSIX_MQUEUE=y
74# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
75# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
79CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
80# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
83CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
85# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -114,7 +115,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 115CONFIG_SLUB=y
115# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -125,7 +125,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
130CONFIG_MODULES=y 129CONFIG_MODULES=y
131# CONFIG_MODULE_FORCE_LOAD is not set 130# CONFIG_MODULE_FORCE_LOAD is not set
@@ -133,11 +132,9 @@ CONFIG_MODULE_UNLOAD=y
133# CONFIG_MODULE_FORCE_UNLOAD is not set 132# CONFIG_MODULE_FORCE_UNLOAD is not set
134# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
135# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
136CONFIG_KMOD=y
137CONFIG_BLOCK=y 135CONFIG_BLOCK=y
138CONFIG_LBD=y 136CONFIG_LBD=y
139# CONFIG_BLK_DEV_IO_TRACE is not set 137# CONFIG_BLK_DEV_IO_TRACE is not set
140# CONFIG_LSF is not set
141# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
142# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
143 140
@@ -154,6 +151,10 @@ CONFIG_DEFAULT_AS=y
154# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
155CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
156CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_TREE_RCU is not set
155# CONFIG_PREEMPT_RCU is not set
156# CONFIG_TREE_RCU_TRACE is not set
157# CONFIG_PREEMPT_RCU_TRACE is not set
157# CONFIG_FREEZER is not set 158# CONFIG_FREEZER is not set
158# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
159 160
@@ -191,6 +192,7 @@ CONFIG_440GRX=y
191# CONFIG_GENERIC_IOMAP is not set 192# CONFIG_GENERIC_IOMAP is not set
192# CONFIG_CPU_FREQ is not set 193# CONFIG_CPU_FREQ is not set
193# CONFIG_FSL_ULI1575 is not set 194# CONFIG_FSL_ULI1575 is not set
195# CONFIG_SIMPLE_GPIO is not set
194 196
195# 197#
196# Kernel options 198# Kernel options
@@ -214,6 +216,7 @@ CONFIG_BINFMT_ELF=y
214# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
215CONFIG_MATH_EMULATION=y 217CONFIG_MATH_EMULATION=y
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
219CONFIG_PPC_NEED_DMA_SYNC_OPS=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
218CONFIG_ARCH_HAS_WALK_MEMORY=y 221CONFIG_ARCH_HAS_WALK_MEMORY=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -228,12 +231,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
228CONFIG_PAGEFLAGS_EXTENDED=y 231CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 232CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 233CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y
232CONFIG_PHYS_ADDR_T_64BIT=y 234CONFIG_PHYS_ADDR_T_64BIT=y
233CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y 238CONFIG_UNEVICTABLE_LRU=y
239CONFIG_PPC_4K_PAGES=y
240# CONFIG_PPC_16K_PAGES is not set
241# CONFIG_PPC_64K_PAGES is not set
237CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 243CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 244CONFIG_CMDLINE_BOOL=y
@@ -257,6 +262,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 263CONFIG_PCI_LEGACY=y
259# CONFIG_PCI_DEBUG is not set 264# CONFIG_PCI_DEBUG is not set
265# CONFIG_PCI_STUB is not set
260# CONFIG_PCCARD is not set 266# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 267# CONFIG_HOTPLUG_PCI is not set
262# CONFIG_HAS_RAPIDIO is not set 268# CONFIG_HAS_RAPIDIO is not set
@@ -281,6 +287,7 @@ CONFIG_NET=y
281# 287#
282# Networking options 288# Networking options
283# 289#
290CONFIG_COMPAT_NET_DEV_OPS=y
284CONFIG_PACKET=y 291CONFIG_PACKET=y
285# CONFIG_PACKET_MMAP is not set 292# CONFIG_PACKET_MMAP is not set
286CONFIG_UNIX=y 293CONFIG_UNIX=y
@@ -331,6 +338,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_ECONET is not set 338# CONFIG_ECONET is not set
332# CONFIG_WAN_ROUTER is not set 339# CONFIG_WAN_ROUTER is not set
333# CONFIG_NET_SCHED is not set 340# CONFIG_NET_SCHED is not set
341# CONFIG_DCB is not set
334 342
335# 343#
336# Network testing 344# Network testing
@@ -343,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_AF_RXRPC is not set 351# CONFIG_AF_RXRPC is not set
344# CONFIG_PHONET is not set 352# CONFIG_PHONET is not set
345# CONFIG_WIRELESS is not set 353# CONFIG_WIRELESS is not set
354# CONFIG_WIMAX is not set
346# CONFIG_RFKILL is not set 355# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 356# CONFIG_NET_9P is not set
348 357
@@ -368,6 +377,7 @@ CONFIG_MTD=y
368# CONFIG_MTD_DEBUG is not set 377# CONFIG_MTD_DEBUG is not set
369# CONFIG_MTD_CONCAT is not set 378# CONFIG_MTD_CONCAT is not set
370CONFIG_MTD_PARTITIONS=y 379CONFIG_MTD_PARTITIONS=y
380# CONFIG_MTD_TESTS is not set
371# CONFIG_MTD_REDBOOT_PARTS is not set 381# CONFIG_MTD_REDBOOT_PARTS is not set
372CONFIG_MTD_CMDLINE_PARTS=y 382CONFIG_MTD_CMDLINE_PARTS=y
373CONFIG_MTD_OF_PARTS=y 383CONFIG_MTD_OF_PARTS=y
@@ -440,6 +450,12 @@ CONFIG_MTD_PHYSMAP_OF=y
440# CONFIG_MTD_ONENAND is not set 450# CONFIG_MTD_ONENAND is not set
441 451
442# 452#
453# LPDDR flash memory drivers
454#
455# CONFIG_MTD_LPDDR is not set
456# CONFIG_MTD_QINFO_PROBE is not set
457
458#
443# UBI - Unsorted block images 459# UBI - Unsorted block images
444# 460#
445# CONFIG_MTD_UBI is not set 461# CONFIG_MTD_UBI is not set
@@ -470,6 +486,7 @@ CONFIG_MISC_DEVICES=y
470# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
489# CONFIG_C2PORT is not set
473CONFIG_HAVE_IDE=y 490CONFIG_HAVE_IDE=y
474# CONFIG_IDE is not set 491# CONFIG_IDE is not set
475 492
@@ -532,6 +549,7 @@ CONFIG_NETDEV_1000=y
532# CONFIG_JME is not set 549# CONFIG_JME is not set
533CONFIG_NETDEV_10000=y 550CONFIG_NETDEV_10000=y
534# CONFIG_CHELSIO_T1 is not set 551# CONFIG_CHELSIO_T1 is not set
552CONFIG_CHELSIO_T3_DEPENDS=y
535# CONFIG_CHELSIO_T3 is not set 553# CONFIG_CHELSIO_T3 is not set
536# CONFIG_ENIC is not set 554# CONFIG_ENIC is not set
537# CONFIG_IXGBE is not set 555# CONFIG_IXGBE is not set
@@ -554,6 +572,10 @@ CONFIG_NETDEV_10000=y
554# CONFIG_WLAN_PRE80211 is not set 572# CONFIG_WLAN_PRE80211 is not set
555# CONFIG_WLAN_80211 is not set 573# CONFIG_WLAN_80211 is not set
556# CONFIG_IWLWIFI_LEDS is not set 574# CONFIG_IWLWIFI_LEDS is not set
575
576#
577# Enable WiMAX (Networking options) to see the WiMAX drivers
578#
557# CONFIG_WAN is not set 579# CONFIG_WAN is not set
558# CONFIG_FDDI is not set 580# CONFIG_FDDI is not set
559# CONFIG_HIPPI is not set 581# CONFIG_HIPPI is not set
@@ -606,9 +628,12 @@ CONFIG_SERIAL_CORE=y
606CONFIG_SERIAL_CORE_CONSOLE=y 628CONFIG_SERIAL_CORE_CONSOLE=y
607# CONFIG_SERIAL_JSM is not set 629# CONFIG_SERIAL_JSM is not set
608CONFIG_SERIAL_OF_PLATFORM=y 630CONFIG_SERIAL_OF_PLATFORM=y
631# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
609CONFIG_UNIX98_PTYS=y 632CONFIG_UNIX98_PTYS=y
633# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
610CONFIG_LEGACY_PTYS=y 634CONFIG_LEGACY_PTYS=y
611CONFIG_LEGACY_PTY_COUNT=256 635CONFIG_LEGACY_PTY_COUNT=256
636# CONFIG_HVC_UDBG is not set
612# CONFIG_IPMI_HANDLER is not set 637# CONFIG_IPMI_HANDLER is not set
613# CONFIG_HW_RANDOM is not set 638# CONFIG_HW_RANDOM is not set
614# CONFIG_NVRAM is not set 639# CONFIG_NVRAM is not set
@@ -627,11 +652,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
627# CONFIG_HWMON is not set 652# CONFIG_HWMON is not set
628CONFIG_THERMAL=y 653CONFIG_THERMAL=y
629# CONFIG_WATCHDOG is not set 654# CONFIG_WATCHDOG is not set
655CONFIG_SSB_POSSIBLE=y
630 656
631# 657#
632# Sonics Silicon Backplane 658# Sonics Silicon Backplane
633# 659#
634CONFIG_SSB_POSSIBLE=y
635# CONFIG_SSB is not set 660# CONFIG_SSB is not set
636 661
637# 662#
@@ -641,7 +666,7 @@ CONFIG_SSB_POSSIBLE=y
641# CONFIG_MFD_SM501 is not set 666# CONFIG_MFD_SM501 is not set
642# CONFIG_HTC_PASIC3 is not set 667# CONFIG_HTC_PASIC3 is not set
643# CONFIG_MFD_TMIO is not set 668# CONFIG_MFD_TMIO is not set
644# CONFIG_MFD_WM8400 is not set 669# CONFIG_REGULATOR is not set
645 670
646# 671#
647# Multimedia devices 672# Multimedia devices
@@ -687,9 +712,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
687# 712#
688 713
689# 714#
690# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 715# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
691# 716#
692# CONFIG_USB_GADGET is not set 717# CONFIG_USB_GADGET is not set
718
719#
720# OTG and related infrastructure
721#
693# CONFIG_UWB is not set 722# CONFIG_UWB is not set
694# CONFIG_MMC is not set 723# CONFIG_MMC is not set
695# CONFIG_MEMSTICK is not set 724# CONFIG_MEMSTICK is not set
@@ -715,7 +744,9 @@ CONFIG_EXT2_FS=y
715# CONFIG_FS_POSIX_ACL is not set 744# CONFIG_FS_POSIX_ACL is not set
716CONFIG_FILE_LOCKING=y 745CONFIG_FILE_LOCKING=y
717# CONFIG_XFS_FS is not set 746# CONFIG_XFS_FS is not set
747# CONFIG_GFS2_FS is not set
718# CONFIG_OCFS2_FS is not set 748# CONFIG_OCFS2_FS is not set
749# CONFIG_BTRFS_FS is not set
719CONFIG_DNOTIFY=y 750CONFIG_DNOTIFY=y
720CONFIG_INOTIFY=y 751CONFIG_INOTIFY=y
721CONFIG_INOTIFY_USER=y 752CONFIG_INOTIFY_USER=y
@@ -749,10 +780,7 @@ CONFIG_TMPFS=y
749# CONFIG_TMPFS_POSIX_ACL is not set 780# CONFIG_TMPFS_POSIX_ACL is not set
750# CONFIG_HUGETLB_PAGE is not set 781# CONFIG_HUGETLB_PAGE is not set
751# CONFIG_CONFIGFS_FS is not set 782# CONFIG_CONFIGFS_FS is not set
752 783CONFIG_MISC_FILESYSTEMS=y
753#
754# Miscellaneous filesystems
755#
756# CONFIG_ADFS_FS is not set 784# CONFIG_ADFS_FS is not set
757# CONFIG_AFFS_FS is not set 785# CONFIG_AFFS_FS is not set
758# CONFIG_HFS_FS is not set 786# CONFIG_HFS_FS is not set
@@ -772,6 +800,7 @@ CONFIG_JFFS2_ZLIB=y
772CONFIG_JFFS2_RTIME=y 800CONFIG_JFFS2_RTIME=y
773# CONFIG_JFFS2_RUBIN is not set 801# CONFIG_JFFS2_RUBIN is not set
774CONFIG_CRAMFS=y 802CONFIG_CRAMFS=y
803# CONFIG_SQUASHFS is not set
775# CONFIG_VXFS_FS is not set 804# CONFIG_VXFS_FS is not set
776# CONFIG_MINIX_FS is not set 805# CONFIG_MINIX_FS is not set
777# CONFIG_OMFS_FS is not set 806# CONFIG_OMFS_FS is not set
@@ -812,6 +841,7 @@ CONFIG_MSDOS_PARTITION=y
812# Library routines 841# Library routines
813# 842#
814CONFIG_BITREVERSE=y 843CONFIG_BITREVERSE=y
844CONFIG_GENERIC_FIND_LAST_BIT=y
815# CONFIG_CRC_CCITT is not set 845# CONFIG_CRC_CCITT is not set
816# CONFIG_CRC16 is not set 846# CONFIG_CRC16 is not set
817# CONFIG_CRC_T10DIF is not set 847# CONFIG_CRC_T10DIF is not set
@@ -863,6 +893,7 @@ CONFIG_SCHED_DEBUG=y
863# CONFIG_DEBUG_MEMORY_INIT is not set 893# CONFIG_DEBUG_MEMORY_INIT is not set
864# CONFIG_DEBUG_LIST is not set 894# CONFIG_DEBUG_LIST is not set
865# CONFIG_DEBUG_SG is not set 895# CONFIG_DEBUG_SG is not set
896# CONFIG_DEBUG_NOTIFIERS is not set
866# CONFIG_BOOT_PRINTK_DELAY is not set 897# CONFIG_BOOT_PRINTK_DELAY is not set
867# CONFIG_RCU_TORTURE_TEST is not set 898# CONFIG_RCU_TORTURE_TEST is not set
868# CONFIG_RCU_CPU_STALL_DETECTOR is not set 899# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -871,18 +902,24 @@ CONFIG_SCHED_DEBUG=y
871# CONFIG_FAULT_INJECTION is not set 902# CONFIG_FAULT_INJECTION is not set
872# CONFIG_LATENCYTOP is not set 903# CONFIG_LATENCYTOP is not set
873CONFIG_SYSCTL_SYSCALL_CHECK=y 904CONFIG_SYSCTL_SYSCALL_CHECK=y
874CONFIG_NOP_TRACER=y 905CONFIG_HAVE_FUNCTION_TRACER=y
875CONFIG_HAVE_FTRACE=y
876CONFIG_HAVE_DYNAMIC_FTRACE=y 906CONFIG_HAVE_DYNAMIC_FTRACE=y
877# CONFIG_FTRACE is not set 907CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
908
909#
910# Tracers
911#
912# CONFIG_FUNCTION_TRACER is not set
878# CONFIG_SCHED_TRACER is not set 913# CONFIG_SCHED_TRACER is not set
879# CONFIG_CONTEXT_SWITCH_TRACER is not set 914# CONFIG_CONTEXT_SWITCH_TRACER is not set
880# CONFIG_BOOT_TRACER is not set 915# CONFIG_BOOT_TRACER is not set
916# CONFIG_TRACE_BRANCH_PROFILING is not set
881# CONFIG_STACK_TRACER is not set 917# CONFIG_STACK_TRACER is not set
882# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 918# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
883# CONFIG_SAMPLES is not set 919# CONFIG_SAMPLES is not set
884CONFIG_HAVE_ARCH_KGDB=y 920CONFIG_HAVE_ARCH_KGDB=y
885# CONFIG_KGDB is not set 921# CONFIG_KGDB is not set
922CONFIG_PRINT_STACK_DEPTH=64
886# CONFIG_DEBUG_STACKOVERFLOW is not set 923# CONFIG_DEBUG_STACKOVERFLOW is not set
887# CONFIG_DEBUG_STACK_USAGE is not set 924# CONFIG_DEBUG_STACK_USAGE is not set
888# CONFIG_DEBUG_PAGEALLOC is not set 925# CONFIG_DEBUG_PAGEALLOC is not set
@@ -922,11 +959,15 @@ CONFIG_CRYPTO=y
922# 959#
923# CONFIG_CRYPTO_FIPS is not set 960# CONFIG_CRYPTO_FIPS is not set
924CONFIG_CRYPTO_ALGAPI=y 961CONFIG_CRYPTO_ALGAPI=y
925CONFIG_CRYPTO_AEAD=y 962CONFIG_CRYPTO_ALGAPI2=y
963CONFIG_CRYPTO_AEAD2=y
926CONFIG_CRYPTO_BLKCIPHER=y 964CONFIG_CRYPTO_BLKCIPHER=y
965CONFIG_CRYPTO_BLKCIPHER2=y
927CONFIG_CRYPTO_HASH=y 966CONFIG_CRYPTO_HASH=y
928CONFIG_CRYPTO_RNG=y 967CONFIG_CRYPTO_HASH2=y
968CONFIG_CRYPTO_RNG2=y
929CONFIG_CRYPTO_MANAGER=y 969CONFIG_CRYPTO_MANAGER=y
970CONFIG_CRYPTO_MANAGER2=y
930# CONFIG_CRYPTO_GF128MUL is not set 971# CONFIG_CRYPTO_GF128MUL is not set
931# CONFIG_CRYPTO_NULL is not set 972# CONFIG_CRYPTO_NULL is not set
932# CONFIG_CRYPTO_CRYPTD is not set 973# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
index ce28cd6f0d4f..70d5c3fa3283 100644
--- a/arch/powerpc/configs/44x/sam440ep_defconfig
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:15 2008 4# Tue Jan 20 08:22:42 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -76,12 +77,12 @@ CONFIG_POSIX_MQUEUE=y
76CONFIG_IKCONFIG=y 77CONFIG_IKCONFIG=y
77# CONFIG_IKCONFIG_PROC is not set 78# CONFIG_IKCONFIG_PROC is not set
78CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -115,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 116CONFIG_SLUB=y
116# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +126,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 130CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 131# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +133,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 133# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 136CONFIG_BLOCK=y
139# CONFIG_LBD is not set 137# CONFIG_LBD is not set
140# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
144 141
@@ -155,6 +152,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_TREE_RCU is not set
156# CONFIG_PREEMPT_RCU is not set
157# CONFIG_TREE_RCU_TRACE is not set
158# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 159# CONFIG_FREEZER is not set
159# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
160 161
@@ -193,6 +194,7 @@ CONFIG_IBM440EP_ERR42=y
193# CONFIG_GENERIC_IOMAP is not set 194# CONFIG_GENERIC_IOMAP is not set
194# CONFIG_CPU_FREQ is not set 195# CONFIG_CPU_FREQ is not set
195# CONFIG_FSL_ULI1575 is not set 196# CONFIG_FSL_ULI1575 is not set
197# CONFIG_SIMPLE_GPIO is not set
196 198
197# 199#
198# Kernel options 200# Kernel options
@@ -216,6 +218,7 @@ CONFIG_BINFMT_ELF=y
216# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
217# CONFIG_MATH_EMULATION is not set 219# CONFIG_MATH_EMULATION is not set
218# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
220CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -230,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
230CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y 236CONFIG_PHYS_ADDR_T_64BIT=y
235CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
236CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
237CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
239CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
241CONFIG_CMDLINE_BOOL=y 246CONFIG_CMDLINE_BOOL=y
@@ -258,6 +263,7 @@ CONFIG_PCI_SYSCALL=y
258CONFIG_ARCH_SUPPORTS_MSI=y 263CONFIG_ARCH_SUPPORTS_MSI=y
259# CONFIG_PCI_MSI is not set 264# CONFIG_PCI_MSI is not set
260CONFIG_PCI_LEGACY=y 265CONFIG_PCI_LEGACY=y
266# CONFIG_PCI_STUB is not set
261# CONFIG_PCCARD is not set 267# CONFIG_PCCARD is not set
262# CONFIG_HOTPLUG_PCI is not set 268# CONFIG_HOTPLUG_PCI is not set
263# CONFIG_HAS_RAPIDIO is not set 269# CONFIG_HAS_RAPIDIO is not set
@@ -282,6 +288,7 @@ CONFIG_NET=y
282# 288#
283# Networking options 289# Networking options
284# 290#
291CONFIG_COMPAT_NET_DEV_OPS=y
285CONFIG_PACKET=y 292CONFIG_PACKET=y
286# CONFIG_PACKET_MMAP is not set 293# CONFIG_PACKET_MMAP is not set
287CONFIG_UNIX=y 294CONFIG_UNIX=y
@@ -332,6 +339,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
332# CONFIG_ECONET is not set 339# CONFIG_ECONET is not set
333# CONFIG_WAN_ROUTER is not set 340# CONFIG_WAN_ROUTER is not set
334# CONFIG_NET_SCHED is not set 341# CONFIG_NET_SCHED is not set
342# CONFIG_DCB is not set
335 343
336# 344#
337# Network testing 345# Network testing
@@ -344,6 +352,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
344# CONFIG_AF_RXRPC is not set 352# CONFIG_AF_RXRPC is not set
345# CONFIG_PHONET is not set 353# CONFIG_PHONET is not set
346# CONFIG_WIRELESS is not set 354# CONFIG_WIRELESS is not set
355# CONFIG_WIMAX is not set
347# CONFIG_RFKILL is not set 356# CONFIG_RFKILL is not set
348# CONFIG_NET_9P is not set 357# CONFIG_NET_9P is not set
349 358
@@ -551,6 +560,10 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
551# CONFIG_IWLWIFI_LEDS is not set 560# CONFIG_IWLWIFI_LEDS is not set
552 561
553# 562#
563# Enable WiMAX (Networking options) to see the WiMAX drivers
564#
565
566#
554# USB Network Adapters 567# USB Network Adapters
555# 568#
556# CONFIG_USB_CATC is not set 569# CONFIG_USB_CATC is not set
@@ -605,6 +618,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
605CONFIG_MOUSE_PS2_SYNAPTICS=y 618CONFIG_MOUSE_PS2_SYNAPTICS=y
606CONFIG_MOUSE_PS2_LIFEBOOK=y 619CONFIG_MOUSE_PS2_LIFEBOOK=y
607CONFIG_MOUSE_PS2_TRACKPOINT=y 620CONFIG_MOUSE_PS2_TRACKPOINT=y
621# CONFIG_MOUSE_PS2_ELANTECH is not set
608# CONFIG_MOUSE_PS2_TOUCHKIT is not set 622# CONFIG_MOUSE_PS2_TOUCHKIT is not set
609# CONFIG_MOUSE_SERIAL is not set 623# CONFIG_MOUSE_SERIAL is not set
610# CONFIG_MOUSE_APPLETOUCH is not set 624# CONFIG_MOUSE_APPLETOUCH is not set
@@ -661,9 +675,12 @@ CONFIG_SERIAL_CORE=y
661CONFIG_SERIAL_CORE_CONSOLE=y 675CONFIG_SERIAL_CORE_CONSOLE=y
662# CONFIG_SERIAL_JSM is not set 676# CONFIG_SERIAL_JSM is not set
663CONFIG_SERIAL_OF_PLATFORM=y 677CONFIG_SERIAL_OF_PLATFORM=y
678# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
664CONFIG_UNIX98_PTYS=y 679CONFIG_UNIX98_PTYS=y
680# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
665CONFIG_LEGACY_PTYS=y 681CONFIG_LEGACY_PTYS=y
666CONFIG_LEGACY_PTY_COUNT=256 682CONFIG_LEGACY_PTY_COUNT=256
683# CONFIG_HVC_UDBG is not set
667# CONFIG_IPMI_HANDLER is not set 684# CONFIG_IPMI_HANDLER is not set
668# CONFIG_HW_RANDOM is not set 685# CONFIG_HW_RANDOM is not set
669# CONFIG_NVRAM is not set 686# CONFIG_NVRAM is not set
@@ -751,11 +768,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
751# CONFIG_THERMAL is not set 768# CONFIG_THERMAL is not set
752# CONFIG_THERMAL_HWMON is not set 769# CONFIG_THERMAL_HWMON is not set
753# CONFIG_WATCHDOG is not set 770# CONFIG_WATCHDOG is not set
771CONFIG_SSB_POSSIBLE=y
754 772
755# 773#
756# Sonics Silicon Backplane 774# Sonics Silicon Backplane
757# 775#
758CONFIG_SSB_POSSIBLE=y
759# CONFIG_SSB is not set 776# CONFIG_SSB is not set
760 777
761# 778#
@@ -764,9 +781,13 @@ CONFIG_SSB_POSSIBLE=y
764# CONFIG_MFD_CORE is not set 781# CONFIG_MFD_CORE is not set
765# CONFIG_MFD_SM501 is not set 782# CONFIG_MFD_SM501 is not set
766# CONFIG_HTC_PASIC3 is not set 783# CONFIG_HTC_PASIC3 is not set
784# CONFIG_TWL4030_CORE is not set
767# CONFIG_MFD_TMIO is not set 785# CONFIG_MFD_TMIO is not set
786# CONFIG_PMIC_DA903X is not set
768# CONFIG_MFD_WM8400 is not set 787# CONFIG_MFD_WM8400 is not set
769# CONFIG_MFD_WM8350_I2C is not set 788# CONFIG_MFD_WM8350_I2C is not set
789# CONFIG_MFD_PCF50633 is not set
790# CONFIG_REGULATOR is not set
770 791
771# 792#
772# Multimedia devices 793# Multimedia devices
@@ -848,12 +869,13 @@ CONFIG_FB_RADEON_BACKLIGHT=y
848# CONFIG_FB_IBM_GXT4500 is not set 869# CONFIG_FB_IBM_GXT4500 is not set
849# CONFIG_FB_VIRTUAL is not set 870# CONFIG_FB_VIRTUAL is not set
850# CONFIG_FB_METRONOME is not set 871# CONFIG_FB_METRONOME is not set
872# CONFIG_FB_MB862XX is not set
851CONFIG_BACKLIGHT_LCD_SUPPORT=y 873CONFIG_BACKLIGHT_LCD_SUPPORT=y
852CONFIG_LCD_CLASS_DEVICE=y 874CONFIG_LCD_CLASS_DEVICE=y
853# CONFIG_LCD_ILI9320 is not set 875# CONFIG_LCD_ILI9320 is not set
854# CONFIG_LCD_PLATFORM is not set 876# CONFIG_LCD_PLATFORM is not set
855CONFIG_BACKLIGHT_CLASS_DEVICE=y 877CONFIG_BACKLIGHT_CLASS_DEVICE=y
856# CONFIG_BACKLIGHT_CORGI is not set 878CONFIG_BACKLIGHT_GENERIC=y
857 879
858# 880#
859# Display device support 881# Display device support
@@ -894,11 +916,9 @@ CONFIG_HID_COMPAT=y
894CONFIG_HID_A4TECH=y 916CONFIG_HID_A4TECH=y
895CONFIG_HID_APPLE=y 917CONFIG_HID_APPLE=y
896CONFIG_HID_BELKIN=y 918CONFIG_HID_BELKIN=y
897CONFIG_HID_BRIGHT=y
898CONFIG_HID_CHERRY=y 919CONFIG_HID_CHERRY=y
899CONFIG_HID_CHICONY=y 920CONFIG_HID_CHICONY=y
900CONFIG_HID_CYPRESS=y 921CONFIG_HID_CYPRESS=y
901CONFIG_HID_DELL=y
902CONFIG_HID_EZKEY=y 922CONFIG_HID_EZKEY=y
903CONFIG_HID_GYRATION=y 923CONFIG_HID_GYRATION=y
904CONFIG_HID_LOGITECH=y 924CONFIG_HID_LOGITECH=y
@@ -906,12 +926,15 @@ CONFIG_HID_LOGITECH=y
906# CONFIG_LOGIRUMBLEPAD2_FF is not set 926# CONFIG_LOGIRUMBLEPAD2_FF is not set
907CONFIG_HID_MICROSOFT=y 927CONFIG_HID_MICROSOFT=y
908CONFIG_HID_MONTEREY=y 928CONFIG_HID_MONTEREY=y
929# CONFIG_HID_NTRIG is not set
909CONFIG_HID_PANTHERLORD=y 930CONFIG_HID_PANTHERLORD=y
910# CONFIG_PANTHERLORD_FF is not set 931# CONFIG_PANTHERLORD_FF is not set
911CONFIG_HID_PETALYNX=y 932CONFIG_HID_PETALYNX=y
912CONFIG_HID_SAMSUNG=y 933CONFIG_HID_SAMSUNG=y
913CONFIG_HID_SONY=y 934CONFIG_HID_SONY=y
914CONFIG_HID_SUNPLUS=y 935CONFIG_HID_SUNPLUS=y
936# CONFIG_GREENASIA_FF is not set
937# CONFIG_HID_TOPSEED is not set
915CONFIG_THRUSTMASTER_FF=m 938CONFIG_THRUSTMASTER_FF=m
916CONFIG_ZEROPLUS_FF=m 939CONFIG_ZEROPLUS_FF=m
917CONFIG_USB_SUPPORT=y 940CONFIG_USB_SUPPORT=y
@@ -943,6 +966,7 @@ CONFIG_USB_EHCI_HCD=m
943# CONFIG_USB_EHCI_ROOT_HUB_TT is not set 966# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
944# CONFIG_USB_EHCI_TT_NEWSCHED is not set 967# CONFIG_USB_EHCI_TT_NEWSCHED is not set
945CONFIG_USB_EHCI_HCD_PPC_OF=y 968CONFIG_USB_EHCI_HCD_PPC_OF=y
969# CONFIG_USB_OXU210HP_HCD is not set
946# CONFIG_USB_ISP116X_HCD is not set 970# CONFIG_USB_ISP116X_HCD is not set
947# CONFIG_USB_ISP1760_HCD is not set 971# CONFIG_USB_ISP1760_HCD is not set
948CONFIG_USB_OHCI_HCD=y 972CONFIG_USB_OHCI_HCD=y
@@ -968,18 +992,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
968# CONFIG_USB_TMC is not set 992# CONFIG_USB_TMC is not set
969 993
970# 994#
971# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 995# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
972# 996#
973 997
974# 998#
975# may also be needed; see USB_STORAGE Help for more information 999# see USB_STORAGE Help for more information
976# 1000#
977CONFIG_USB_STORAGE=m 1001CONFIG_USB_STORAGE=m
978# CONFIG_USB_STORAGE_DEBUG is not set 1002# CONFIG_USB_STORAGE_DEBUG is not set
979# CONFIG_USB_STORAGE_DATAFAB is not set 1003# CONFIG_USB_STORAGE_DATAFAB is not set
980# CONFIG_USB_STORAGE_FREECOM is not set 1004# CONFIG_USB_STORAGE_FREECOM is not set
981# CONFIG_USB_STORAGE_ISD200 is not set 1005# CONFIG_USB_STORAGE_ISD200 is not set
982# CONFIG_USB_STORAGE_DPCM is not set
983# CONFIG_USB_STORAGE_USBAT is not set 1006# CONFIG_USB_STORAGE_USBAT is not set
984# CONFIG_USB_STORAGE_SDDR09 is not set 1007# CONFIG_USB_STORAGE_SDDR09 is not set
985# CONFIG_USB_STORAGE_SDDR55 is not set 1008# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1027,6 +1050,10 @@ CONFIG_USB_STORAGE=m
1027# CONFIG_USB_ISIGHTFW is not set 1050# CONFIG_USB_ISIGHTFW is not set
1028# CONFIG_USB_VST is not set 1051# CONFIG_USB_VST is not set
1029# CONFIG_USB_GADGET is not set 1052# CONFIG_USB_GADGET is not set
1053
1054#
1055# OTG and related infrastructure
1056#
1030# CONFIG_UWB is not set 1057# CONFIG_UWB is not set
1031# CONFIG_MMC is not set 1058# CONFIG_MMC is not set
1032# CONFIG_MEMSTICK is not set 1059# CONFIG_MEMSTICK is not set
@@ -1065,6 +1092,7 @@ CONFIG_RTC_DRV_M41T80=y
1065CONFIG_RTC_DRV_M41T80_WDT=y 1092CONFIG_RTC_DRV_M41T80_WDT=y
1066# CONFIG_RTC_DRV_S35390A is not set 1093# CONFIG_RTC_DRV_S35390A is not set
1067# CONFIG_RTC_DRV_FM3130 is not set 1094# CONFIG_RTC_DRV_FM3130 is not set
1095# CONFIG_RTC_DRV_RX8581 is not set
1068 1096
1069# 1097#
1070# SPI RTC drivers 1098# SPI RTC drivers
@@ -1117,6 +1145,7 @@ CONFIG_FS_POSIX_ACL=y
1117CONFIG_FILE_LOCKING=y 1145CONFIG_FILE_LOCKING=y
1118# CONFIG_XFS_FS is not set 1146# CONFIG_XFS_FS is not set
1119# CONFIG_OCFS2_FS is not set 1147# CONFIG_OCFS2_FS is not set
1148# CONFIG_BTRFS_FS is not set
1120CONFIG_DNOTIFY=y 1149CONFIG_DNOTIFY=y
1121CONFIG_INOTIFY=y 1150CONFIG_INOTIFY=y
1122CONFIG_INOTIFY_USER=y 1151CONFIG_INOTIFY_USER=y
@@ -1156,10 +1185,7 @@ CONFIG_TMPFS=y
1156# CONFIG_TMPFS_POSIX_ACL is not set 1185# CONFIG_TMPFS_POSIX_ACL is not set
1157# CONFIG_HUGETLB_PAGE is not set 1186# CONFIG_HUGETLB_PAGE is not set
1158# CONFIG_CONFIGFS_FS is not set 1187# CONFIG_CONFIGFS_FS is not set
1159 1188CONFIG_MISC_FILESYSTEMS=y
1160#
1161# Miscellaneous filesystems
1162#
1163# CONFIG_ADFS_FS is not set 1189# CONFIG_ADFS_FS is not set
1164CONFIG_AFFS_FS=m 1190CONFIG_AFFS_FS=m
1165# CONFIG_HFS_FS is not set 1191# CONFIG_HFS_FS is not set
@@ -1168,6 +1194,7 @@ CONFIG_AFFS_FS=m
1168# CONFIG_BFS_FS is not set 1194# CONFIG_BFS_FS is not set
1169# CONFIG_EFS_FS is not set 1195# CONFIG_EFS_FS is not set
1170# CONFIG_CRAMFS is not set 1196# CONFIG_CRAMFS is not set
1197# CONFIG_SQUASHFS is not set
1171# CONFIG_VXFS_FS is not set 1198# CONFIG_VXFS_FS is not set
1172# CONFIG_MINIX_FS is not set 1199# CONFIG_MINIX_FS is not set
1173# CONFIG_OMFS_FS is not set 1200# CONFIG_OMFS_FS is not set
@@ -1245,6 +1272,7 @@ CONFIG_NLS_ISO8859_1=y
1245# Library routines 1272# Library routines
1246# 1273#
1247CONFIG_BITREVERSE=y 1274CONFIG_BITREVERSE=y
1275CONFIG_GENERIC_FIND_LAST_BIT=y
1248# CONFIG_CRC_CCITT is not set 1276# CONFIG_CRC_CCITT is not set
1249# CONFIG_CRC16 is not set 1277# CONFIG_CRC16 is not set
1250CONFIG_CRC_T10DIF=y 1278CONFIG_CRC_T10DIF=y
@@ -1278,12 +1306,17 @@ CONFIG_MAGIC_SYSRQ=y
1278# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1306# CONFIG_RCU_CPU_STALL_DETECTOR is not set
1279# CONFIG_LATENCYTOP is not set 1307# CONFIG_LATENCYTOP is not set
1280CONFIG_SYSCTL_SYSCALL_CHECK=y 1308CONFIG_SYSCTL_SYSCALL_CHECK=y
1281CONFIG_NOP_TRACER=y 1309CONFIG_HAVE_FUNCTION_TRACER=y
1282CONFIG_HAVE_FTRACE=y
1283CONFIG_HAVE_DYNAMIC_FTRACE=y 1310CONFIG_HAVE_DYNAMIC_FTRACE=y
1311CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1312
1313#
1314# Tracers
1315#
1284# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1316# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1285# CONFIG_SAMPLES is not set 1317# CONFIG_SAMPLES is not set
1286CONFIG_HAVE_ARCH_KGDB=y 1318CONFIG_HAVE_ARCH_KGDB=y
1319CONFIG_PRINT_STACK_DEPTH=64
1287# CONFIG_IRQSTACKS is not set 1320# CONFIG_IRQSTACKS is not set
1288# CONFIG_PPC_EARLY_DEBUG is not set 1321# CONFIG_PPC_EARLY_DEBUG is not set
1289 1322
diff --git a/arch/powerpc/configs/44x/sequoia_defconfig b/arch/powerpc/configs/44x/sequoia_defconfig
index 562beeaab53d..a921fe3c3711 100644
--- a/arch/powerpc/configs/44x/sequoia_defconfig
+++ b/arch/powerpc/configs/44x/sequoia_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:16 2008 4# Tue Jan 20 08:22:45 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,12 +76,12 @@ CONFIG_POSIX_MQUEUE=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
80# CONFIG_FAIR_GROUP_SCHED is not set 80# CONFIG_FAIR_GROUP_SCHED is not set
81# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -115,7 +116,6 @@ CONFIG_SLUB_DEBUG=y
115CONFIG_SLUB=y 116CONFIG_SLUB=y
116# CONFIG_SLOB is not set 117# CONFIG_SLOB is not set
117# CONFIG_PROFILING is not set 118# CONFIG_PROFILING is not set
118# CONFIG_MARKERS is not set
119CONFIG_HAVE_OPROFILE=y 119CONFIG_HAVE_OPROFILE=y
120# CONFIG_KPROBES is not set 120# CONFIG_KPROBES is not set
121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 121CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -126,7 +126,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 126# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
127CONFIG_SLABINFO=y 127CONFIG_SLABINFO=y
128CONFIG_RT_MUTEXES=y 128CONFIG_RT_MUTEXES=y
129# CONFIG_TINY_SHMEM is not set
130CONFIG_BASE_SMALL=0 129CONFIG_BASE_SMALL=0
131CONFIG_MODULES=y 130CONFIG_MODULES=y
132# CONFIG_MODULE_FORCE_LOAD is not set 131# CONFIG_MODULE_FORCE_LOAD is not set
@@ -134,11 +133,9 @@ CONFIG_MODULE_UNLOAD=y
134# CONFIG_MODULE_FORCE_UNLOAD is not set 133# CONFIG_MODULE_FORCE_UNLOAD is not set
135# CONFIG_MODVERSIONS is not set 134# CONFIG_MODVERSIONS is not set
136# CONFIG_MODULE_SRCVERSION_ALL is not set 135# CONFIG_MODULE_SRCVERSION_ALL is not set
137CONFIG_KMOD=y
138CONFIG_BLOCK=y 136CONFIG_BLOCK=y
139CONFIG_LBD=y 137CONFIG_LBD=y
140# CONFIG_BLK_DEV_IO_TRACE is not set 138# CONFIG_BLK_DEV_IO_TRACE is not set
141# CONFIG_LSF is not set
142# CONFIG_BLK_DEV_BSG is not set 139# CONFIG_BLK_DEV_BSG is not set
143# CONFIG_BLK_DEV_INTEGRITY is not set 140# CONFIG_BLK_DEV_INTEGRITY is not set
144 141
@@ -155,6 +152,10 @@ CONFIG_DEFAULT_AS=y
155# CONFIG_DEFAULT_NOOP is not set 152# CONFIG_DEFAULT_NOOP is not set
156CONFIG_DEFAULT_IOSCHED="anticipatory" 153CONFIG_DEFAULT_IOSCHED="anticipatory"
157CONFIG_CLASSIC_RCU=y 154CONFIG_CLASSIC_RCU=y
155# CONFIG_TREE_RCU is not set
156# CONFIG_PREEMPT_RCU is not set
157# CONFIG_TREE_RCU_TRACE is not set
158# CONFIG_PREEMPT_RCU_TRACE is not set
158# CONFIG_FREEZER is not set 159# CONFIG_FREEZER is not set
159# CONFIG_PPC4xx_PCI_EXPRESS is not set 160# CONFIG_PPC4xx_PCI_EXPRESS is not set
160 161
@@ -192,6 +193,7 @@ CONFIG_440EPX=y
192# CONFIG_GENERIC_IOMAP is not set 193# CONFIG_GENERIC_IOMAP is not set
193# CONFIG_CPU_FREQ is not set 194# CONFIG_CPU_FREQ is not set
194# CONFIG_FSL_ULI1575 is not set 195# CONFIG_FSL_ULI1575 is not set
196# CONFIG_SIMPLE_GPIO is not set
195 197
196# 198#
197# Kernel options 199# Kernel options
@@ -216,6 +218,7 @@ CONFIG_BINFMT_ELF=y
216# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
217# CONFIG_MATH_EMULATION is not set 219# CONFIG_MATH_EMULATION is not set
218# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
220CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -230,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
230CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
231CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
232CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
233CONFIG_RESOURCES_64BIT=y
234CONFIG_PHYS_ADDR_T_64BIT=y 236CONFIG_PHYS_ADDR_T_64BIT=y
235CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
236CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
237CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
238CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
239CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
240CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
241CONFIG_CMDLINE_BOOL=y 246CONFIG_CMDLINE_BOOL=y
@@ -259,6 +264,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
259# CONFIG_PCI_MSI is not set 264# CONFIG_PCI_MSI is not set
260CONFIG_PCI_LEGACY=y 265CONFIG_PCI_LEGACY=y
261# CONFIG_PCI_DEBUG is not set 266# CONFIG_PCI_DEBUG is not set
267# CONFIG_PCI_STUB is not set
262# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
263# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
264# CONFIG_HAS_RAPIDIO is not set 270# CONFIG_HAS_RAPIDIO is not set
@@ -283,6 +289,7 @@ CONFIG_NET=y
283# 289#
284# Networking options 290# Networking options
285# 291#
292CONFIG_COMPAT_NET_DEV_OPS=y
286CONFIG_PACKET=y 293CONFIG_PACKET=y
287# CONFIG_PACKET_MMAP is not set 294# CONFIG_PACKET_MMAP is not set
288CONFIG_UNIX=y 295CONFIG_UNIX=y
@@ -333,6 +340,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
333# CONFIG_ECONET is not set 340# CONFIG_ECONET is not set
334# CONFIG_WAN_ROUTER is not set 341# CONFIG_WAN_ROUTER is not set
335# CONFIG_NET_SCHED is not set 342# CONFIG_NET_SCHED is not set
343# CONFIG_DCB is not set
336 344
337# 345#
338# Network testing 346# Network testing
@@ -345,6 +353,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
345# CONFIG_AF_RXRPC is not set 353# CONFIG_AF_RXRPC is not set
346# CONFIG_PHONET is not set 354# CONFIG_PHONET is not set
347# CONFIG_WIRELESS is not set 355# CONFIG_WIRELESS is not set
356# CONFIG_WIMAX is not set
348# CONFIG_RFKILL is not set 357# CONFIG_RFKILL is not set
349# CONFIG_NET_9P is not set 358# CONFIG_NET_9P is not set
350 359
@@ -370,6 +379,7 @@ CONFIG_MTD=y
370# CONFIG_MTD_DEBUG is not set 379# CONFIG_MTD_DEBUG is not set
371# CONFIG_MTD_CONCAT is not set 380# CONFIG_MTD_CONCAT is not set
372CONFIG_MTD_PARTITIONS=y 381CONFIG_MTD_PARTITIONS=y
382# CONFIG_MTD_TESTS is not set
373# CONFIG_MTD_REDBOOT_PARTS is not set 383# CONFIG_MTD_REDBOOT_PARTS is not set
374CONFIG_MTD_CMDLINE_PARTS=y 384CONFIG_MTD_CMDLINE_PARTS=y
375CONFIG_MTD_OF_PARTS=y 385CONFIG_MTD_OF_PARTS=y
@@ -442,6 +452,12 @@ CONFIG_MTD_PHYSMAP_OF=y
442# CONFIG_MTD_ONENAND is not set 452# CONFIG_MTD_ONENAND is not set
443 453
444# 454#
455# LPDDR flash memory drivers
456#
457# CONFIG_MTD_LPDDR is not set
458# CONFIG_MTD_QINFO_PROBE is not set
459
460#
445# UBI - Unsorted block images 461# UBI - Unsorted block images
446# 462#
447# CONFIG_MTD_UBI is not set 463# CONFIG_MTD_UBI is not set
@@ -472,6 +488,7 @@ CONFIG_MISC_DEVICES=y
472# CONFIG_TIFM_CORE is not set 488# CONFIG_TIFM_CORE is not set
473# CONFIG_ENCLOSURE_SERVICES is not set 489# CONFIG_ENCLOSURE_SERVICES is not set
474# CONFIG_HP_ILO is not set 490# CONFIG_HP_ILO is not set
491# CONFIG_C2PORT is not set
475CONFIG_HAVE_IDE=y 492CONFIG_HAVE_IDE=y
476# CONFIG_IDE is not set 493# CONFIG_IDE is not set
477 494
@@ -554,6 +571,7 @@ CONFIG_NETDEV_1000=y
554# CONFIG_JME is not set 571# CONFIG_JME is not set
555CONFIG_NETDEV_10000=y 572CONFIG_NETDEV_10000=y
556# CONFIG_CHELSIO_T1 is not set 573# CONFIG_CHELSIO_T1 is not set
574CONFIG_CHELSIO_T3_DEPENDS=y
557# CONFIG_CHELSIO_T3 is not set 575# CONFIG_CHELSIO_T3 is not set
558# CONFIG_ENIC is not set 576# CONFIG_ENIC is not set
559# CONFIG_IXGBE is not set 577# CONFIG_IXGBE is not set
@@ -576,6 +594,10 @@ CONFIG_NETDEV_10000=y
576# CONFIG_WLAN_PRE80211 is not set 594# CONFIG_WLAN_PRE80211 is not set
577# CONFIG_WLAN_80211 is not set 595# CONFIG_WLAN_80211 is not set
578# CONFIG_IWLWIFI_LEDS is not set 596# CONFIG_IWLWIFI_LEDS is not set
597
598#
599# Enable WiMAX (Networking options) to see the WiMAX drivers
600#
579# CONFIG_WAN is not set 601# CONFIG_WAN is not set
580# CONFIG_FDDI is not set 602# CONFIG_FDDI is not set
581# CONFIG_HIPPI is not set 603# CONFIG_HIPPI is not set
@@ -628,9 +650,12 @@ CONFIG_SERIAL_CORE=y
628CONFIG_SERIAL_CORE_CONSOLE=y 650CONFIG_SERIAL_CORE_CONSOLE=y
629# CONFIG_SERIAL_JSM is not set 651# CONFIG_SERIAL_JSM is not set
630CONFIG_SERIAL_OF_PLATFORM=y 652CONFIG_SERIAL_OF_PLATFORM=y
653# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
631CONFIG_UNIX98_PTYS=y 654CONFIG_UNIX98_PTYS=y
655# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
632CONFIG_LEGACY_PTYS=y 656CONFIG_LEGACY_PTYS=y
633CONFIG_LEGACY_PTY_COUNT=256 657CONFIG_LEGACY_PTY_COUNT=256
658# CONFIG_HVC_UDBG is not set
634# CONFIG_IPMI_HANDLER is not set 659# CONFIG_IPMI_HANDLER is not set
635# CONFIG_HW_RANDOM is not set 660# CONFIG_HW_RANDOM is not set
636# CONFIG_NVRAM is not set 661# CONFIG_NVRAM is not set
@@ -649,11 +674,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
649# CONFIG_HWMON is not set 674# CONFIG_HWMON is not set
650CONFIG_THERMAL=y 675CONFIG_THERMAL=y
651# CONFIG_WATCHDOG is not set 676# CONFIG_WATCHDOG is not set
677CONFIG_SSB_POSSIBLE=y
652 678
653# 679#
654# Sonics Silicon Backplane 680# Sonics Silicon Backplane
655# 681#
656CONFIG_SSB_POSSIBLE=y
657# CONFIG_SSB is not set 682# CONFIG_SSB is not set
658 683
659# 684#
@@ -663,7 +688,7 @@ CONFIG_SSB_POSSIBLE=y
663# CONFIG_MFD_SM501 is not set 688# CONFIG_MFD_SM501 is not set
664# CONFIG_HTC_PASIC3 is not set 689# CONFIG_HTC_PASIC3 is not set
665# CONFIG_MFD_TMIO is not set 690# CONFIG_MFD_TMIO is not set
666# CONFIG_MFD_WM8400 is not set 691# CONFIG_REGULATOR is not set
667 692
668# 693#
669# Multimedia devices 694# Multimedia devices
@@ -709,9 +734,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
709# 734#
710 735
711# 736#
712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 737# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
713# 738#
714# CONFIG_USB_GADGET is not set 739# CONFIG_USB_GADGET is not set
740
741#
742# OTG and related infrastructure
743#
715# CONFIG_UWB is not set 744# CONFIG_UWB is not set
716# CONFIG_MMC is not set 745# CONFIG_MMC is not set
717# CONFIG_MEMSTICK is not set 746# CONFIG_MEMSTICK is not set
@@ -737,7 +766,9 @@ CONFIG_EXT2_FS=y
737# CONFIG_FS_POSIX_ACL is not set 766# CONFIG_FS_POSIX_ACL is not set
738CONFIG_FILE_LOCKING=y 767CONFIG_FILE_LOCKING=y
739# CONFIG_XFS_FS is not set 768# CONFIG_XFS_FS is not set
769# CONFIG_GFS2_FS is not set
740# CONFIG_OCFS2_FS is not set 770# CONFIG_OCFS2_FS is not set
771# CONFIG_BTRFS_FS is not set
741CONFIG_DNOTIFY=y 772CONFIG_DNOTIFY=y
742CONFIG_INOTIFY=y 773CONFIG_INOTIFY=y
743CONFIG_INOTIFY_USER=y 774CONFIG_INOTIFY_USER=y
@@ -771,10 +802,7 @@ CONFIG_TMPFS=y
771# CONFIG_TMPFS_POSIX_ACL is not set 802# CONFIG_TMPFS_POSIX_ACL is not set
772# CONFIG_HUGETLB_PAGE is not set 803# CONFIG_HUGETLB_PAGE is not set
773# CONFIG_CONFIGFS_FS is not set 804# CONFIG_CONFIGFS_FS is not set
774 805CONFIG_MISC_FILESYSTEMS=y
775#
776# Miscellaneous filesystems
777#
778# CONFIG_ADFS_FS is not set 806# CONFIG_ADFS_FS is not set
779# CONFIG_AFFS_FS is not set 807# CONFIG_AFFS_FS is not set
780# CONFIG_HFS_FS is not set 808# CONFIG_HFS_FS is not set
@@ -794,6 +822,7 @@ CONFIG_JFFS2_ZLIB=y
794CONFIG_JFFS2_RTIME=y 822CONFIG_JFFS2_RTIME=y
795# CONFIG_JFFS2_RUBIN is not set 823# CONFIG_JFFS2_RUBIN is not set
796CONFIG_CRAMFS=y 824CONFIG_CRAMFS=y
825# CONFIG_SQUASHFS is not set
797# CONFIG_VXFS_FS is not set 826# CONFIG_VXFS_FS is not set
798# CONFIG_MINIX_FS is not set 827# CONFIG_MINIX_FS is not set
799# CONFIG_OMFS_FS is not set 828# CONFIG_OMFS_FS is not set
@@ -834,6 +863,7 @@ CONFIG_MSDOS_PARTITION=y
834# Library routines 863# Library routines
835# 864#
836CONFIG_BITREVERSE=y 865CONFIG_BITREVERSE=y
866CONFIG_GENERIC_FIND_LAST_BIT=y
837# CONFIG_CRC_CCITT is not set 867# CONFIG_CRC_CCITT is not set
838# CONFIG_CRC16 is not set 868# CONFIG_CRC16 is not set
839# CONFIG_CRC_T10DIF is not set 869# CONFIG_CRC_T10DIF is not set
@@ -885,6 +915,7 @@ CONFIG_SCHED_DEBUG=y
885# CONFIG_DEBUG_MEMORY_INIT is not set 915# CONFIG_DEBUG_MEMORY_INIT is not set
886# CONFIG_DEBUG_LIST is not set 916# CONFIG_DEBUG_LIST is not set
887# CONFIG_DEBUG_SG is not set 917# CONFIG_DEBUG_SG is not set
918# CONFIG_DEBUG_NOTIFIERS is not set
888# CONFIG_BOOT_PRINTK_DELAY is not set 919# CONFIG_BOOT_PRINTK_DELAY is not set
889# CONFIG_RCU_TORTURE_TEST is not set 920# CONFIG_RCU_TORTURE_TEST is not set
890# CONFIG_RCU_CPU_STALL_DETECTOR is not set 921# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -893,18 +924,24 @@ CONFIG_SCHED_DEBUG=y
893# CONFIG_FAULT_INJECTION is not set 924# CONFIG_FAULT_INJECTION is not set
894# CONFIG_LATENCYTOP is not set 925# CONFIG_LATENCYTOP is not set
895CONFIG_SYSCTL_SYSCALL_CHECK=y 926CONFIG_SYSCTL_SYSCALL_CHECK=y
896CONFIG_NOP_TRACER=y 927CONFIG_HAVE_FUNCTION_TRACER=y
897CONFIG_HAVE_FTRACE=y
898CONFIG_HAVE_DYNAMIC_FTRACE=y 928CONFIG_HAVE_DYNAMIC_FTRACE=y
899# CONFIG_FTRACE is not set 929CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
930
931#
932# Tracers
933#
934# CONFIG_FUNCTION_TRACER is not set
900# CONFIG_SCHED_TRACER is not set 935# CONFIG_SCHED_TRACER is not set
901# CONFIG_CONTEXT_SWITCH_TRACER is not set 936# CONFIG_CONTEXT_SWITCH_TRACER is not set
902# CONFIG_BOOT_TRACER is not set 937# CONFIG_BOOT_TRACER is not set
938# CONFIG_TRACE_BRANCH_PROFILING is not set
903# CONFIG_STACK_TRACER is not set 939# CONFIG_STACK_TRACER is not set
904# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 940# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
905# CONFIG_SAMPLES is not set 941# CONFIG_SAMPLES is not set
906CONFIG_HAVE_ARCH_KGDB=y 942CONFIG_HAVE_ARCH_KGDB=y
907# CONFIG_KGDB is not set 943# CONFIG_KGDB is not set
944CONFIG_PRINT_STACK_DEPTH=64
908# CONFIG_DEBUG_STACKOVERFLOW is not set 945# CONFIG_DEBUG_STACKOVERFLOW is not set
909# CONFIG_DEBUG_STACK_USAGE is not set 946# CONFIG_DEBUG_STACK_USAGE is not set
910# CONFIG_DEBUG_PAGEALLOC is not set 947# CONFIG_DEBUG_PAGEALLOC is not set
@@ -944,11 +981,15 @@ CONFIG_CRYPTO=y
944# 981#
945# CONFIG_CRYPTO_FIPS is not set 982# CONFIG_CRYPTO_FIPS is not set
946CONFIG_CRYPTO_ALGAPI=y 983CONFIG_CRYPTO_ALGAPI=y
947CONFIG_CRYPTO_AEAD=y 984CONFIG_CRYPTO_ALGAPI2=y
985CONFIG_CRYPTO_AEAD2=y
948CONFIG_CRYPTO_BLKCIPHER=y 986CONFIG_CRYPTO_BLKCIPHER=y
987CONFIG_CRYPTO_BLKCIPHER2=y
949CONFIG_CRYPTO_HASH=y 988CONFIG_CRYPTO_HASH=y
950CONFIG_CRYPTO_RNG=y 989CONFIG_CRYPTO_HASH2=y
990CONFIG_CRYPTO_RNG2=y
951CONFIG_CRYPTO_MANAGER=y 991CONFIG_CRYPTO_MANAGER=y
992CONFIG_CRYPTO_MANAGER2=y
952# CONFIG_CRYPTO_GF128MUL is not set 993# CONFIG_CRYPTO_GF128MUL is not set
953# CONFIG_CRYPTO_NULL is not set 994# CONFIG_CRYPTO_NULL is not set
954# CONFIG_CRYPTO_CRYPTD is not set 995# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 427bb6a11be5..826700872d26 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:18 2008 4# Tue Jan 20 08:22:47 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -43,7 +44,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
43CONFIG_PPC=y 44CONFIG_PPC=y
44CONFIG_EARLY_PRINTK=y 45CONFIG_EARLY_PRINTK=y
45CONFIG_GENERIC_NVRAM=y 46CONFIG_GENERIC_NVRAM=y
46CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 47CONFIG_SCHED_OMIT_FRAME_POINTER=y
47CONFIG_ARCH_MAY_HAVE_PC_FDC=y 48CONFIG_ARCH_MAY_HAVE_PC_FDC=y
48CONFIG_PPC_OF=y 49CONFIG_PPC_OF=y
49CONFIG_OF=y 50CONFIG_OF=y
@@ -74,12 +75,12 @@ CONFIG_POSIX_MQUEUE=y
74# CONFIG_AUDIT is not set 75# CONFIG_AUDIT is not set
75# CONFIG_IKCONFIG is not set 76# CONFIG_IKCONFIG is not set
76CONFIG_LOG_BUF_SHIFT=14 77CONFIG_LOG_BUF_SHIFT=14
77# CONFIG_CGROUPS is not set
78CONFIG_GROUP_SCHED=y 78CONFIG_GROUP_SCHED=y
79CONFIG_FAIR_GROUP_SCHED=y 79CONFIG_FAIR_GROUP_SCHED=y
80# CONFIG_RT_GROUP_SCHED is not set 80# CONFIG_RT_GROUP_SCHED is not set
81CONFIG_USER_SCHED=y 81CONFIG_USER_SCHED=y
82# CONFIG_CGROUP_SCHED is not set 82# CONFIG_CGROUP_SCHED is not set
83# CONFIG_CGROUPS is not set
83CONFIG_SYSFS_DEPRECATED=y 84CONFIG_SYSFS_DEPRECATED=y
84CONFIG_SYSFS_DEPRECATED_V2=y 85CONFIG_SYSFS_DEPRECATED_V2=y
85# CONFIG_RELAY is not set 86# CONFIG_RELAY is not set
@@ -114,7 +115,6 @@ CONFIG_SLUB_DEBUG=y
114CONFIG_SLUB=y 115CONFIG_SLUB=y
115# CONFIG_SLOB is not set 116# CONFIG_SLOB is not set
116# CONFIG_PROFILING is not set 117# CONFIG_PROFILING is not set
117# CONFIG_MARKERS is not set
118CONFIG_HAVE_OPROFILE=y 118CONFIG_HAVE_OPROFILE=y
119# CONFIG_KPROBES is not set 119# CONFIG_KPROBES is not set
120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 120CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -125,7 +125,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 125# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
126CONFIG_SLABINFO=y 126CONFIG_SLABINFO=y
127CONFIG_RT_MUTEXES=y 127CONFIG_RT_MUTEXES=y
128# CONFIG_TINY_SHMEM is not set
129CONFIG_BASE_SMALL=0 128CONFIG_BASE_SMALL=0
130CONFIG_MODULES=y 129CONFIG_MODULES=y
131# CONFIG_MODULE_FORCE_LOAD is not set 130# CONFIG_MODULE_FORCE_LOAD is not set
@@ -133,11 +132,9 @@ CONFIG_MODULE_UNLOAD=y
133# CONFIG_MODULE_FORCE_UNLOAD is not set 132# CONFIG_MODULE_FORCE_UNLOAD is not set
134# CONFIG_MODVERSIONS is not set 133# CONFIG_MODVERSIONS is not set
135# CONFIG_MODULE_SRCVERSION_ALL is not set 134# CONFIG_MODULE_SRCVERSION_ALL is not set
136CONFIG_KMOD=y
137CONFIG_BLOCK=y 135CONFIG_BLOCK=y
138CONFIG_LBD=y 136CONFIG_LBD=y
139# CONFIG_BLK_DEV_IO_TRACE is not set 137# CONFIG_BLK_DEV_IO_TRACE is not set
140# CONFIG_LSF is not set
141# CONFIG_BLK_DEV_BSG is not set 138# CONFIG_BLK_DEV_BSG is not set
142# CONFIG_BLK_DEV_INTEGRITY is not set 139# CONFIG_BLK_DEV_INTEGRITY is not set
143 140
@@ -154,6 +151,10 @@ CONFIG_DEFAULT_AS=y
154# CONFIG_DEFAULT_NOOP is not set 151# CONFIG_DEFAULT_NOOP is not set
155CONFIG_DEFAULT_IOSCHED="anticipatory" 152CONFIG_DEFAULT_IOSCHED="anticipatory"
156CONFIG_CLASSIC_RCU=y 153CONFIG_CLASSIC_RCU=y
154# CONFIG_TREE_RCU is not set
155# CONFIG_PREEMPT_RCU is not set
156# CONFIG_TREE_RCU_TRACE is not set
157# CONFIG_PREEMPT_RCU_TRACE is not set
157# CONFIG_FREEZER is not set 158# CONFIG_FREEZER is not set
158# CONFIG_PPC4xx_PCI_EXPRESS is not set 159# CONFIG_PPC4xx_PCI_EXPRESS is not set
159 160
@@ -191,6 +192,7 @@ CONFIG_440GX=y
191# CONFIG_GENERIC_IOMAP is not set 192# CONFIG_GENERIC_IOMAP is not set
192# CONFIG_CPU_FREQ is not set 193# CONFIG_CPU_FREQ is not set
193# CONFIG_FSL_ULI1575 is not set 194# CONFIG_FSL_ULI1575 is not set
195# CONFIG_SIMPLE_GPIO is not set
194 196
195# 197#
196# Kernel options 198# Kernel options
@@ -214,6 +216,7 @@ CONFIG_BINFMT_ELF=y
214# CONFIG_BINFMT_MISC is not set 216# CONFIG_BINFMT_MISC is not set
215# CONFIG_MATH_EMULATION is not set 217# CONFIG_MATH_EMULATION is not set
216# CONFIG_IOMMU_HELPER is not set 218# CONFIG_IOMMU_HELPER is not set
219CONFIG_PPC_NEED_DMA_SYNC_OPS=y
217CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 220CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
218CONFIG_ARCH_HAS_WALK_MEMORY=y 221CONFIG_ARCH_HAS_WALK_MEMORY=y
219CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -228,12 +231,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
228CONFIG_PAGEFLAGS_EXTENDED=y 231CONFIG_PAGEFLAGS_EXTENDED=y
229CONFIG_SPLIT_PTLOCK_CPUS=4 232CONFIG_SPLIT_PTLOCK_CPUS=4
230CONFIG_MIGRATION=y 233CONFIG_MIGRATION=y
231CONFIG_RESOURCES_64BIT=y
232CONFIG_PHYS_ADDR_T_64BIT=y 234CONFIG_PHYS_ADDR_T_64BIT=y
233CONFIG_ZONE_DMA_FLAG=1 235CONFIG_ZONE_DMA_FLAG=1
234CONFIG_BOUNCE=y 236CONFIG_BOUNCE=y
235CONFIG_VIRT_TO_BUS=y 237CONFIG_VIRT_TO_BUS=y
236CONFIG_UNEVICTABLE_LRU=y 238CONFIG_UNEVICTABLE_LRU=y
239CONFIG_PPC_4K_PAGES=y
240# CONFIG_PPC_16K_PAGES is not set
241# CONFIG_PPC_64K_PAGES is not set
237CONFIG_FORCE_MAX_ZONEORDER=11 242CONFIG_FORCE_MAX_ZONEORDER=11
238CONFIG_PROC_DEVICETREE=y 243CONFIG_PROC_DEVICETREE=y
239CONFIG_CMDLINE_BOOL=y 244CONFIG_CMDLINE_BOOL=y
@@ -257,6 +262,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
257# CONFIG_PCI_MSI is not set 262# CONFIG_PCI_MSI is not set
258CONFIG_PCI_LEGACY=y 263CONFIG_PCI_LEGACY=y
259# CONFIG_PCI_DEBUG is not set 264# CONFIG_PCI_DEBUG is not set
265# CONFIG_PCI_STUB is not set
260# CONFIG_PCCARD is not set 266# CONFIG_PCCARD is not set
261# CONFIG_HOTPLUG_PCI is not set 267# CONFIG_HOTPLUG_PCI is not set
262# CONFIG_HAS_RAPIDIO is not set 268# CONFIG_HAS_RAPIDIO is not set
@@ -281,6 +287,7 @@ CONFIG_NET=y
281# 287#
282# Networking options 288# Networking options
283# 289#
290CONFIG_COMPAT_NET_DEV_OPS=y
284CONFIG_PACKET=y 291CONFIG_PACKET=y
285# CONFIG_PACKET_MMAP is not set 292# CONFIG_PACKET_MMAP is not set
286CONFIG_UNIX=y 293CONFIG_UNIX=y
@@ -331,6 +338,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
331# CONFIG_ECONET is not set 338# CONFIG_ECONET is not set
332# CONFIG_WAN_ROUTER is not set 339# CONFIG_WAN_ROUTER is not set
333# CONFIG_NET_SCHED is not set 340# CONFIG_NET_SCHED is not set
341# CONFIG_DCB is not set
334 342
335# 343#
336# Network testing 344# Network testing
@@ -343,6 +351,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
343# CONFIG_AF_RXRPC is not set 351# CONFIG_AF_RXRPC is not set
344# CONFIG_PHONET is not set 352# CONFIG_PHONET is not set
345# CONFIG_WIRELESS is not set 353# CONFIG_WIRELESS is not set
354# CONFIG_WIMAX is not set
346# CONFIG_RFKILL is not set 355# CONFIG_RFKILL is not set
347# CONFIG_NET_9P is not set 356# CONFIG_NET_9P is not set
348 357
@@ -368,6 +377,7 @@ CONFIG_MTD=y
368# CONFIG_MTD_DEBUG is not set 377# CONFIG_MTD_DEBUG is not set
369# CONFIG_MTD_CONCAT is not set 378# CONFIG_MTD_CONCAT is not set
370CONFIG_MTD_PARTITIONS=y 379CONFIG_MTD_PARTITIONS=y
380# CONFIG_MTD_TESTS is not set
371# CONFIG_MTD_REDBOOT_PARTS is not set 381# CONFIG_MTD_REDBOOT_PARTS is not set
372CONFIG_MTD_CMDLINE_PARTS=y 382CONFIG_MTD_CMDLINE_PARTS=y
373# CONFIG_MTD_OF_PARTS is not set 383# CONFIG_MTD_OF_PARTS is not set
@@ -440,6 +450,12 @@ CONFIG_MTD_PHYSMAP_OF=y
440# CONFIG_MTD_ONENAND is not set 450# CONFIG_MTD_ONENAND is not set
441 451
442# 452#
453# LPDDR flash memory drivers
454#
455# CONFIG_MTD_LPDDR is not set
456# CONFIG_MTD_QINFO_PROBE is not set
457
458#
443# UBI - Unsorted block images 459# UBI - Unsorted block images
444# 460#
445# CONFIG_MTD_UBI is not set 461# CONFIG_MTD_UBI is not set
@@ -470,6 +486,7 @@ CONFIG_MISC_DEVICES=y
470# CONFIG_TIFM_CORE is not set 486# CONFIG_TIFM_CORE is not set
471# CONFIG_ENCLOSURE_SERVICES is not set 487# CONFIG_ENCLOSURE_SERVICES is not set
472# CONFIG_HP_ILO is not set 488# CONFIG_HP_ILO is not set
489# CONFIG_C2PORT is not set
473CONFIG_HAVE_IDE=y 490CONFIG_HAVE_IDE=y
474# CONFIG_IDE is not set 491# CONFIG_IDE is not set
475 492
@@ -554,6 +571,7 @@ CONFIG_NETDEV_1000=y
554# CONFIG_JME is not set 571# CONFIG_JME is not set
555CONFIG_NETDEV_10000=y 572CONFIG_NETDEV_10000=y
556# CONFIG_CHELSIO_T1 is not set 573# CONFIG_CHELSIO_T1 is not set
574CONFIG_CHELSIO_T3_DEPENDS=y
557# CONFIG_CHELSIO_T3 is not set 575# CONFIG_CHELSIO_T3 is not set
558# CONFIG_ENIC is not set 576# CONFIG_ENIC is not set
559# CONFIG_IXGBE is not set 577# CONFIG_IXGBE is not set
@@ -576,6 +594,10 @@ CONFIG_NETDEV_10000=y
576# CONFIG_WLAN_PRE80211 is not set 594# CONFIG_WLAN_PRE80211 is not set
577# CONFIG_WLAN_80211 is not set 595# CONFIG_WLAN_80211 is not set
578# CONFIG_IWLWIFI_LEDS is not set 596# CONFIG_IWLWIFI_LEDS is not set
597
598#
599# Enable WiMAX (Networking options) to see the WiMAX drivers
600#
579# CONFIG_WAN is not set 601# CONFIG_WAN is not set
580# CONFIG_FDDI is not set 602# CONFIG_FDDI is not set
581# CONFIG_HIPPI is not set 603# CONFIG_HIPPI is not set
@@ -628,9 +650,12 @@ CONFIG_SERIAL_CORE=y
628CONFIG_SERIAL_CORE_CONSOLE=y 650CONFIG_SERIAL_CORE_CONSOLE=y
629# CONFIG_SERIAL_JSM is not set 651# CONFIG_SERIAL_JSM is not set
630CONFIG_SERIAL_OF_PLATFORM=y 652CONFIG_SERIAL_OF_PLATFORM=y
653# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
631CONFIG_UNIX98_PTYS=y 654CONFIG_UNIX98_PTYS=y
655# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
632CONFIG_LEGACY_PTYS=y 656CONFIG_LEGACY_PTYS=y
633CONFIG_LEGACY_PTY_COUNT=256 657CONFIG_LEGACY_PTY_COUNT=256
658# CONFIG_HVC_UDBG is not set
634# CONFIG_IPMI_HANDLER is not set 659# CONFIG_IPMI_HANDLER is not set
635# CONFIG_HW_RANDOM is not set 660# CONFIG_HW_RANDOM is not set
636# CONFIG_NVRAM is not set 661# CONFIG_NVRAM is not set
@@ -649,11 +674,11 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
649# CONFIG_HWMON is not set 674# CONFIG_HWMON is not set
650CONFIG_THERMAL=y 675CONFIG_THERMAL=y
651# CONFIG_WATCHDOG is not set 676# CONFIG_WATCHDOG is not set
677CONFIG_SSB_POSSIBLE=y
652 678
653# 679#
654# Sonics Silicon Backplane 680# Sonics Silicon Backplane
655# 681#
656CONFIG_SSB_POSSIBLE=y
657# CONFIG_SSB is not set 682# CONFIG_SSB is not set
658 683
659# 684#
@@ -663,7 +688,7 @@ CONFIG_SSB_POSSIBLE=y
663# CONFIG_MFD_SM501 is not set 688# CONFIG_MFD_SM501 is not set
664# CONFIG_HTC_PASIC3 is not set 689# CONFIG_HTC_PASIC3 is not set
665# CONFIG_MFD_TMIO is not set 690# CONFIG_MFD_TMIO is not set
666# CONFIG_MFD_WM8400 is not set 691# CONFIG_REGULATOR is not set
667 692
668# 693#
669# Multimedia devices 694# Multimedia devices
@@ -709,9 +734,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
709# 734#
710 735
711# 736#
712# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 737# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
713# 738#
714# CONFIG_USB_GADGET is not set 739# CONFIG_USB_GADGET is not set
740
741#
742# OTG and related infrastructure
743#
715# CONFIG_UWB is not set 744# CONFIG_UWB is not set
716# CONFIG_MMC is not set 745# CONFIG_MMC is not set
717# CONFIG_MEMSTICK is not set 746# CONFIG_MEMSTICK is not set
@@ -737,7 +766,9 @@ CONFIG_EXT2_FS=y
737# CONFIG_FS_POSIX_ACL is not set 766# CONFIG_FS_POSIX_ACL is not set
738CONFIG_FILE_LOCKING=y 767CONFIG_FILE_LOCKING=y
739# CONFIG_XFS_FS is not set 768# CONFIG_XFS_FS is not set
769# CONFIG_GFS2_FS is not set
740# CONFIG_OCFS2_FS is not set 770# CONFIG_OCFS2_FS is not set
771# CONFIG_BTRFS_FS is not set
741CONFIG_DNOTIFY=y 772CONFIG_DNOTIFY=y
742CONFIG_INOTIFY=y 773CONFIG_INOTIFY=y
743CONFIG_INOTIFY_USER=y 774CONFIG_INOTIFY_USER=y
@@ -771,10 +802,7 @@ CONFIG_TMPFS=y
771# CONFIG_TMPFS_POSIX_ACL is not set 802# CONFIG_TMPFS_POSIX_ACL is not set
772# CONFIG_HUGETLB_PAGE is not set 803# CONFIG_HUGETLB_PAGE is not set
773# CONFIG_CONFIGFS_FS is not set 804# CONFIG_CONFIGFS_FS is not set
774 805CONFIG_MISC_FILESYSTEMS=y
775#
776# Miscellaneous filesystems
777#
778# CONFIG_ADFS_FS is not set 806# CONFIG_ADFS_FS is not set
779# CONFIG_AFFS_FS is not set 807# CONFIG_AFFS_FS is not set
780# CONFIG_HFS_FS is not set 808# CONFIG_HFS_FS is not set
@@ -784,6 +812,7 @@ CONFIG_TMPFS=y
784# CONFIG_EFS_FS is not set 812# CONFIG_EFS_FS is not set
785# CONFIG_JFFS2_FS is not set 813# CONFIG_JFFS2_FS is not set
786CONFIG_CRAMFS=y 814CONFIG_CRAMFS=y
815# CONFIG_SQUASHFS is not set
787# CONFIG_VXFS_FS is not set 816# CONFIG_VXFS_FS is not set
788# CONFIG_MINIX_FS is not set 817# CONFIG_MINIX_FS is not set
789# CONFIG_OMFS_FS is not set 818# CONFIG_OMFS_FS is not set
@@ -824,6 +853,7 @@ CONFIG_MSDOS_PARTITION=y
824# Library routines 853# Library routines
825# 854#
826CONFIG_BITREVERSE=y 855CONFIG_BITREVERSE=y
856CONFIG_GENERIC_FIND_LAST_BIT=y
827# CONFIG_CRC_CCITT is not set 857# CONFIG_CRC_CCITT is not set
828# CONFIG_CRC16 is not set 858# CONFIG_CRC16 is not set
829# CONFIG_CRC_T10DIF is not set 859# CONFIG_CRC_T10DIF is not set
@@ -874,6 +904,7 @@ CONFIG_SCHED_DEBUG=y
874# CONFIG_DEBUG_MEMORY_INIT is not set 904# CONFIG_DEBUG_MEMORY_INIT is not set
875# CONFIG_DEBUG_LIST is not set 905# CONFIG_DEBUG_LIST is not set
876# CONFIG_DEBUG_SG is not set 906# CONFIG_DEBUG_SG is not set
907# CONFIG_DEBUG_NOTIFIERS is not set
877# CONFIG_BOOT_PRINTK_DELAY is not set 908# CONFIG_BOOT_PRINTK_DELAY is not set
878# CONFIG_RCU_TORTURE_TEST is not set 909# CONFIG_RCU_TORTURE_TEST is not set
879# CONFIG_RCU_CPU_STALL_DETECTOR is not set 910# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -882,18 +913,24 @@ CONFIG_SCHED_DEBUG=y
882# CONFIG_FAULT_INJECTION is not set 913# CONFIG_FAULT_INJECTION is not set
883# CONFIG_LATENCYTOP is not set 914# CONFIG_LATENCYTOP is not set
884CONFIG_SYSCTL_SYSCALL_CHECK=y 915CONFIG_SYSCTL_SYSCALL_CHECK=y
885CONFIG_NOP_TRACER=y 916CONFIG_HAVE_FUNCTION_TRACER=y
886CONFIG_HAVE_FTRACE=y
887CONFIG_HAVE_DYNAMIC_FTRACE=y 917CONFIG_HAVE_DYNAMIC_FTRACE=y
888# CONFIG_FTRACE is not set 918CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
919
920#
921# Tracers
922#
923# CONFIG_FUNCTION_TRACER is not set
889# CONFIG_SCHED_TRACER is not set 924# CONFIG_SCHED_TRACER is not set
890# CONFIG_CONTEXT_SWITCH_TRACER is not set 925# CONFIG_CONTEXT_SWITCH_TRACER is not set
891# CONFIG_BOOT_TRACER is not set 926# CONFIG_BOOT_TRACER is not set
927# CONFIG_TRACE_BRANCH_PROFILING is not set
892# CONFIG_STACK_TRACER is not set 928# CONFIG_STACK_TRACER is not set
893# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 929# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
894# CONFIG_SAMPLES is not set 930# CONFIG_SAMPLES is not set
895CONFIG_HAVE_ARCH_KGDB=y 931CONFIG_HAVE_ARCH_KGDB=y
896# CONFIG_KGDB is not set 932# CONFIG_KGDB is not set
933CONFIG_PRINT_STACK_DEPTH=64
897# CONFIG_DEBUG_STACKOVERFLOW is not set 934# CONFIG_DEBUG_STACKOVERFLOW is not set
898# CONFIG_DEBUG_STACK_USAGE is not set 935# CONFIG_DEBUG_STACK_USAGE is not set
899# CONFIG_DEBUG_PAGEALLOC is not set 936# CONFIG_DEBUG_PAGEALLOC is not set
@@ -920,11 +957,15 @@ CONFIG_CRYPTO=y
920# 957#
921# CONFIG_CRYPTO_FIPS is not set 958# CONFIG_CRYPTO_FIPS is not set
922CONFIG_CRYPTO_ALGAPI=y 959CONFIG_CRYPTO_ALGAPI=y
923CONFIG_CRYPTO_AEAD=y 960CONFIG_CRYPTO_ALGAPI2=y
961CONFIG_CRYPTO_AEAD2=y
924CONFIG_CRYPTO_BLKCIPHER=y 962CONFIG_CRYPTO_BLKCIPHER=y
963CONFIG_CRYPTO_BLKCIPHER2=y
925CONFIG_CRYPTO_HASH=y 964CONFIG_CRYPTO_HASH=y
926CONFIG_CRYPTO_RNG=y 965CONFIG_CRYPTO_HASH2=y
966CONFIG_CRYPTO_RNG2=y
927CONFIG_CRYPTO_MANAGER=y 967CONFIG_CRYPTO_MANAGER=y
968CONFIG_CRYPTO_MANAGER2=y
928# CONFIG_CRYPTO_GF128MUL is not set 969# CONFIG_CRYPTO_GF128MUL is not set
929# CONFIG_CRYPTO_NULL is not set 970# CONFIG_CRYPTO_NULL is not set
930# CONFIG_CRYPTO_CRYPTD is not set 971# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig
index 7513d360e0b0..15aab1ca6384 100644
--- a/arch/powerpc/configs/44x/virtex5_defconfig
+++ b/arch/powerpc/configs/44x/virtex5_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc4 3# Linux kernel version: 2.6.29-rc2
4# Fri Nov 14 10:31:16 2008 4# Tue Jan 20 08:22:49 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,6 +18,7 @@ CONFIG_4xx=y
18CONFIG_BOOKE=y 18CONFIG_BOOKE=y
19CONFIG_PTE_64BIT=y 19CONFIG_PTE_64BIT=y
20CONFIG_PHYS_64BIT=y 20CONFIG_PHYS_64BIT=y
21CONFIG_PPC_MMU_NOHASH=y
21# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 24CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_GPIO=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -77,8 +78,8 @@ CONFIG_POSIX_MQUEUE=y
77CONFIG_IKCONFIG=y 78CONFIG_IKCONFIG=y
78CONFIG_IKCONFIG_PROC=y 79CONFIG_IKCONFIG_PROC=y
79CONFIG_LOG_BUF_SHIFT=14 80CONFIG_LOG_BUF_SHIFT=14
80# CONFIG_CGROUPS is not set
81# CONFIG_GROUP_SCHED is not set 81# CONFIG_GROUP_SCHED is not set
82# CONFIG_CGROUPS is not set
82CONFIG_SYSFS_DEPRECATED=y 83CONFIG_SYSFS_DEPRECATED=y
83CONFIG_SYSFS_DEPRECATED_V2=y 84CONFIG_SYSFS_DEPRECATED_V2=y
84# CONFIG_RELAY is not set 85# CONFIG_RELAY is not set
@@ -116,7 +117,6 @@ CONFIG_SLAB=y
116# CONFIG_SLUB is not set 117# CONFIG_SLUB is not set
117# CONFIG_SLOB is not set 118# CONFIG_SLOB is not set
118# CONFIG_PROFILING is not set 119# CONFIG_PROFILING is not set
119# CONFIG_MARKERS is not set
120CONFIG_HAVE_OPROFILE=y 120CONFIG_HAVE_OPROFILE=y
121# CONFIG_KPROBES is not set 121# CONFIG_KPROBES is not set
122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -127,7 +127,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 128CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 129CONFIG_RT_MUTEXES=y
130# CONFIG_TINY_SHMEM is not set
131CONFIG_BASE_SMALL=0 130CONFIG_BASE_SMALL=0
132CONFIG_MODULES=y 131CONFIG_MODULES=y
133# CONFIG_MODULE_FORCE_LOAD is not set 132# CONFIG_MODULE_FORCE_LOAD is not set
@@ -135,11 +134,9 @@ CONFIG_MODULE_UNLOAD=y
135CONFIG_MODULE_FORCE_UNLOAD=y 134CONFIG_MODULE_FORCE_UNLOAD=y
136CONFIG_MODVERSIONS=y 135CONFIG_MODVERSIONS=y
137# CONFIG_MODULE_SRCVERSION_ALL is not set 136# CONFIG_MODULE_SRCVERSION_ALL is not set
138CONFIG_KMOD=y
139CONFIG_BLOCK=y 137CONFIG_BLOCK=y
140# CONFIG_LBD is not set 138# CONFIG_LBD is not set
141# CONFIG_BLK_DEV_IO_TRACE is not set 139# CONFIG_BLK_DEV_IO_TRACE is not set
142# CONFIG_LSF is not set
143# CONFIG_BLK_DEV_BSG is not set 140# CONFIG_BLK_DEV_BSG is not set
144# CONFIG_BLK_DEV_INTEGRITY is not set 141# CONFIG_BLK_DEV_INTEGRITY is not set
145 142
@@ -156,6 +153,10 @@ CONFIG_DEFAULT_CFQ=y
156# CONFIG_DEFAULT_NOOP is not set 153# CONFIG_DEFAULT_NOOP is not set
157CONFIG_DEFAULT_IOSCHED="cfq" 154CONFIG_DEFAULT_IOSCHED="cfq"
158CONFIG_CLASSIC_RCU=y 155CONFIG_CLASSIC_RCU=y
156# CONFIG_TREE_RCU is not set
157# CONFIG_PREEMPT_RCU is not set
158# CONFIG_TREE_RCU_TRACE is not set
159# CONFIG_PREEMPT_RCU_TRACE is not set
159# CONFIG_FREEZER is not set 160# CONFIG_FREEZER is not set
160# CONFIG_PPC4xx_PCI_EXPRESS is not set 161# CONFIG_PPC4xx_PCI_EXPRESS is not set
161 162
@@ -194,6 +195,7 @@ CONFIG_XILINX_VIRTEX_5_FXT=y
194# CONFIG_GENERIC_IOMAP is not set 195# CONFIG_GENERIC_IOMAP is not set
195# CONFIG_CPU_FREQ is not set 196# CONFIG_CPU_FREQ is not set
196# CONFIG_FSL_ULI1575 is not set 197# CONFIG_FSL_ULI1575 is not set
198# CONFIG_SIMPLE_GPIO is not set
197 199
198# 200#
199# Kernel options 201# Kernel options
@@ -211,13 +213,13 @@ CONFIG_HZ=250
211# CONFIG_PREEMPT_NONE is not set 213# CONFIG_PREEMPT_NONE is not set
212# CONFIG_PREEMPT_VOLUNTARY is not set 214# CONFIG_PREEMPT_VOLUNTARY is not set
213CONFIG_PREEMPT=y 215CONFIG_PREEMPT=y
214# CONFIG_PREEMPT_RCU is not set
215CONFIG_BINFMT_ELF=y 216CONFIG_BINFMT_ELF=y
216# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set 217# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
217# CONFIG_HAVE_AOUT is not set 218# CONFIG_HAVE_AOUT is not set
218# CONFIG_BINFMT_MISC is not set 219# CONFIG_BINFMT_MISC is not set
219CONFIG_MATH_EMULATION=y 220CONFIG_MATH_EMULATION=y
220# CONFIG_IOMMU_HELPER is not set 221# CONFIG_IOMMU_HELPER is not set
222CONFIG_PPC_NEED_DMA_SYNC_OPS=y
221CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 223CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
222CONFIG_ARCH_HAS_WALK_MEMORY=y 224CONFIG_ARCH_HAS_WALK_MEMORY=y
223CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 225CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -232,12 +234,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
232CONFIG_PAGEFLAGS_EXTENDED=y 234CONFIG_PAGEFLAGS_EXTENDED=y
233CONFIG_SPLIT_PTLOCK_CPUS=4 235CONFIG_SPLIT_PTLOCK_CPUS=4
234CONFIG_MIGRATION=y 236CONFIG_MIGRATION=y
235CONFIG_RESOURCES_64BIT=y
236CONFIG_PHYS_ADDR_T_64BIT=y 237CONFIG_PHYS_ADDR_T_64BIT=y
237CONFIG_ZONE_DMA_FLAG=1 238CONFIG_ZONE_DMA_FLAG=1
238CONFIG_BOUNCE=y 239CONFIG_BOUNCE=y
239CONFIG_VIRT_TO_BUS=y 240CONFIG_VIRT_TO_BUS=y
240CONFIG_UNEVICTABLE_LRU=y 241CONFIG_UNEVICTABLE_LRU=y
242CONFIG_PPC_4K_PAGES=y
243# CONFIG_PPC_16K_PAGES is not set
244# CONFIG_PPC_64K_PAGES is not set
241CONFIG_FORCE_MAX_ZONEORDER=11 245CONFIG_FORCE_MAX_ZONEORDER=11
242CONFIG_PROC_DEVICETREE=y 246CONFIG_PROC_DEVICETREE=y
243CONFIG_CMDLINE_BOOL=y 247CONFIG_CMDLINE_BOOL=y
@@ -261,6 +265,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
261# CONFIG_PCI_MSI is not set 265# CONFIG_PCI_MSI is not set
262CONFIG_PCI_LEGACY=y 266CONFIG_PCI_LEGACY=y
263# CONFIG_PCI_DEBUG is not set 267# CONFIG_PCI_DEBUG is not set
268# CONFIG_PCI_STUB is not set
264# CONFIG_PCCARD is not set 269# CONFIG_PCCARD is not set
265# CONFIG_HOTPLUG_PCI is not set 270# CONFIG_HOTPLUG_PCI is not set
266# CONFIG_HAS_RAPIDIO is not set 271# CONFIG_HAS_RAPIDIO is not set
@@ -285,6 +290,8 @@ CONFIG_NET=y
285# 290#
286# Networking options 291# Networking options
287# 292#
293# CONFIG_NET_NS is not set
294CONFIG_COMPAT_NET_DEV_OPS=y
288CONFIG_PACKET=y 295CONFIG_PACKET=y
289# CONFIG_PACKET_MMAP is not set 296# CONFIG_PACKET_MMAP is not set
290CONFIG_UNIX=y 297CONFIG_UNIX=y
@@ -428,6 +435,7 @@ CONFIG_IP_NF_MANGLE=m
428# CONFIG_ECONET is not set 435# CONFIG_ECONET is not set
429# CONFIG_WAN_ROUTER is not set 436# CONFIG_WAN_ROUTER is not set
430# CONFIG_NET_SCHED is not set 437# CONFIG_NET_SCHED is not set
438# CONFIG_DCB is not set
431 439
432# 440#
433# Network testing 441# Network testing
@@ -443,8 +451,9 @@ CONFIG_WIRELESS=y
443# CONFIG_CFG80211 is not set 451# CONFIG_CFG80211 is not set
444CONFIG_WIRELESS_OLD_REGULATORY=y 452CONFIG_WIRELESS_OLD_REGULATORY=y
445# CONFIG_WIRELESS_EXT is not set 453# CONFIG_WIRELESS_EXT is not set
454# CONFIG_LIB80211 is not set
446# CONFIG_MAC80211 is not set 455# CONFIG_MAC80211 is not set
447# CONFIG_IEEE80211 is not set 456# CONFIG_WIMAX is not set
448# CONFIG_RFKILL is not set 457# CONFIG_RFKILL is not set
449# CONFIG_NET_9P is not set 458# CONFIG_NET_9P is not set
450 459
@@ -579,6 +588,10 @@ CONFIG_NETDEV_1000=y
579# CONFIG_WLAN_PRE80211 is not set 588# CONFIG_WLAN_PRE80211 is not set
580# CONFIG_WLAN_80211 is not set 589# CONFIG_WLAN_80211 is not set
581# CONFIG_IWLWIFI_LEDS is not set 590# CONFIG_IWLWIFI_LEDS is not set
591
592#
593# Enable WiMAX (Networking options) to see the WiMAX drivers
594#
582# CONFIG_WAN is not set 595# CONFIG_WAN is not set
583# CONFIG_FDDI is not set 596# CONFIG_FDDI is not set
584# CONFIG_HIPPI is not set 597# CONFIG_HIPPI is not set
@@ -679,9 +692,12 @@ CONFIG_SERIAL_CORE=y
679CONFIG_SERIAL_CORE_CONSOLE=y 692CONFIG_SERIAL_CORE_CONSOLE=y
680# CONFIG_SERIAL_JSM is not set 693# CONFIG_SERIAL_JSM is not set
681# CONFIG_SERIAL_OF_PLATFORM is not set 694# CONFIG_SERIAL_OF_PLATFORM is not set
695# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
682CONFIG_UNIX98_PTYS=y 696CONFIG_UNIX98_PTYS=y
697# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
683CONFIG_LEGACY_PTYS=y 698CONFIG_LEGACY_PTYS=y
684CONFIG_LEGACY_PTY_COUNT=256 699CONFIG_LEGACY_PTY_COUNT=256
700# CONFIG_HVC_UDBG is not set
685# CONFIG_IPMI_HANDLER is not set 701# CONFIG_IPMI_HANDLER is not set
686CONFIG_HW_RANDOM=m 702CONFIG_HW_RANDOM=m
687# CONFIG_NVRAM is not set 703# CONFIG_NVRAM is not set
@@ -859,7 +875,6 @@ CONFIG_LOGO_LINUX_CLUT224=y
859# CONFIG_DMADEVICES is not set 875# CONFIG_DMADEVICES is not set
860# CONFIG_UIO is not set 876# CONFIG_UIO is not set
861# CONFIG_STAGING is not set 877# CONFIG_STAGING is not set
862CONFIG_STAGING_EXCLUDE_BUILD=y
863 878
864# 879#
865# File systems 880# File systems
@@ -875,6 +890,7 @@ CONFIG_EXT2_FS=y
875CONFIG_FILE_LOCKING=y 890CONFIG_FILE_LOCKING=y
876# CONFIG_XFS_FS is not set 891# CONFIG_XFS_FS is not set
877# CONFIG_OCFS2_FS is not set 892# CONFIG_OCFS2_FS is not set
893# CONFIG_BTRFS_FS is not set
878CONFIG_DNOTIFY=y 894CONFIG_DNOTIFY=y
879CONFIG_INOTIFY=y 895CONFIG_INOTIFY=y
880CONFIG_INOTIFY_USER=y 896CONFIG_INOTIFY_USER=y
@@ -911,10 +927,7 @@ CONFIG_TMPFS=y
911# CONFIG_TMPFS_POSIX_ACL is not set 927# CONFIG_TMPFS_POSIX_ACL is not set
912# CONFIG_HUGETLB_PAGE is not set 928# CONFIG_HUGETLB_PAGE is not set
913# CONFIG_CONFIGFS_FS is not set 929# CONFIG_CONFIGFS_FS is not set
914 930CONFIG_MISC_FILESYSTEMS=y
915#
916# Miscellaneous filesystems
917#
918# CONFIG_ADFS_FS is not set 931# CONFIG_ADFS_FS is not set
919# CONFIG_AFFS_FS is not set 932# CONFIG_AFFS_FS is not set
920# CONFIG_HFS_FS is not set 933# CONFIG_HFS_FS is not set
@@ -923,6 +936,7 @@ CONFIG_TMPFS=y
923# CONFIG_BFS_FS is not set 936# CONFIG_BFS_FS is not set
924# CONFIG_EFS_FS is not set 937# CONFIG_EFS_FS is not set
925CONFIG_CRAMFS=y 938CONFIG_CRAMFS=y
939# CONFIG_SQUASHFS is not set
926# CONFIG_VXFS_FS is not set 940# CONFIG_VXFS_FS is not set
927# CONFIG_MINIX_FS is not set 941# CONFIG_MINIX_FS is not set
928# CONFIG_OMFS_FS is not set 942# CONFIG_OMFS_FS is not set
@@ -1002,6 +1016,7 @@ CONFIG_NLS_UTF8=m
1002# Library routines 1016# Library routines
1003# 1017#
1004CONFIG_BITREVERSE=y 1018CONFIG_BITREVERSE=y
1019CONFIG_GENERIC_FIND_LAST_BIT=y
1005CONFIG_CRC_CCITT=y 1020CONFIG_CRC_CCITT=y
1006# CONFIG_CRC16 is not set 1021# CONFIG_CRC16 is not set
1007# CONFIG_CRC_T10DIF is not set 1022# CONFIG_CRC_T10DIF is not set
@@ -1051,6 +1066,7 @@ CONFIG_DEBUG_INFO=y
1051CONFIG_DEBUG_MEMORY_INIT=y 1066CONFIG_DEBUG_MEMORY_INIT=y
1052# CONFIG_DEBUG_LIST is not set 1067# CONFIG_DEBUG_LIST is not set
1053# CONFIG_DEBUG_SG is not set 1068# CONFIG_DEBUG_SG is not set
1069# CONFIG_DEBUG_NOTIFIERS is not set
1054# CONFIG_BOOT_PRINTK_DELAY is not set 1070# CONFIG_BOOT_PRINTK_DELAY is not set
1055# CONFIG_RCU_TORTURE_TEST is not set 1071# CONFIG_RCU_TORTURE_TEST is not set
1056# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1072# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1060,6 +1076,8 @@ CONFIG_DEBUG_MEMORY_INIT=y
1060# CONFIG_LATENCYTOP is not set 1076# CONFIG_LATENCYTOP is not set
1061CONFIG_SYSCTL_SYSCALL_CHECK=y 1077CONFIG_SYSCTL_SYSCALL_CHECK=y
1062CONFIG_HAVE_FUNCTION_TRACER=y 1078CONFIG_HAVE_FUNCTION_TRACER=y
1079CONFIG_HAVE_DYNAMIC_FTRACE=y
1080CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1063 1081
1064# 1082#
1065# Tracers 1083# Tracers
@@ -1069,11 +1087,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1069# CONFIG_SCHED_TRACER is not set 1087# CONFIG_SCHED_TRACER is not set
1070# CONFIG_CONTEXT_SWITCH_TRACER is not set 1088# CONFIG_CONTEXT_SWITCH_TRACER is not set
1071# CONFIG_BOOT_TRACER is not set 1089# CONFIG_BOOT_TRACER is not set
1090# CONFIG_TRACE_BRANCH_PROFILING is not set
1072# CONFIG_STACK_TRACER is not set 1091# CONFIG_STACK_TRACER is not set
1073# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1092# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1074# CONFIG_SAMPLES is not set 1093# CONFIG_SAMPLES is not set
1075CONFIG_HAVE_ARCH_KGDB=y 1094CONFIG_HAVE_ARCH_KGDB=y
1076# CONFIG_KGDB is not set 1095# CONFIG_KGDB is not set
1096CONFIG_PRINT_STACK_DEPTH=64
1077# CONFIG_DEBUG_STACKOVERFLOW is not set 1097# CONFIG_DEBUG_STACKOVERFLOW is not set
1078# CONFIG_DEBUG_STACK_USAGE is not set 1098# CONFIG_DEBUG_STACK_USAGE is not set
1079# CONFIG_DEBUG_PAGEALLOC is not set 1099# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1099,6 +1119,7 @@ CONFIG_CRYPTO=y
1099# 1119#
1100# CONFIG_CRYPTO_FIPS is not set 1120# CONFIG_CRYPTO_FIPS is not set
1101# CONFIG_CRYPTO_MANAGER is not set 1121# CONFIG_CRYPTO_MANAGER is not set
1122# CONFIG_CRYPTO_MANAGER2 is not set
1102# CONFIG_CRYPTO_GF128MUL is not set 1123# CONFIG_CRYPTO_GF128MUL is not set
1103# CONFIG_CRYPTO_NULL is not set 1124# CONFIG_CRYPTO_NULL is not set
1104# CONFIG_CRYPTO_CRYPTD is not set 1125# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/44x/warp_defconfig b/arch/powerpc/configs/44x/warp_defconfig
index 031ac6d4212f..3b77f092abe1 100644
--- a/arch/powerpc/configs/44x/warp_defconfig
+++ b/arch/powerpc/configs/44x/warp_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc2 3# Linux kernel version: 2.6.29-rc2
4# Tue Oct 28 09:16:22 2008 4# Fri Jan 23 07:57:16 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -44,7 +45,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
44CONFIG_PPC=y 45CONFIG_PPC=y
45CONFIG_EARLY_PRINTK=y 46CONFIG_EARLY_PRINTK=y
46CONFIG_GENERIC_NVRAM=y 47CONFIG_GENERIC_NVRAM=y
47CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 48CONFIG_SCHED_OMIT_FRAME_POINTER=y
48CONFIG_ARCH_MAY_HAVE_PC_FDC=y 49CONFIG_ARCH_MAY_HAVE_PC_FDC=y
49CONFIG_PPC_OF=y 50CONFIG_PPC_OF=y
50CONFIG_OF=y 51CONFIG_OF=y
@@ -75,12 +76,12 @@ CONFIG_SYSVIPC_SYSCTL=y
75# CONFIG_AUDIT is not set 76# CONFIG_AUDIT is not set
76# CONFIG_IKCONFIG is not set 77# CONFIG_IKCONFIG is not set
77CONFIG_LOG_BUF_SHIFT=14 78CONFIG_LOG_BUF_SHIFT=14
78# CONFIG_CGROUPS is not set
79CONFIG_GROUP_SCHED=y 79CONFIG_GROUP_SCHED=y
80CONFIG_FAIR_GROUP_SCHED=y 80CONFIG_FAIR_GROUP_SCHED=y
81# CONFIG_RT_GROUP_SCHED is not set 81# CONFIG_RT_GROUP_SCHED is not set
82CONFIG_USER_SCHED=y 82CONFIG_USER_SCHED=y
83# CONFIG_CGROUP_SCHED is not set 83# CONFIG_CGROUP_SCHED is not set
84# CONFIG_CGROUPS is not set
84CONFIG_SYSFS_DEPRECATED=y 85CONFIG_SYSFS_DEPRECATED=y
85CONFIG_SYSFS_DEPRECATED_V2=y 86CONFIG_SYSFS_DEPRECATED_V2=y
86# CONFIG_RELAY is not set 87# CONFIG_RELAY is not set
@@ -113,7 +114,6 @@ CONFIG_SLAB=y
113# CONFIG_SLUB is not set 114# CONFIG_SLUB is not set
114# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
115# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
116# CONFIG_MARKERS is not set
117CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
118# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -124,7 +124,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
125CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
126CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
127# CONFIG_TINY_SHMEM is not set
128CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
129CONFIG_MODULES=y 128CONFIG_MODULES=y
130# CONFIG_MODULE_FORCE_LOAD is not set 129# CONFIG_MODULE_FORCE_LOAD is not set
@@ -132,11 +131,9 @@ CONFIG_MODULE_UNLOAD=y
132# CONFIG_MODULE_FORCE_UNLOAD is not set 131# CONFIG_MODULE_FORCE_UNLOAD is not set
133# CONFIG_MODVERSIONS is not set 132# CONFIG_MODVERSIONS is not set
134# CONFIG_MODULE_SRCVERSION_ALL is not set 133# CONFIG_MODULE_SRCVERSION_ALL is not set
135CONFIG_KMOD=y
136CONFIG_BLOCK=y 134CONFIG_BLOCK=y
137# CONFIG_LBD is not set 135# CONFIG_LBD is not set
138# CONFIG_BLK_DEV_IO_TRACE is not set 136# CONFIG_BLK_DEV_IO_TRACE is not set
139# CONFIG_LSF is not set
140# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
141# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
142 139
@@ -153,6 +150,10 @@ CONFIG_DEFAULT_AS=y
153# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
154CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
155CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_TREE_RCU is not set
154# CONFIG_PREEMPT_RCU is not set
155# CONFIG_TREE_RCU_TRACE is not set
156# CONFIG_PREEMPT_RCU_TRACE is not set
156# CONFIG_FREEZER is not set 157# CONFIG_FREEZER is not set
157 158
158# 159#
@@ -190,6 +191,7 @@ CONFIG_IBM440EP_ERR42=y
190# CONFIG_GENERIC_IOMAP is not set 191# CONFIG_GENERIC_IOMAP is not set
191# CONFIG_CPU_FREQ is not set 192# CONFIG_CPU_FREQ is not set
192# CONFIG_FSL_ULI1575 is not set 193# CONFIG_FSL_ULI1575 is not set
194# CONFIG_SIMPLE_GPIO is not set
193 195
194# 196#
195# Kernel options 197# Kernel options
@@ -213,6 +215,7 @@ CONFIG_BINFMT_ELF=y
213# CONFIG_BINFMT_MISC is not set 215# CONFIG_BINFMT_MISC is not set
214# CONFIG_MATH_EMULATION is not set 216# CONFIG_MATH_EMULATION is not set
215# CONFIG_IOMMU_HELPER is not set 217# CONFIG_IOMMU_HELPER is not set
218CONFIG_PPC_NEED_DMA_SYNC_OPS=y
216CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 219CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
217CONFIG_ARCH_HAS_WALK_MEMORY=y 220CONFIG_ARCH_HAS_WALK_MEMORY=y
218CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 221CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -227,12 +230,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
227CONFIG_PAGEFLAGS_EXTENDED=y 230CONFIG_PAGEFLAGS_EXTENDED=y
228CONFIG_SPLIT_PTLOCK_CPUS=4 231CONFIG_SPLIT_PTLOCK_CPUS=4
229CONFIG_MIGRATION=y 232CONFIG_MIGRATION=y
230CONFIG_RESOURCES_64BIT=y
231CONFIG_PHYS_ADDR_T_64BIT=y 233CONFIG_PHYS_ADDR_T_64BIT=y
232CONFIG_ZONE_DMA_FLAG=1 234CONFIG_ZONE_DMA_FLAG=1
233CONFIG_BOUNCE=y 235CONFIG_BOUNCE=y
234CONFIG_VIRT_TO_BUS=y 236CONFIG_VIRT_TO_BUS=y
235CONFIG_UNEVICTABLE_LRU=y 237CONFIG_UNEVICTABLE_LRU=y
238CONFIG_PPC_4K_PAGES=y
239# CONFIG_PPC_16K_PAGES is not set
240# CONFIG_PPC_64K_PAGES is not set
236CONFIG_FORCE_MAX_ZONEORDER=11 241CONFIG_FORCE_MAX_ZONEORDER=11
237CONFIG_PROC_DEVICETREE=y 242CONFIG_PROC_DEVICETREE=y
238CONFIG_CMDLINE_BOOL=y 243CONFIG_CMDLINE_BOOL=y
@@ -273,6 +278,7 @@ CONFIG_NET=y
273# 278#
274# Networking options 279# Networking options
275# 280#
281CONFIG_COMPAT_NET_DEV_OPS=y
276CONFIG_PACKET=y 282CONFIG_PACKET=y
277# CONFIG_PACKET_MMAP is not set 283# CONFIG_PACKET_MMAP is not set
278CONFIG_UNIX=y 284CONFIG_UNIX=y
@@ -348,6 +354,7 @@ CONFIG_VLAN_8021Q=y
348# CONFIG_ECONET is not set 354# CONFIG_ECONET is not set
349# CONFIG_WAN_ROUTER is not set 355# CONFIG_WAN_ROUTER is not set
350# CONFIG_NET_SCHED is not set 356# CONFIG_NET_SCHED is not set
357# CONFIG_DCB is not set
351 358
352# 359#
353# Network testing 360# Network testing
@@ -360,6 +367,7 @@ CONFIG_VLAN_8021Q=y
360# CONFIG_AF_RXRPC is not set 367# CONFIG_AF_RXRPC is not set
361# CONFIG_PHONET is not set 368# CONFIG_PHONET is not set
362# CONFIG_WIRELESS is not set 369# CONFIG_WIRELESS is not set
370# CONFIG_WIMAX is not set
363# CONFIG_RFKILL is not set 371# CONFIG_RFKILL is not set
364# CONFIG_NET_9P is not set 372# CONFIG_NET_9P is not set
365 373
@@ -380,8 +388,9 @@ CONFIG_MTD=y
380# CONFIG_MTD_DEBUG is not set 388# CONFIG_MTD_DEBUG is not set
381# CONFIG_MTD_CONCAT is not set 389# CONFIG_MTD_CONCAT is not set
382CONFIG_MTD_PARTITIONS=y 390CONFIG_MTD_PARTITIONS=y
391# CONFIG_MTD_TESTS is not set
383# CONFIG_MTD_REDBOOT_PARTS is not set 392# CONFIG_MTD_REDBOOT_PARTS is not set
384# CONFIG_MTD_CMDLINE_PARTS is not set 393CONFIG_MTD_CMDLINE_PARTS=y
385CONFIG_MTD_OF_PARTS=y 394CONFIG_MTD_OF_PARTS=y
386# CONFIG_MTD_AR7_PARTS is not set 395# CONFIG_MTD_AR7_PARTS is not set
387 396
@@ -396,7 +405,7 @@ CONFIG_MTD_BLOCK=y
396# CONFIG_INFTL is not set 405# CONFIG_INFTL is not set
397# CONFIG_RFD_FTL is not set 406# CONFIG_RFD_FTL is not set
398# CONFIG_SSFDC is not set 407# CONFIG_SSFDC is not set
399CONFIG_MTD_OOPS=m 408# CONFIG_MTD_OOPS is not set
400 409
401# 410#
402# RAM/ROM/Flash chip drivers 411# RAM/ROM/Flash chip drivers
@@ -450,6 +459,7 @@ CONFIG_MTD_NAND=y
450CONFIG_MTD_NAND_ECC_SMC=y 459CONFIG_MTD_NAND_ECC_SMC=y
451# CONFIG_MTD_NAND_MUSEUM_IDS is not set 460# CONFIG_MTD_NAND_MUSEUM_IDS is not set
452CONFIG_MTD_NAND_IDS=y 461CONFIG_MTD_NAND_IDS=y
462CONFIG_MTD_NAND_NDFC=y
453# CONFIG_MTD_NAND_DISKONCHIP is not set 463# CONFIG_MTD_NAND_DISKONCHIP is not set
454# CONFIG_MTD_NAND_NANDSIM is not set 464# CONFIG_MTD_NAND_NANDSIM is not set
455# CONFIG_MTD_NAND_PLATFORM is not set 465# CONFIG_MTD_NAND_PLATFORM is not set
@@ -458,6 +468,12 @@ CONFIG_MTD_NAND_IDS=y
458# CONFIG_MTD_ONENAND is not set 468# CONFIG_MTD_ONENAND is not set
459 469
460# 470#
471# LPDDR flash memory drivers
472#
473# CONFIG_MTD_LPDDR is not set
474# CONFIG_MTD_QINFO_PROBE is not set
475
476#
461# UBI - Unsorted block images 477# UBI - Unsorted block images
462# 478#
463# CONFIG_MTD_UBI is not set 479# CONFIG_MTD_UBI is not set
@@ -480,7 +496,9 @@ CONFIG_BLK_DEV_RAM_SIZE=4096
480# CONFIG_BLK_DEV_HD is not set 496# CONFIG_BLK_DEV_HD is not set
481CONFIG_MISC_DEVICES=y 497CONFIG_MISC_DEVICES=y
482# CONFIG_EEPROM_93CX6 is not set 498# CONFIG_EEPROM_93CX6 is not set
499# CONFIG_ICS932S401 is not set
483# CONFIG_ENCLOSURE_SERVICES is not set 500# CONFIG_ENCLOSURE_SERVICES is not set
501# CONFIG_C2PORT is not set
484CONFIG_HAVE_IDE=y 502CONFIG_HAVE_IDE=y
485# CONFIG_IDE is not set 503# CONFIG_IDE is not set
486 504
@@ -562,6 +580,10 @@ CONFIG_IBM_NEW_EMAC_ZMII=y
562# CONFIG_IWLWIFI_LEDS is not set 580# CONFIG_IWLWIFI_LEDS is not set
563 581
564# 582#
583# Enable WiMAX (Networking options) to see the WiMAX drivers
584#
585
586#
565# USB Network Adapters 587# USB Network Adapters
566# 588#
567# CONFIG_USB_CATC is not set 589# CONFIG_USB_CATC is not set
@@ -616,9 +638,12 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
616CONFIG_SERIAL_CORE=y 638CONFIG_SERIAL_CORE=y
617CONFIG_SERIAL_CORE_CONSOLE=y 639CONFIG_SERIAL_CORE_CONSOLE=y
618# CONFIG_SERIAL_OF_PLATFORM is not set 640# CONFIG_SERIAL_OF_PLATFORM is not set
641# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
619CONFIG_UNIX98_PTYS=y 642CONFIG_UNIX98_PTYS=y
643# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
620CONFIG_LEGACY_PTYS=y 644CONFIG_LEGACY_PTYS=y
621CONFIG_LEGACY_PTY_COUNT=256 645CONFIG_LEGACY_PTY_COUNT=256
646# CONFIG_HVC_UDBG is not set
622# CONFIG_IPMI_HANDLER is not set 647# CONFIG_IPMI_HANDLER is not set
623CONFIG_HW_RANDOM=y 648CONFIG_HW_RANDOM=y
624# CONFIG_NVRAM is not set 649# CONFIG_NVRAM is not set
@@ -638,7 +663,7 @@ CONFIG_I2C_HELPER_AUTO=y
638# 663#
639# I2C system bus drivers (mostly embedded / system-on-chip) 664# I2C system bus drivers (mostly embedded / system-on-chip)
640# 665#
641# CONFIG_I2C_IBM_IIC is not set 666CONFIG_I2C_IBM_IIC=y
642# CONFIG_I2C_MPC is not set 667# CONFIG_I2C_MPC is not set
643# CONFIG_I2C_OCORES is not set 668# CONFIG_I2C_OCORES is not set
644# CONFIG_I2C_SIMTEC is not set 669# CONFIG_I2C_SIMTEC is not set
@@ -660,7 +685,7 @@ CONFIG_I2C_HELPER_AUTO=y
660# Miscellaneous I2C Chip support 685# Miscellaneous I2C Chip support
661# 686#
662# CONFIG_DS1682 is not set 687# CONFIG_DS1682 is not set
663# CONFIG_EEPROM_AT24 is not set 688CONFIG_EEPROM_AT24=y
664CONFIG_EEPROM_LEGACY=y 689CONFIG_EEPROM_LEGACY=y
665# CONFIG_SENSORS_PCF8574 is not set 690# CONFIG_SENSORS_PCF8574 is not set
666# CONFIG_PCF8575 is not set 691# CONFIG_PCF8575 is not set
@@ -679,7 +704,7 @@ CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
679# CONFIG_POWER_SUPPLY is not set 704# CONFIG_POWER_SUPPLY is not set
680CONFIG_HWMON=y 705CONFIG_HWMON=y
681# CONFIG_HWMON_VID is not set 706# CONFIG_HWMON_VID is not set
682# CONFIG_SENSORS_AD7414 is not set 707CONFIG_SENSORS_AD7414=y
683# CONFIG_SENSORS_AD7418 is not set 708# CONFIG_SENSORS_AD7418 is not set
684# CONFIG_SENSORS_ADM1021 is not set 709# CONFIG_SENSORS_ADM1021 is not set
685# CONFIG_SENSORS_ADM1025 is not set 710# CONFIG_SENSORS_ADM1025 is not set
@@ -687,8 +712,10 @@ CONFIG_HWMON=y
687# CONFIG_SENSORS_ADM1029 is not set 712# CONFIG_SENSORS_ADM1029 is not set
688# CONFIG_SENSORS_ADM1031 is not set 713# CONFIG_SENSORS_ADM1031 is not set
689# CONFIG_SENSORS_ADM9240 is not set 714# CONFIG_SENSORS_ADM9240 is not set
715# CONFIG_SENSORS_ADT7462 is not set
690# CONFIG_SENSORS_ADT7470 is not set 716# CONFIG_SENSORS_ADT7470 is not set
691# CONFIG_SENSORS_ADT7473 is not set 717# CONFIG_SENSORS_ADT7473 is not set
718# CONFIG_SENSORS_ADT7475 is not set
692# CONFIG_SENSORS_ATXP1 is not set 719# CONFIG_SENSORS_ATXP1 is not set
693# CONFIG_SENSORS_DS1621 is not set 720# CONFIG_SENSORS_DS1621 is not set
694# CONFIG_SENSORS_F71805F is not set 721# CONFIG_SENSORS_F71805F is not set
@@ -708,6 +735,7 @@ CONFIG_HWMON=y
708# CONFIG_SENSORS_LM90 is not set 735# CONFIG_SENSORS_LM90 is not set
709# CONFIG_SENSORS_LM92 is not set 736# CONFIG_SENSORS_LM92 is not set
710# CONFIG_SENSORS_LM93 is not set 737# CONFIG_SENSORS_LM93 is not set
738# CONFIG_SENSORS_LTC4245 is not set
711# CONFIG_SENSORS_MAX1619 is not set 739# CONFIG_SENSORS_MAX1619 is not set
712# CONFIG_SENSORS_MAX6650 is not set 740# CONFIG_SENSORS_MAX6650 is not set
713# CONFIG_SENSORS_PC87360 is not set 741# CONFIG_SENSORS_PC87360 is not set
@@ -729,13 +757,26 @@ CONFIG_HWMON=y
729# CONFIG_SENSORS_W83627EHF is not set 757# CONFIG_SENSORS_W83627EHF is not set
730# CONFIG_HWMON_DEBUG_CHIP is not set 758# CONFIG_HWMON_DEBUG_CHIP is not set
731CONFIG_THERMAL=y 759CONFIG_THERMAL=y
732# CONFIG_THERMAL_HWMON is not set 760CONFIG_THERMAL_HWMON=y
733# CONFIG_WATCHDOG is not set 761CONFIG_WATCHDOG=y
762# CONFIG_WATCHDOG_NOWAYOUT is not set
734 763
735# 764#
736# Sonics Silicon Backplane 765# Watchdog Device Drivers
766#
767# CONFIG_SOFT_WATCHDOG is not set
768CONFIG_PIKA_WDT=y
769# CONFIG_BOOKE_WDT is not set
770
771#
772# USB-based Watchdog Cards
737# 773#
774# CONFIG_USBPCWATCHDOG is not set
738CONFIG_SSB_POSSIBLE=y 775CONFIG_SSB_POSSIBLE=y
776
777#
778# Sonics Silicon Backplane
779#
739# CONFIG_SSB is not set 780# CONFIG_SSB is not set
740 781
741# 782#
@@ -744,9 +785,13 @@ CONFIG_SSB_POSSIBLE=y
744# CONFIG_MFD_CORE is not set 785# CONFIG_MFD_CORE is not set
745# CONFIG_MFD_SM501 is not set 786# CONFIG_MFD_SM501 is not set
746# CONFIG_HTC_PASIC3 is not set 787# CONFIG_HTC_PASIC3 is not set
788# CONFIG_TWL4030_CORE is not set
747# CONFIG_MFD_TMIO is not set 789# CONFIG_MFD_TMIO is not set
790# CONFIG_PMIC_DA903X is not set
748# CONFIG_MFD_WM8400 is not set 791# CONFIG_MFD_WM8400 is not set
749# CONFIG_MFD_WM8350_I2C is not set 792# CONFIG_MFD_WM8350_I2C is not set
793# CONFIG_MFD_PCF50633 is not set
794# CONFIG_REGULATOR is not set
750 795
751# 796#
752# Multimedia devices 797# Multimedia devices
@@ -802,6 +847,7 @@ CONFIG_USB_MON=y
802# USB Host Controller Drivers 847# USB Host Controller Drivers
803# 848#
804# CONFIG_USB_C67X00_HCD is not set 849# CONFIG_USB_C67X00_HCD is not set
850# CONFIG_USB_OXU210HP_HCD is not set
805# CONFIG_USB_ISP116X_HCD is not set 851# CONFIG_USB_ISP116X_HCD is not set
806# CONFIG_USB_ISP1760_HCD is not set 852# CONFIG_USB_ISP1760_HCD is not set
807CONFIG_USB_OHCI_HCD=y 853CONFIG_USB_OHCI_HCD=y
@@ -824,18 +870,17 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
824# CONFIG_USB_TMC is not set 870# CONFIG_USB_TMC is not set
825 871
826# 872#
827# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 873# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
828# 874#
829 875
830# 876#
831# may also be needed; see USB_STORAGE Help for more information 877# see USB_STORAGE Help for more information
832# 878#
833CONFIG_USB_STORAGE=y 879CONFIG_USB_STORAGE=y
834# CONFIG_USB_STORAGE_DEBUG is not set 880# CONFIG_USB_STORAGE_DEBUG is not set
835# CONFIG_USB_STORAGE_DATAFAB is not set 881# CONFIG_USB_STORAGE_DATAFAB is not set
836# CONFIG_USB_STORAGE_FREECOM is not set 882# CONFIG_USB_STORAGE_FREECOM is not set
837# CONFIG_USB_STORAGE_ISD200 is not set 883# CONFIG_USB_STORAGE_ISD200 is not set
838# CONFIG_USB_STORAGE_DPCM is not set
839# CONFIG_USB_STORAGE_USBAT is not set 884# CONFIG_USB_STORAGE_USBAT is not set
840# CONFIG_USB_STORAGE_SDDR09 is not set 885# CONFIG_USB_STORAGE_SDDR09 is not set
841# CONFIG_USB_STORAGE_SDDR55 is not set 886# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -880,14 +925,18 @@ CONFIG_USB_STORAGE=y
880# CONFIG_USB_ISIGHTFW is not set 925# CONFIG_USB_ISIGHTFW is not set
881# CONFIG_USB_VST is not set 926# CONFIG_USB_VST is not set
882# CONFIG_USB_GADGET is not set 927# CONFIG_USB_GADGET is not set
883CONFIG_MMC=m 928
929#
930# OTG and related infrastructure
931#
932CONFIG_MMC=y
884# CONFIG_MMC_DEBUG is not set 933# CONFIG_MMC_DEBUG is not set
885# CONFIG_MMC_UNSAFE_RESUME is not set 934# CONFIG_MMC_UNSAFE_RESUME is not set
886 935
887# 936#
888# MMC/SD/SDIO Card Drivers 937# MMC/SD/SDIO Card Drivers
889# 938#
890CONFIG_MMC_BLOCK=m 939CONFIG_MMC_BLOCK=y
891CONFIG_MMC_BLOCK_BOUNCE=y 940CONFIG_MMC_BLOCK_BOUNCE=y
892# CONFIG_SDIO_UART is not set 941# CONFIG_SDIO_UART is not set
893# CONFIG_MMC_TEST is not set 942# CONFIG_MMC_TEST is not set
@@ -898,7 +947,18 @@ CONFIG_MMC_BLOCK_BOUNCE=y
898# CONFIG_MMC_SDHCI is not set 947# CONFIG_MMC_SDHCI is not set
899# CONFIG_MMC_WBSD is not set 948# CONFIG_MMC_WBSD is not set
900# CONFIG_MEMSTICK is not set 949# CONFIG_MEMSTICK is not set
901# CONFIG_NEW_LEDS is not set 950CONFIG_NEW_LEDS=y
951CONFIG_LEDS_CLASS=y
952
953#
954# LED drivers
955#
956# CONFIG_LEDS_PCA955X is not set
957
958#
959# LED Triggers
960#
961# CONFIG_LEDS_TRIGGERS is not set
902# CONFIG_ACCESSIBILITY is not set 962# CONFIG_ACCESSIBILITY is not set
903# CONFIG_EDAC is not set 963# CONFIG_EDAC is not set
904# CONFIG_RTC_CLASS is not set 964# CONFIG_RTC_CLASS is not set
@@ -912,14 +972,18 @@ CONFIG_MMC_BLOCK_BOUNCE=y
912CONFIG_EXT2_FS=y 972CONFIG_EXT2_FS=y
913# CONFIG_EXT2_FS_XATTR is not set 973# CONFIG_EXT2_FS_XATTR is not set
914# CONFIG_EXT2_FS_XIP is not set 974# CONFIG_EXT2_FS_XIP is not set
915# CONFIG_EXT3_FS is not set 975CONFIG_EXT3_FS=y
976# CONFIG_EXT3_FS_XATTR is not set
916# CONFIG_EXT4_FS is not set 977# CONFIG_EXT4_FS is not set
978CONFIG_JBD=y
979# CONFIG_JBD_DEBUG is not set
917# CONFIG_REISERFS_FS is not set 980# CONFIG_REISERFS_FS is not set
918# CONFIG_JFS_FS is not set 981# CONFIG_JFS_FS is not set
919# CONFIG_FS_POSIX_ACL is not set 982# CONFIG_FS_POSIX_ACL is not set
920CONFIG_FILE_LOCKING=y 983CONFIG_FILE_LOCKING=y
921# CONFIG_XFS_FS is not set 984# CONFIG_XFS_FS is not set
922# CONFIG_OCFS2_FS is not set 985# CONFIG_OCFS2_FS is not set
986# CONFIG_BTRFS_FS is not set
923CONFIG_DNOTIFY=y 987CONFIG_DNOTIFY=y
924CONFIG_INOTIFY=y 988CONFIG_INOTIFY=y
925CONFIG_INOTIFY_USER=y 989CONFIG_INOTIFY_USER=y
@@ -952,13 +1016,11 @@ CONFIG_PROC_KCORE=y
952CONFIG_PROC_SYSCTL=y 1016CONFIG_PROC_SYSCTL=y
953CONFIG_PROC_PAGE_MONITOR=y 1017CONFIG_PROC_PAGE_MONITOR=y
954CONFIG_SYSFS=y 1018CONFIG_SYSFS=y
955# CONFIG_TMPFS is not set 1019CONFIG_TMPFS=y
1020# CONFIG_TMPFS_POSIX_ACL is not set
956# CONFIG_HUGETLB_PAGE is not set 1021# CONFIG_HUGETLB_PAGE is not set
957# CONFIG_CONFIGFS_FS is not set 1022# CONFIG_CONFIGFS_FS is not set
958 1023CONFIG_MISC_FILESYSTEMS=y
959#
960# Miscellaneous filesystems
961#
962# CONFIG_ADFS_FS is not set 1024# CONFIG_ADFS_FS is not set
963# CONFIG_AFFS_FS is not set 1025# CONFIG_AFFS_FS is not set
964# CONFIG_HFS_FS is not set 1026# CONFIG_HFS_FS is not set
@@ -978,6 +1040,7 @@ CONFIG_JFFS2_ZLIB=y
978CONFIG_JFFS2_RTIME=y 1040CONFIG_JFFS2_RTIME=y
979# CONFIG_JFFS2_RUBIN is not set 1041# CONFIG_JFFS2_RUBIN is not set
980CONFIG_CRAMFS=y 1042CONFIG_CRAMFS=y
1043# CONFIG_SQUASHFS is not set
981# CONFIG_VXFS_FS is not set 1044# CONFIG_VXFS_FS is not set
982# CONFIG_MINIX_FS is not set 1045# CONFIG_MINIX_FS is not set
983# CONFIG_OMFS_FS is not set 1046# CONFIG_OMFS_FS is not set
@@ -1057,6 +1120,7 @@ CONFIG_NLS_UTF8=y
1057# Library routines 1120# Library routines
1058# 1121#
1059CONFIG_BITREVERSE=y 1122CONFIG_BITREVERSE=y
1123CONFIG_GENERIC_FIND_LAST_BIT=y
1060CONFIG_CRC_CCITT=y 1124CONFIG_CRC_CCITT=y
1061# CONFIG_CRC16 is not set 1125# CONFIG_CRC16 is not set
1062CONFIG_CRC_T10DIF=y 1126CONFIG_CRC_T10DIF=y
@@ -1107,6 +1171,7 @@ CONFIG_DEBUG_INFO=y
1107# CONFIG_DEBUG_MEMORY_INIT is not set 1171# CONFIG_DEBUG_MEMORY_INIT is not set
1108# CONFIG_DEBUG_LIST is not set 1172# CONFIG_DEBUG_LIST is not set
1109# CONFIG_DEBUG_SG is not set 1173# CONFIG_DEBUG_SG is not set
1174# CONFIG_DEBUG_NOTIFIERS is not set
1110# CONFIG_BOOT_PRINTK_DELAY is not set 1175# CONFIG_BOOT_PRINTK_DELAY is not set
1111# CONFIG_RCU_TORTURE_TEST is not set 1176# CONFIG_RCU_TORTURE_TEST is not set
1112# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1177# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1115,18 +1180,24 @@ CONFIG_DEBUG_INFO=y
1115# CONFIG_FAULT_INJECTION is not set 1180# CONFIG_FAULT_INJECTION is not set
1116# CONFIG_LATENCYTOP is not set 1181# CONFIG_LATENCYTOP is not set
1117CONFIG_SYSCTL_SYSCALL_CHECK=y 1182CONFIG_SYSCTL_SYSCALL_CHECK=y
1118CONFIG_NOP_TRACER=y 1183CONFIG_HAVE_FUNCTION_TRACER=y
1119CONFIG_HAVE_FTRACE=y
1120CONFIG_HAVE_DYNAMIC_FTRACE=y 1184CONFIG_HAVE_DYNAMIC_FTRACE=y
1121# CONFIG_FTRACE is not set 1185CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1186
1187#
1188# Tracers
1189#
1190# CONFIG_FUNCTION_TRACER is not set
1122# CONFIG_SCHED_TRACER is not set 1191# CONFIG_SCHED_TRACER is not set
1123# CONFIG_CONTEXT_SWITCH_TRACER is not set 1192# CONFIG_CONTEXT_SWITCH_TRACER is not set
1124# CONFIG_BOOT_TRACER is not set 1193# CONFIG_BOOT_TRACER is not set
1194# CONFIG_TRACE_BRANCH_PROFILING is not set
1125# CONFIG_STACK_TRACER is not set 1195# CONFIG_STACK_TRACER is not set
1126# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1196# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1127# CONFIG_SAMPLES is not set 1197# CONFIG_SAMPLES is not set
1128CONFIG_HAVE_ARCH_KGDB=y 1198CONFIG_HAVE_ARCH_KGDB=y
1129# CONFIG_KGDB is not set 1199# CONFIG_KGDB is not set
1200CONFIG_PRINT_STACK_DEPTH=64
1130# CONFIG_DEBUG_STACKOVERFLOW is not set 1201# CONFIG_DEBUG_STACKOVERFLOW is not set
1131# CONFIG_DEBUG_STACK_USAGE is not set 1202# CONFIG_DEBUG_STACK_USAGE is not set
1132# CONFIG_DEBUG_PAGEALLOC is not set 1203# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1134,7 +1205,7 @@ CONFIG_HAVE_ARCH_KGDB=y
1134# CONFIG_FTR_FIXUP_SELFTEST is not set 1205# CONFIG_FTR_FIXUP_SELFTEST is not set
1135# CONFIG_MSI_BITMAP_SELFTEST is not set 1206# CONFIG_MSI_BITMAP_SELFTEST is not set
1136# CONFIG_XMON is not set 1207# CONFIG_XMON is not set
1137# CONFIG_IRQSTACKS is not set 1208CONFIG_IRQSTACKS=y
1138# CONFIG_VIRQ_DEBUG is not set 1209# CONFIG_VIRQ_DEBUG is not set
1139CONFIG_BDI_SWITCH=y 1210CONFIG_BDI_SWITCH=y
1140# CONFIG_PPC_EARLY_DEBUG is not set 1211# CONFIG_PPC_EARLY_DEBUG is not set
@@ -1153,6 +1224,7 @@ CONFIG_CRYPTO=y
1153# 1224#
1154# CONFIG_CRYPTO_FIPS is not set 1225# CONFIG_CRYPTO_FIPS is not set
1155# CONFIG_CRYPTO_MANAGER is not set 1226# CONFIG_CRYPTO_MANAGER is not set
1227# CONFIG_CRYPTO_MANAGER2 is not set
1156# CONFIG_CRYPTO_GF128MUL is not set 1228# CONFIG_CRYPTO_GF128MUL is not set
1157# CONFIG_CRYPTO_NULL is not set 1229# CONFIG_CRYPTO_NULL is not set
1158# CONFIG_CRYPTO_CRYPTD is not set 1230# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/ppc40x_defconfig b/arch/powerpc/configs/ppc40x_defconfig
index 2d72ee7a8d60..326205cabf77 100644
--- a/arch/powerpc/configs/ppc40x_defconfig
+++ b/arch/powerpc/configs/ppc40x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc4 3# Linux kernel version: 2.6.29-rc2
4# Fri Nov 14 09:54:44 2008 4# Fri Jan 23 08:44:03 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -15,6 +15,7 @@ CONFIG_40x=y
15# CONFIG_44x is not set 15# CONFIG_44x is not set
16# CONFIG_E200 is not set 16# CONFIG_E200 is not set
17CONFIG_4xx=y 17CONFIG_4xx=y
18CONFIG_PPC_MMU_NOHASH=y
18# CONFIG_PPC_MM_SLICES is not set 19# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 20CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 21CONFIG_PPC32=y
@@ -41,7 +42,7 @@ CONFIG_GENERIC_GPIO=y
41CONFIG_PPC=y 42CONFIG_PPC=y
42CONFIG_EARLY_PRINTK=y 43CONFIG_EARLY_PRINTK=y
43CONFIG_GENERIC_NVRAM=y 44CONFIG_GENERIC_NVRAM=y
44CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 45CONFIG_SCHED_OMIT_FRAME_POINTER=y
45CONFIG_ARCH_MAY_HAVE_PC_FDC=y 46CONFIG_ARCH_MAY_HAVE_PC_FDC=y
46CONFIG_PPC_OF=y 47CONFIG_PPC_OF=y
47CONFIG_OF=y 48CONFIG_OF=y
@@ -72,12 +73,12 @@ CONFIG_POSIX_MQUEUE=y
72# CONFIG_AUDIT is not set 73# CONFIG_AUDIT is not set
73# CONFIG_IKCONFIG is not set 74# CONFIG_IKCONFIG is not set
74CONFIG_LOG_BUF_SHIFT=14 75CONFIG_LOG_BUF_SHIFT=14
75# CONFIG_CGROUPS is not set
76CONFIG_GROUP_SCHED=y 76CONFIG_GROUP_SCHED=y
77CONFIG_FAIR_GROUP_SCHED=y 77CONFIG_FAIR_GROUP_SCHED=y
78# CONFIG_RT_GROUP_SCHED is not set 78# CONFIG_RT_GROUP_SCHED is not set
79CONFIG_USER_SCHED=y 79CONFIG_USER_SCHED=y
80# CONFIG_CGROUP_SCHED is not set 80# CONFIG_CGROUP_SCHED is not set
81# CONFIG_CGROUPS is not set
81CONFIG_SYSFS_DEPRECATED=y 82CONFIG_SYSFS_DEPRECATED=y
82CONFIG_SYSFS_DEPRECATED_V2=y 83CONFIG_SYSFS_DEPRECATED_V2=y
83# CONFIG_RELAY is not set 84# CONFIG_RELAY is not set
@@ -90,6 +91,7 @@ CONFIG_EMBEDDED=y
90CONFIG_SYSCTL_SYSCALL=y 91CONFIG_SYSCTL_SYSCALL=y
91CONFIG_KALLSYMS=y 92CONFIG_KALLSYMS=y
92CONFIG_KALLSYMS_ALL=y 93CONFIG_KALLSYMS_ALL=y
94CONFIG_KALLSYMS_STRIP_GENERATED=y
93CONFIG_KALLSYMS_EXTRA_PASS=y 95CONFIG_KALLSYMS_EXTRA_PASS=y
94CONFIG_HOTPLUG=y 96CONFIG_HOTPLUG=y
95CONFIG_PRINTK=y 97CONFIG_PRINTK=y
@@ -112,7 +114,6 @@ CONFIG_SLUB_DEBUG=y
112CONFIG_SLUB=y 114CONFIG_SLUB=y
113# CONFIG_SLOB is not set 115# CONFIG_SLOB is not set
114# CONFIG_PROFILING is not set 116# CONFIG_PROFILING is not set
115# CONFIG_MARKERS is not set
116CONFIG_HAVE_OPROFILE=y 117CONFIG_HAVE_OPROFILE=y
117# CONFIG_KPROBES is not set 118# CONFIG_KPROBES is not set
118CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 119CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -123,7 +124,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
123# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 124# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
124CONFIG_SLABINFO=y 125CONFIG_SLABINFO=y
125CONFIG_RT_MUTEXES=y 126CONFIG_RT_MUTEXES=y
126# CONFIG_TINY_SHMEM is not set
127CONFIG_BASE_SMALL=0 127CONFIG_BASE_SMALL=0
128CONFIG_MODULES=y 128CONFIG_MODULES=y
129# CONFIG_MODULE_FORCE_LOAD is not set 129# CONFIG_MODULE_FORCE_LOAD is not set
@@ -131,11 +131,9 @@ CONFIG_MODULE_UNLOAD=y
131# CONFIG_MODULE_FORCE_UNLOAD is not set 131# CONFIG_MODULE_FORCE_UNLOAD is not set
132# CONFIG_MODVERSIONS is not set 132# CONFIG_MODVERSIONS is not set
133# CONFIG_MODULE_SRCVERSION_ALL is not set 133# CONFIG_MODULE_SRCVERSION_ALL is not set
134CONFIG_KMOD=y
135CONFIG_BLOCK=y 134CONFIG_BLOCK=y
136CONFIG_LBD=y 135CONFIG_LBD=y
137# CONFIG_BLK_DEV_IO_TRACE is not set 136# CONFIG_BLK_DEV_IO_TRACE is not set
138# CONFIG_LSF is not set
139# CONFIG_BLK_DEV_BSG is not set 137# CONFIG_BLK_DEV_BSG is not set
140# CONFIG_BLK_DEV_INTEGRITY is not set 138# CONFIG_BLK_DEV_INTEGRITY is not set
141 139
@@ -152,6 +150,10 @@ CONFIG_DEFAULT_AS=y
152# CONFIG_DEFAULT_NOOP is not set 150# CONFIG_DEFAULT_NOOP is not set
153CONFIG_DEFAULT_IOSCHED="anticipatory" 151CONFIG_DEFAULT_IOSCHED="anticipatory"
154CONFIG_CLASSIC_RCU=y 152CONFIG_CLASSIC_RCU=y
153# CONFIG_TREE_RCU is not set
154# CONFIG_PREEMPT_RCU is not set
155# CONFIG_TREE_RCU_TRACE is not set
156# CONFIG_PREEMPT_RCU_TRACE is not set
155# CONFIG_FREEZER is not set 157# CONFIG_FREEZER is not set
156CONFIG_PPC4xx_PCI_EXPRESS=y 158CONFIG_PPC4xx_PCI_EXPRESS=y
157 159
@@ -192,6 +194,7 @@ CONFIG_IBM405_ERR51=y
192# CONFIG_CPU_FREQ is not set 194# CONFIG_CPU_FREQ is not set
193# CONFIG_FSL_ULI1575 is not set 195# CONFIG_FSL_ULI1575 is not set
194CONFIG_OF_RTC=y 196CONFIG_OF_RTC=y
197# CONFIG_SIMPLE_GPIO is not set
195 198
196# 199#
197# Kernel options 200# Kernel options
@@ -215,6 +218,7 @@ CONFIG_BINFMT_ELF=y
215# CONFIG_BINFMT_MISC is not set 218# CONFIG_BINFMT_MISC is not set
216# CONFIG_MATH_EMULATION is not set 219# CONFIG_MATH_EMULATION is not set
217# CONFIG_IOMMU_HELPER is not set 220# CONFIG_IOMMU_HELPER is not set
221CONFIG_PPC_NEED_DMA_SYNC_OPS=y
218CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 222CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
219CONFIG_ARCH_HAS_WALK_MEMORY=y 223CONFIG_ARCH_HAS_WALK_MEMORY=y
220CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 224CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -229,12 +233,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
229CONFIG_PAGEFLAGS_EXTENDED=y 233CONFIG_PAGEFLAGS_EXTENDED=y
230CONFIG_SPLIT_PTLOCK_CPUS=4 234CONFIG_SPLIT_PTLOCK_CPUS=4
231CONFIG_MIGRATION=y 235CONFIG_MIGRATION=y
232CONFIG_RESOURCES_64BIT=y
233# CONFIG_PHYS_ADDR_T_64BIT is not set 236# CONFIG_PHYS_ADDR_T_64BIT is not set
234CONFIG_ZONE_DMA_FLAG=1 237CONFIG_ZONE_DMA_FLAG=1
235CONFIG_BOUNCE=y 238CONFIG_BOUNCE=y
236CONFIG_VIRT_TO_BUS=y 239CONFIG_VIRT_TO_BUS=y
237CONFIG_UNEVICTABLE_LRU=y 240CONFIG_UNEVICTABLE_LRU=y
241CONFIG_PPC_4K_PAGES=y
242# CONFIG_PPC_16K_PAGES is not set
243# CONFIG_PPC_64K_PAGES is not set
238CONFIG_FORCE_MAX_ZONEORDER=11 244CONFIG_FORCE_MAX_ZONEORDER=11
239CONFIG_PROC_DEVICETREE=y 245CONFIG_PROC_DEVICETREE=y
240# CONFIG_CMDLINE_BOOL is not set 246# CONFIG_CMDLINE_BOOL is not set
@@ -258,6 +264,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
258# CONFIG_PCI_MSI is not set 264# CONFIG_PCI_MSI is not set
259# CONFIG_PCI_LEGACY is not set 265# CONFIG_PCI_LEGACY is not set
260# CONFIG_PCI_DEBUG is not set 266# CONFIG_PCI_DEBUG is not set
267# CONFIG_PCI_STUB is not set
261# CONFIG_PCCARD is not set 268# CONFIG_PCCARD is not set
262# CONFIG_HOTPLUG_PCI is not set 269# CONFIG_HOTPLUG_PCI is not set
263# CONFIG_HAS_RAPIDIO is not set 270# CONFIG_HAS_RAPIDIO is not set
@@ -282,6 +289,7 @@ CONFIG_NET=y
282# 289#
283# Networking options 290# Networking options
284# 291#
292CONFIG_COMPAT_NET_DEV_OPS=y
285CONFIG_PACKET=y 293CONFIG_PACKET=y
286# CONFIG_PACKET_MMAP is not set 294# CONFIG_PACKET_MMAP is not set
287CONFIG_UNIX=y 295CONFIG_UNIX=y
@@ -355,6 +363,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
355# CONFIG_ECONET is not set 363# CONFIG_ECONET is not set
356# CONFIG_WAN_ROUTER is not set 364# CONFIG_WAN_ROUTER is not set
357# CONFIG_NET_SCHED is not set 365# CONFIG_NET_SCHED is not set
366# CONFIG_DCB is not set
358 367
359# 368#
360# Network testing 369# Network testing
@@ -370,8 +379,9 @@ CONFIG_WIRELESS=y
370# CONFIG_CFG80211 is not set 379# CONFIG_CFG80211 is not set
371CONFIG_WIRELESS_OLD_REGULATORY=y 380CONFIG_WIRELESS_OLD_REGULATORY=y
372# CONFIG_WIRELESS_EXT is not set 381# CONFIG_WIRELESS_EXT is not set
382# CONFIG_LIB80211 is not set
373# CONFIG_MAC80211 is not set 383# CONFIG_MAC80211 is not set
374# CONFIG_IEEE80211 is not set 384# CONFIG_WIMAX is not set
375# CONFIG_RFKILL is not set 385# CONFIG_RFKILL is not set
376# CONFIG_NET_9P is not set 386# CONFIG_NET_9P is not set
377 387
@@ -397,6 +407,7 @@ CONFIG_MTD=y
397# CONFIG_MTD_DEBUG is not set 407# CONFIG_MTD_DEBUG is not set
398# CONFIG_MTD_CONCAT is not set 408# CONFIG_MTD_CONCAT is not set
399CONFIG_MTD_PARTITIONS=y 409CONFIG_MTD_PARTITIONS=y
410# CONFIG_MTD_TESTS is not set
400# CONFIG_MTD_REDBOOT_PARTS is not set 411# CONFIG_MTD_REDBOOT_PARTS is not set
401CONFIG_MTD_CMDLINE_PARTS=y 412CONFIG_MTD_CMDLINE_PARTS=y
402CONFIG_MTD_OF_PARTS=y 413CONFIG_MTD_OF_PARTS=y
@@ -469,6 +480,12 @@ CONFIG_MTD_PHYSMAP_OF=y
469# CONFIG_MTD_ONENAND is not set 480# CONFIG_MTD_ONENAND is not set
470 481
471# 482#
483# LPDDR flash memory drivers
484#
485# CONFIG_MTD_LPDDR is not set
486# CONFIG_MTD_QINFO_PROBE is not set
487
488#
472# UBI - Unsorted block images 489# UBI - Unsorted block images
473# 490#
474CONFIG_MTD_UBI=m 491CONFIG_MTD_UBI=m
@@ -593,6 +610,7 @@ CONFIG_NETDEV_1000=y
593# CONFIG_JME is not set 610# CONFIG_JME is not set
594CONFIG_NETDEV_10000=y 611CONFIG_NETDEV_10000=y
595# CONFIG_CHELSIO_T1 is not set 612# CONFIG_CHELSIO_T1 is not set
613CONFIG_CHELSIO_T3_DEPENDS=y
596# CONFIG_CHELSIO_T3 is not set 614# CONFIG_CHELSIO_T3 is not set
597# CONFIG_ENIC is not set 615# CONFIG_ENIC is not set
598# CONFIG_IXGBE is not set 616# CONFIG_IXGBE is not set
@@ -615,6 +633,10 @@ CONFIG_NETDEV_10000=y
615# CONFIG_WLAN_PRE80211 is not set 633# CONFIG_WLAN_PRE80211 is not set
616# CONFIG_WLAN_80211 is not set 634# CONFIG_WLAN_80211 is not set
617# CONFIG_IWLWIFI_LEDS is not set 635# CONFIG_IWLWIFI_LEDS is not set
636
637#
638# Enable WiMAX (Networking options) to see the WiMAX drivers
639#
618# CONFIG_WAN is not set 640# CONFIG_WAN is not set
619# CONFIG_FDDI is not set 641# CONFIG_FDDI is not set
620# CONFIG_HIPPI is not set 642# CONFIG_HIPPI is not set
@@ -674,9 +696,12 @@ CONFIG_SERIAL_CORE=y
674CONFIG_SERIAL_CORE_CONSOLE=y 696CONFIG_SERIAL_CORE_CONSOLE=y
675# CONFIG_SERIAL_JSM is not set 697# CONFIG_SERIAL_JSM is not set
676CONFIG_SERIAL_OF_PLATFORM=y 698CONFIG_SERIAL_OF_PLATFORM=y
699# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
677CONFIG_UNIX98_PTYS=y 700CONFIG_UNIX98_PTYS=y
701# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
678CONFIG_LEGACY_PTYS=y 702CONFIG_LEGACY_PTYS=y
679CONFIG_LEGACY_PTY_COUNT=256 703CONFIG_LEGACY_PTY_COUNT=256
704# CONFIG_HVC_UDBG is not set
680# CONFIG_IPMI_HANDLER is not set 705# CONFIG_IPMI_HANDLER is not set
681# CONFIG_HW_RANDOM is not set 706# CONFIG_HW_RANDOM is not set
682# CONFIG_NVRAM is not set 707# CONFIG_NVRAM is not set
@@ -751,7 +776,6 @@ CONFIG_I2C_IBM_IIC=m
751# CONFIG_PCF8575 is not set 776# CONFIG_PCF8575 is not set
752# CONFIG_SENSORS_PCA9539 is not set 777# CONFIG_SENSORS_PCA9539 is not set
753# CONFIG_SENSORS_PCF8591 is not set 778# CONFIG_SENSORS_PCF8591 is not set
754# CONFIG_TPS65010 is not set
755# CONFIG_SENSORS_MAX6875 is not set 779# CONFIG_SENSORS_MAX6875 is not set
756# CONFIG_SENSORS_TSL2550 is not set 780# CONFIG_SENSORS_TSL2550 is not set
757# CONFIG_I2C_DEBUG_CORE is not set 781# CONFIG_I2C_DEBUG_CORE is not set
@@ -803,9 +827,11 @@ CONFIG_SSB_POSSIBLE=y
803# CONFIG_MFD_CORE is not set 827# CONFIG_MFD_CORE is not set
804# CONFIG_MFD_SM501 is not set 828# CONFIG_MFD_SM501 is not set
805# CONFIG_HTC_PASIC3 is not set 829# CONFIG_HTC_PASIC3 is not set
830# CONFIG_TPS65010 is not set
806# CONFIG_MFD_TMIO is not set 831# CONFIG_MFD_TMIO is not set
807# CONFIG_MFD_WM8400 is not set 832# CONFIG_MFD_WM8400 is not set
808# CONFIG_MFD_WM8350_I2C is not set 833# CONFIG_MFD_WM8350_I2C is not set
834# CONFIG_MFD_PCF50633 is not set
809# CONFIG_REGULATOR is not set 835# CONFIG_REGULATOR is not set
810 836
811# 837#
@@ -904,9 +930,13 @@ CONFIG_USB_ARCH_HAS_EHCI=y
904# 930#
905 931
906# 932#
907# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' 933# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
908# 934#
909# CONFIG_USB_GADGET is not set 935# CONFIG_USB_GADGET is not set
936
937#
938# OTG and related infrastructure
939#
910# CONFIG_UWB is not set 940# CONFIG_UWB is not set
911# CONFIG_MMC is not set 941# CONFIG_MMC is not set
912# CONFIG_MEMSTICK is not set 942# CONFIG_MEMSTICK is not set
@@ -918,7 +948,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
918# CONFIG_DMADEVICES is not set 948# CONFIG_DMADEVICES is not set
919# CONFIG_UIO is not set 949# CONFIG_UIO is not set
920# CONFIG_STAGING is not set 950# CONFIG_STAGING is not set
921CONFIG_STAGING_EXCLUDE_BUILD=y
922 951
923# 952#
924# File systems 953# File systems
@@ -939,7 +968,9 @@ CONFIG_FS_MBCACHE=m
939# CONFIG_FS_POSIX_ACL is not set 968# CONFIG_FS_POSIX_ACL is not set
940CONFIG_FILE_LOCKING=y 969CONFIG_FILE_LOCKING=y
941# CONFIG_XFS_FS is not set 970# CONFIG_XFS_FS is not set
971# CONFIG_GFS2_FS is not set
942# CONFIG_OCFS2_FS is not set 972# CONFIG_OCFS2_FS is not set
973# CONFIG_BTRFS_FS is not set
943CONFIG_DNOTIFY=y 974CONFIG_DNOTIFY=y
944CONFIG_INOTIFY=y 975CONFIG_INOTIFY=y
945CONFIG_INOTIFY_USER=y 976CONFIG_INOTIFY_USER=y
@@ -976,10 +1007,7 @@ CONFIG_TMPFS=y
976# CONFIG_TMPFS_POSIX_ACL is not set 1007# CONFIG_TMPFS_POSIX_ACL is not set
977# CONFIG_HUGETLB_PAGE is not set 1008# CONFIG_HUGETLB_PAGE is not set
978# CONFIG_CONFIGFS_FS is not set 1009# CONFIG_CONFIGFS_FS is not set
979 1010CONFIG_MISC_FILESYSTEMS=y
980#
981# Miscellaneous filesystems
982#
983# CONFIG_ADFS_FS is not set 1011# CONFIG_ADFS_FS is not set
984# CONFIG_AFFS_FS is not set 1012# CONFIG_AFFS_FS is not set
985# CONFIG_HFS_FS is not set 1013# CONFIG_HFS_FS is not set
@@ -1005,6 +1033,7 @@ CONFIG_UBIFS_FS_LZO=y
1005CONFIG_UBIFS_FS_ZLIB=y 1033CONFIG_UBIFS_FS_ZLIB=y
1006# CONFIG_UBIFS_FS_DEBUG is not set 1034# CONFIG_UBIFS_FS_DEBUG is not set
1007CONFIG_CRAMFS=y 1035CONFIG_CRAMFS=y
1036# CONFIG_SQUASHFS is not set
1008# CONFIG_VXFS_FS is not set 1037# CONFIG_VXFS_FS is not set
1009# CONFIG_MINIX_FS is not set 1038# CONFIG_MINIX_FS is not set
1010# CONFIG_OMFS_FS is not set 1039# CONFIG_OMFS_FS is not set
@@ -1084,6 +1113,7 @@ CONFIG_NLS_ISO8859_1=m
1084# Library routines 1113# Library routines
1085# 1114#
1086CONFIG_BITREVERSE=y 1115CONFIG_BITREVERSE=y
1116CONFIG_GENERIC_FIND_LAST_BIT=y
1087# CONFIG_CRC_CCITT is not set 1117# CONFIG_CRC_CCITT is not set
1088CONFIG_CRC16=m 1118CONFIG_CRC16=m
1089# CONFIG_CRC_T10DIF is not set 1119# CONFIG_CRC_T10DIF is not set
@@ -1137,6 +1167,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
1137# CONFIG_DEBUG_MEMORY_INIT is not set 1167# CONFIG_DEBUG_MEMORY_INIT is not set
1138# CONFIG_DEBUG_LIST is not set 1168# CONFIG_DEBUG_LIST is not set
1139# CONFIG_DEBUG_SG is not set 1169# CONFIG_DEBUG_SG is not set
1170# CONFIG_DEBUG_NOTIFIERS is not set
1140# CONFIG_BOOT_PRINTK_DELAY is not set 1171# CONFIG_BOOT_PRINTK_DELAY is not set
1141# CONFIG_RCU_TORTURE_TEST is not set 1172# CONFIG_RCU_TORTURE_TEST is not set
1142# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1173# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1146,6 +1177,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
1146# CONFIG_LATENCYTOP is not set 1177# CONFIG_LATENCYTOP is not set
1147CONFIG_SYSCTL_SYSCALL_CHECK=y 1178CONFIG_SYSCTL_SYSCALL_CHECK=y
1148CONFIG_HAVE_FUNCTION_TRACER=y 1179CONFIG_HAVE_FUNCTION_TRACER=y
1180CONFIG_HAVE_DYNAMIC_FTRACE=y
1181CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1149 1182
1150# 1183#
1151# Tracers 1184# Tracers
@@ -1154,11 +1187,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1154# CONFIG_SCHED_TRACER is not set 1187# CONFIG_SCHED_TRACER is not set
1155# CONFIG_CONTEXT_SWITCH_TRACER is not set 1188# CONFIG_CONTEXT_SWITCH_TRACER is not set
1156# CONFIG_BOOT_TRACER is not set 1189# CONFIG_BOOT_TRACER is not set
1190# CONFIG_TRACE_BRANCH_PROFILING is not set
1157# CONFIG_STACK_TRACER is not set 1191# CONFIG_STACK_TRACER is not set
1158# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1192# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1159# CONFIG_SAMPLES is not set 1193# CONFIG_SAMPLES is not set
1160CONFIG_HAVE_ARCH_KGDB=y 1194CONFIG_HAVE_ARCH_KGDB=y
1161# CONFIG_KGDB is not set 1195# CONFIG_KGDB is not set
1196CONFIG_PRINT_STACK_DEPTH=64
1162# CONFIG_DEBUG_STACKOVERFLOW is not set 1197# CONFIG_DEBUG_STACKOVERFLOW is not set
1163# CONFIG_DEBUG_STACK_USAGE is not set 1198# CONFIG_DEBUG_STACK_USAGE is not set
1164# CONFIG_DEBUG_PAGEALLOC is not set 1199# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1185,11 +1220,15 @@ CONFIG_CRYPTO=y
1185# 1220#
1186# CONFIG_CRYPTO_FIPS is not set 1221# CONFIG_CRYPTO_FIPS is not set
1187CONFIG_CRYPTO_ALGAPI=y 1222CONFIG_CRYPTO_ALGAPI=y
1188CONFIG_CRYPTO_AEAD=y 1223CONFIG_CRYPTO_ALGAPI2=y
1224CONFIG_CRYPTO_AEAD2=y
1189CONFIG_CRYPTO_BLKCIPHER=y 1225CONFIG_CRYPTO_BLKCIPHER=y
1226CONFIG_CRYPTO_BLKCIPHER2=y
1190CONFIG_CRYPTO_HASH=y 1227CONFIG_CRYPTO_HASH=y
1191CONFIG_CRYPTO_RNG=y 1228CONFIG_CRYPTO_HASH2=y
1229CONFIG_CRYPTO_RNG2=y
1192CONFIG_CRYPTO_MANAGER=y 1230CONFIG_CRYPTO_MANAGER=y
1231CONFIG_CRYPTO_MANAGER2=y
1193# CONFIG_CRYPTO_GF128MUL is not set 1232# CONFIG_CRYPTO_GF128MUL is not set
1194# CONFIG_CRYPTO_NULL is not set 1233# CONFIG_CRYPTO_NULL is not set
1195# CONFIG_CRYPTO_CRYPTD is not set 1234# CONFIG_CRYPTO_CRYPTD is not set
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 358b85f9270e..5e6d55f006bb 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.28-rc4 3# Linux kernel version: 2.6.29-rc2
4# Fri Nov 14 10:06:19 2008 4# Fri Jan 23 08:43:46 2009
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -19,6 +19,7 @@ CONFIG_4xx=y
19CONFIG_BOOKE=y 19CONFIG_BOOKE=y
20CONFIG_PTE_64BIT=y 20CONFIG_PTE_64BIT=y
21CONFIG_PHYS_64BIT=y 21CONFIG_PHYS_64BIT=y
22CONFIG_PPC_MMU_NOHASH=y
22# CONFIG_PPC_MM_SLICES is not set 23# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 24CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 25CONFIG_PPC32=y
@@ -45,7 +46,7 @@ CONFIG_GENERIC_GPIO=y
45CONFIG_PPC=y 46CONFIG_PPC=y
46CONFIG_EARLY_PRINTK=y 47CONFIG_EARLY_PRINTK=y
47CONFIG_GENERIC_NVRAM=y 48CONFIG_GENERIC_NVRAM=y
48CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y 49CONFIG_SCHED_OMIT_FRAME_POINTER=y
49CONFIG_ARCH_MAY_HAVE_PC_FDC=y 50CONFIG_ARCH_MAY_HAVE_PC_FDC=y
50CONFIG_PPC_OF=y 51CONFIG_PPC_OF=y
51CONFIG_OF=y 52CONFIG_OF=y
@@ -76,12 +77,12 @@ CONFIG_POSIX_MQUEUE=y
76# CONFIG_AUDIT is not set 77# CONFIG_AUDIT is not set
77# CONFIG_IKCONFIG is not set 78# CONFIG_IKCONFIG is not set
78CONFIG_LOG_BUF_SHIFT=14 79CONFIG_LOG_BUF_SHIFT=14
79# CONFIG_CGROUPS is not set
80CONFIG_GROUP_SCHED=y 80CONFIG_GROUP_SCHED=y
81CONFIG_FAIR_GROUP_SCHED=y 81CONFIG_FAIR_GROUP_SCHED=y
82# CONFIG_RT_GROUP_SCHED is not set 82# CONFIG_RT_GROUP_SCHED is not set
83CONFIG_USER_SCHED=y 83CONFIG_USER_SCHED=y
84# CONFIG_CGROUP_SCHED is not set 84# CONFIG_CGROUP_SCHED is not set
85# CONFIG_CGROUPS is not set
85CONFIG_SYSFS_DEPRECATED=y 86CONFIG_SYSFS_DEPRECATED=y
86CONFIG_SYSFS_DEPRECATED_V2=y 87CONFIG_SYSFS_DEPRECATED_V2=y
87# CONFIG_RELAY is not set 88# CONFIG_RELAY is not set
@@ -94,6 +95,7 @@ CONFIG_EMBEDDED=y
94CONFIG_SYSCTL_SYSCALL=y 95CONFIG_SYSCTL_SYSCALL=y
95CONFIG_KALLSYMS=y 96CONFIG_KALLSYMS=y
96CONFIG_KALLSYMS_ALL=y 97CONFIG_KALLSYMS_ALL=y
98CONFIG_KALLSYMS_STRIP_GENERATED=y
97CONFIG_KALLSYMS_EXTRA_PASS=y 99CONFIG_KALLSYMS_EXTRA_PASS=y
98CONFIG_HOTPLUG=y 100CONFIG_HOTPLUG=y
99CONFIG_PRINTK=y 101CONFIG_PRINTK=y
@@ -116,7 +118,6 @@ CONFIG_SLUB_DEBUG=y
116CONFIG_SLUB=y 118CONFIG_SLUB=y
117# CONFIG_SLOB is not set 119# CONFIG_SLOB is not set
118# CONFIG_PROFILING is not set 120# CONFIG_PROFILING is not set
119# CONFIG_MARKERS is not set
120CONFIG_HAVE_OPROFILE=y 121CONFIG_HAVE_OPROFILE=y
121# CONFIG_KPROBES is not set 122# CONFIG_KPROBES is not set
122CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y 123CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
@@ -127,7 +128,6 @@ CONFIG_HAVE_ARCH_TRACEHOOK=y
127# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set 128# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
128CONFIG_SLABINFO=y 129CONFIG_SLABINFO=y
129CONFIG_RT_MUTEXES=y 130CONFIG_RT_MUTEXES=y
130# CONFIG_TINY_SHMEM is not set
131CONFIG_BASE_SMALL=0 131CONFIG_BASE_SMALL=0
132CONFIG_MODULES=y 132CONFIG_MODULES=y
133# CONFIG_MODULE_FORCE_LOAD is not set 133# CONFIG_MODULE_FORCE_LOAD is not set
@@ -135,11 +135,9 @@ CONFIG_MODULE_UNLOAD=y
135# CONFIG_MODULE_FORCE_UNLOAD is not set 135# CONFIG_MODULE_FORCE_UNLOAD is not set
136# CONFIG_MODVERSIONS is not set 136# CONFIG_MODVERSIONS is not set
137# CONFIG_MODULE_SRCVERSION_ALL is not set 137# CONFIG_MODULE_SRCVERSION_ALL is not set
138CONFIG_KMOD=y
139CONFIG_BLOCK=y 138CONFIG_BLOCK=y
140CONFIG_LBD=y 139CONFIG_LBD=y
141# CONFIG_BLK_DEV_IO_TRACE is not set 140# CONFIG_BLK_DEV_IO_TRACE is not set
142# CONFIG_LSF is not set
143# CONFIG_BLK_DEV_BSG is not set 141# CONFIG_BLK_DEV_BSG is not set
144# CONFIG_BLK_DEV_INTEGRITY is not set 142# CONFIG_BLK_DEV_INTEGRITY is not set
145 143
@@ -157,6 +155,10 @@ CONFIG_DEFAULT_AS=y
157CONFIG_DEFAULT_IOSCHED="anticipatory" 155CONFIG_DEFAULT_IOSCHED="anticipatory"
158CONFIG_PREEMPT_NOTIFIERS=y 156CONFIG_PREEMPT_NOTIFIERS=y
159CONFIG_CLASSIC_RCU=y 157CONFIG_CLASSIC_RCU=y
158# CONFIG_TREE_RCU is not set
159# CONFIG_PREEMPT_RCU is not set
160# CONFIG_TREE_RCU_TRACE is not set
161# CONFIG_PREEMPT_RCU_TRACE is not set
160# CONFIG_FREEZER is not set 162# CONFIG_FREEZER is not set
161CONFIG_PPC4xx_PCI_EXPRESS=y 163CONFIG_PPC4xx_PCI_EXPRESS=y
162 164
@@ -204,6 +206,7 @@ CONFIG_XILINX_VIRTEX_5_FXT=y
204# CONFIG_CPU_FREQ is not set 206# CONFIG_CPU_FREQ is not set
205# CONFIG_FSL_ULI1575 is not set 207# CONFIG_FSL_ULI1575 is not set
206CONFIG_OF_RTC=y 208CONFIG_OF_RTC=y
209# CONFIG_SIMPLE_GPIO is not set
207 210
208# 211#
209# Kernel options 212# Kernel options
@@ -227,6 +230,7 @@ CONFIG_BINFMT_ELF=y
227# CONFIG_BINFMT_MISC is not set 230# CONFIG_BINFMT_MISC is not set
228CONFIG_MATH_EMULATION=y 231CONFIG_MATH_EMULATION=y
229# CONFIG_IOMMU_HELPER is not set 232# CONFIG_IOMMU_HELPER is not set
233CONFIG_PPC_NEED_DMA_SYNC_OPS=y
230CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y 234CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
231CONFIG_ARCH_HAS_WALK_MEMORY=y 235CONFIG_ARCH_HAS_WALK_MEMORY=y
232CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y 236CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
@@ -241,12 +245,14 @@ CONFIG_FLAT_NODE_MEM_MAP=y
241CONFIG_PAGEFLAGS_EXTENDED=y 245CONFIG_PAGEFLAGS_EXTENDED=y
242CONFIG_SPLIT_PTLOCK_CPUS=4 246CONFIG_SPLIT_PTLOCK_CPUS=4
243CONFIG_MIGRATION=y 247CONFIG_MIGRATION=y
244CONFIG_RESOURCES_64BIT=y
245CONFIG_PHYS_ADDR_T_64BIT=y 248CONFIG_PHYS_ADDR_T_64BIT=y
246CONFIG_ZONE_DMA_FLAG=1 249CONFIG_ZONE_DMA_FLAG=1
247CONFIG_BOUNCE=y 250CONFIG_BOUNCE=y
248CONFIG_VIRT_TO_BUS=y 251CONFIG_VIRT_TO_BUS=y
249CONFIG_UNEVICTABLE_LRU=y 252CONFIG_UNEVICTABLE_LRU=y
253CONFIG_PPC_4K_PAGES=y
254# CONFIG_PPC_16K_PAGES is not set
255# CONFIG_PPC_64K_PAGES is not set
250CONFIG_FORCE_MAX_ZONEORDER=11 256CONFIG_FORCE_MAX_ZONEORDER=11
251CONFIG_PROC_DEVICETREE=y 257CONFIG_PROC_DEVICETREE=y
252# CONFIG_CMDLINE_BOOL is not set 258# CONFIG_CMDLINE_BOOL is not set
@@ -269,6 +275,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
269# CONFIG_PCI_MSI is not set 275# CONFIG_PCI_MSI is not set
270# CONFIG_PCI_LEGACY is not set 276# CONFIG_PCI_LEGACY is not set
271# CONFIG_PCI_DEBUG is not set 277# CONFIG_PCI_DEBUG is not set
278# CONFIG_PCI_STUB is not set
272# CONFIG_PCCARD is not set 279# CONFIG_PCCARD is not set
273# CONFIG_HOTPLUG_PCI is not set 280# CONFIG_HOTPLUG_PCI is not set
274# CONFIG_HAS_RAPIDIO is not set 281# CONFIG_HAS_RAPIDIO is not set
@@ -293,6 +300,7 @@ CONFIG_NET=y
293# 300#
294# Networking options 301# Networking options
295# 302#
303CONFIG_COMPAT_NET_DEV_OPS=y
296CONFIG_PACKET=y 304CONFIG_PACKET=y
297# CONFIG_PACKET_MMAP is not set 305# CONFIG_PACKET_MMAP is not set
298CONFIG_UNIX=y 306CONFIG_UNIX=y
@@ -354,10 +362,12 @@ CONFIG_IPV6_NDISC_NODETYPE=y
354# CONFIG_IP_SCTP is not set 362# CONFIG_IP_SCTP is not set
355# CONFIG_TIPC is not set 363# CONFIG_TIPC is not set
356# CONFIG_ATM is not set 364# CONFIG_ATM is not set
365CONFIG_STP=m
357CONFIG_BRIDGE=m 366CONFIG_BRIDGE=m
358# CONFIG_NET_DSA is not set 367# CONFIG_NET_DSA is not set
359# CONFIG_VLAN_8021Q is not set 368# CONFIG_VLAN_8021Q is not set
360# CONFIG_DECNET is not set 369# CONFIG_DECNET is not set
370CONFIG_LLC=m
361# CONFIG_LLC2 is not set 371# CONFIG_LLC2 is not set
362# CONFIG_IPX is not set 372# CONFIG_IPX is not set
363# CONFIG_ATALK is not set 373# CONFIG_ATALK is not set
@@ -366,6 +376,7 @@ CONFIG_BRIDGE=m
366# CONFIG_ECONET is not set 376# CONFIG_ECONET is not set
367# CONFIG_WAN_ROUTER is not set 377# CONFIG_WAN_ROUTER is not set
368# CONFIG_NET_SCHED is not set 378# CONFIG_NET_SCHED is not set
379# CONFIG_DCB is not set
369 380
370# 381#
371# Network testing 382# Network testing
@@ -378,6 +389,7 @@ CONFIG_BRIDGE=m
378# CONFIG_AF_RXRPC is not set 389# CONFIG_AF_RXRPC is not set
379# CONFIG_PHONET is not set 390# CONFIG_PHONET is not set
380# CONFIG_WIRELESS is not set 391# CONFIG_WIRELESS is not set
392# CONFIG_WIMAX is not set
381# CONFIG_RFKILL is not set 393# CONFIG_RFKILL is not set
382# CONFIG_NET_9P is not set 394# CONFIG_NET_9P is not set
383 395
@@ -403,6 +415,7 @@ CONFIG_MTD=y
403# CONFIG_MTD_DEBUG is not set 415# CONFIG_MTD_DEBUG is not set
404# CONFIG_MTD_CONCAT is not set 416# CONFIG_MTD_CONCAT is not set
405CONFIG_MTD_PARTITIONS=y 417CONFIG_MTD_PARTITIONS=y
418# CONFIG_MTD_TESTS is not set
406# CONFIG_MTD_REDBOOT_PARTS is not set 419# CONFIG_MTD_REDBOOT_PARTS is not set
407# CONFIG_MTD_CMDLINE_PARTS is not set 420# CONFIG_MTD_CMDLINE_PARTS is not set
408CONFIG_MTD_OF_PARTS=y 421CONFIG_MTD_OF_PARTS=y
@@ -474,6 +487,12 @@ CONFIG_MTD_PHYSMAP_OF=y
474# CONFIG_MTD_ONENAND is not set 487# CONFIG_MTD_ONENAND is not set
475 488
476# 489#
490# LPDDR flash memory drivers
491#
492# CONFIG_MTD_LPDDR is not set
493# CONFIG_MTD_QINFO_PROBE is not set
494
495#
477# UBI - Unsorted block images 496# UBI - Unsorted block images
478# 497#
479CONFIG_MTD_UBI=m 498CONFIG_MTD_UBI=m
@@ -631,6 +650,7 @@ CONFIG_NETDEV_1000=y
631# CONFIG_JME is not set 650# CONFIG_JME is not set
632CONFIG_NETDEV_10000=y 651CONFIG_NETDEV_10000=y
633# CONFIG_CHELSIO_T1 is not set 652# CONFIG_CHELSIO_T1 is not set
653CONFIG_CHELSIO_T3_DEPENDS=y
634# CONFIG_CHELSIO_T3 is not set 654# CONFIG_CHELSIO_T3 is not set
635# CONFIG_ENIC is not set 655# CONFIG_ENIC is not set
636# CONFIG_IXGBE is not set 656# CONFIG_IXGBE is not set
@@ -655,6 +675,10 @@ CONFIG_NETDEV_10000=y
655# CONFIG_IWLWIFI_LEDS is not set 675# CONFIG_IWLWIFI_LEDS is not set
656 676
657# 677#
678# Enable WiMAX (Networking options) to see the WiMAX drivers
679#
680
681#
658# USB Network Adapters 682# USB Network Adapters
659# 683#
660# CONFIG_USB_CATC is not set 684# CONFIG_USB_CATC is not set
@@ -722,9 +746,12 @@ CONFIG_SERIAL_CORE=y
722CONFIG_SERIAL_CORE_CONSOLE=y 746CONFIG_SERIAL_CORE_CONSOLE=y
723# CONFIG_SERIAL_JSM is not set 747# CONFIG_SERIAL_JSM is not set
724CONFIG_SERIAL_OF_PLATFORM=y 748CONFIG_SERIAL_OF_PLATFORM=y
749# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
725CONFIG_UNIX98_PTYS=y 750CONFIG_UNIX98_PTYS=y
751# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
726CONFIG_LEGACY_PTYS=y 752CONFIG_LEGACY_PTYS=y
727CONFIG_LEGACY_PTY_COUNT=256 753CONFIG_LEGACY_PTY_COUNT=256
754# CONFIG_HVC_UDBG is not set
728# CONFIG_IPMI_HANDLER is not set 755# CONFIG_IPMI_HANDLER is not set
729# CONFIG_HW_RANDOM is not set 756# CONFIG_HW_RANDOM is not set
730# CONFIG_NVRAM is not set 757# CONFIG_NVRAM is not set
@@ -800,7 +827,6 @@ CONFIG_I2C_IBM_IIC=m
800# CONFIG_PCF8575 is not set 827# CONFIG_PCF8575 is not set
801# CONFIG_SENSORS_PCA9539 is not set 828# CONFIG_SENSORS_PCA9539 is not set
802# CONFIG_SENSORS_PCF8591 is not set 829# CONFIG_SENSORS_PCF8591 is not set
803# CONFIG_TPS65010 is not set
804# CONFIG_SENSORS_MAX6875 is not set 830# CONFIG_SENSORS_MAX6875 is not set
805# CONFIG_SENSORS_TSL2550 is not set 831# CONFIG_SENSORS_TSL2550 is not set
806# CONFIG_I2C_DEBUG_CORE is not set 832# CONFIG_I2C_DEBUG_CORE is not set
@@ -853,9 +879,11 @@ CONFIG_SSB_POSSIBLE=y
853# CONFIG_MFD_CORE is not set 879# CONFIG_MFD_CORE is not set
854# CONFIG_MFD_SM501 is not set 880# CONFIG_MFD_SM501 is not set
855# CONFIG_HTC_PASIC3 is not set 881# CONFIG_HTC_PASIC3 is not set
882# CONFIG_TPS65010 is not set
856# CONFIG_MFD_TMIO is not set 883# CONFIG_MFD_TMIO is not set
857# CONFIG_MFD_WM8400 is not set 884# CONFIG_MFD_WM8400 is not set
858# CONFIG_MFD_WM8350_I2C is not set 885# CONFIG_MFD_WM8350_I2C is not set
886# CONFIG_MFD_PCF50633 is not set
859# CONFIG_REGULATOR is not set 887# CONFIG_REGULATOR is not set
860 888
861# 889#
@@ -972,6 +1000,7 @@ CONFIG_USB_EHCI_HCD=m
972CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y 1000CONFIG_USB_EHCI_BIG_ENDIAN_MMIO=y
973CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y 1001CONFIG_USB_EHCI_BIG_ENDIAN_DESC=y
974CONFIG_USB_EHCI_HCD_PPC_OF=y 1002CONFIG_USB_EHCI_HCD_PPC_OF=y
1003# CONFIG_USB_OXU210HP_HCD is not set
975# CONFIG_USB_ISP116X_HCD is not set 1004# CONFIG_USB_ISP116X_HCD is not set
976# CONFIG_USB_ISP1760_HCD is not set 1005# CONFIG_USB_ISP1760_HCD is not set
977CONFIG_USB_OHCI_HCD=m 1006CONFIG_USB_OHCI_HCD=m
@@ -1012,7 +1041,6 @@ CONFIG_USB_STORAGE=m
1012# CONFIG_USB_STORAGE_DATAFAB is not set 1041# CONFIG_USB_STORAGE_DATAFAB is not set
1013# CONFIG_USB_STORAGE_FREECOM is not set 1042# CONFIG_USB_STORAGE_FREECOM is not set
1014# CONFIG_USB_STORAGE_ISD200 is not set 1043# CONFIG_USB_STORAGE_ISD200 is not set
1015# CONFIG_USB_STORAGE_DPCM is not set
1016# CONFIG_USB_STORAGE_USBAT is not set 1044# CONFIG_USB_STORAGE_USBAT is not set
1017# CONFIG_USB_STORAGE_SDDR09 is not set 1045# CONFIG_USB_STORAGE_SDDR09 is not set
1018# CONFIG_USB_STORAGE_SDDR55 is not set 1046# CONFIG_USB_STORAGE_SDDR55 is not set
@@ -1058,6 +1086,11 @@ CONFIG_USB_STORAGE=m
1058# CONFIG_USB_ISIGHTFW is not set 1086# CONFIG_USB_ISIGHTFW is not set
1059# CONFIG_USB_VST is not set 1087# CONFIG_USB_VST is not set
1060# CONFIG_USB_GADGET is not set 1088# CONFIG_USB_GADGET is not set
1089
1090#
1091# OTG and related infrastructure
1092#
1093# CONFIG_USB_GPIO_VBUS is not set
1061# CONFIG_UWB is not set 1094# CONFIG_UWB is not set
1062# CONFIG_MMC is not set 1095# CONFIG_MMC is not set
1063# CONFIG_MEMSTICK is not set 1096# CONFIG_MEMSTICK is not set
@@ -1069,7 +1102,6 @@ CONFIG_USB_STORAGE=m
1069# CONFIG_DMADEVICES is not set 1102# CONFIG_DMADEVICES is not set
1070# CONFIG_UIO is not set 1103# CONFIG_UIO is not set
1071# CONFIG_STAGING is not set 1104# CONFIG_STAGING is not set
1072CONFIG_STAGING_EXCLUDE_BUILD=y
1073 1105
1074# 1106#
1075# File systems 1107# File systems
@@ -1089,7 +1121,9 @@ CONFIG_FS_MBCACHE=m
1089# CONFIG_FS_POSIX_ACL is not set 1121# CONFIG_FS_POSIX_ACL is not set
1090CONFIG_FILE_LOCKING=y 1122CONFIG_FILE_LOCKING=y
1091# CONFIG_XFS_FS is not set 1123# CONFIG_XFS_FS is not set
1124# CONFIG_GFS2_FS is not set
1092# CONFIG_OCFS2_FS is not set 1125# CONFIG_OCFS2_FS is not set
1126# CONFIG_BTRFS_FS is not set
1093CONFIG_DNOTIFY=y 1127CONFIG_DNOTIFY=y
1094CONFIG_INOTIFY=y 1128CONFIG_INOTIFY=y
1095CONFIG_INOTIFY_USER=y 1129CONFIG_INOTIFY_USER=y
@@ -1126,10 +1160,7 @@ CONFIG_TMPFS=y
1126# CONFIG_TMPFS_POSIX_ACL is not set 1160# CONFIG_TMPFS_POSIX_ACL is not set
1127# CONFIG_HUGETLB_PAGE is not set 1161# CONFIG_HUGETLB_PAGE is not set
1128# CONFIG_CONFIGFS_FS is not set 1162# CONFIG_CONFIGFS_FS is not set
1129 1163CONFIG_MISC_FILESYSTEMS=y
1130#
1131# Miscellaneous filesystems
1132#
1133# CONFIG_ADFS_FS is not set 1164# CONFIG_ADFS_FS is not set
1134# CONFIG_AFFS_FS is not set 1165# CONFIG_AFFS_FS is not set
1135# CONFIG_HFS_FS is not set 1166# CONFIG_HFS_FS is not set
@@ -1155,6 +1186,7 @@ CONFIG_UBIFS_FS_LZO=y
1155CONFIG_UBIFS_FS_ZLIB=y 1186CONFIG_UBIFS_FS_ZLIB=y
1156# CONFIG_UBIFS_FS_DEBUG is not set 1187# CONFIG_UBIFS_FS_DEBUG is not set
1157CONFIG_CRAMFS=y 1188CONFIG_CRAMFS=y
1189# CONFIG_SQUASHFS is not set
1158# CONFIG_VXFS_FS is not set 1190# CONFIG_VXFS_FS is not set
1159# CONFIG_MINIX_FS is not set 1191# CONFIG_MINIX_FS is not set
1160# CONFIG_OMFS_FS is not set 1192# CONFIG_OMFS_FS is not set
@@ -1234,6 +1266,7 @@ CONFIG_NLS_ISO8859_1=m
1234# Library routines 1266# Library routines
1235# 1267#
1236CONFIG_BITREVERSE=y 1268CONFIG_BITREVERSE=y
1269CONFIG_GENERIC_FIND_LAST_BIT=y
1237# CONFIG_CRC_CCITT is not set 1270# CONFIG_CRC_CCITT is not set
1238CONFIG_CRC16=m 1271CONFIG_CRC16=m
1239CONFIG_CRC_T10DIF=m 1272CONFIG_CRC_T10DIF=m
@@ -1287,6 +1320,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
1287# CONFIG_DEBUG_MEMORY_INIT is not set 1320# CONFIG_DEBUG_MEMORY_INIT is not set
1288# CONFIG_DEBUG_LIST is not set 1321# CONFIG_DEBUG_LIST is not set
1289# CONFIG_DEBUG_SG is not set 1322# CONFIG_DEBUG_SG is not set
1323# CONFIG_DEBUG_NOTIFIERS is not set
1290# CONFIG_BOOT_PRINTK_DELAY is not set 1324# CONFIG_BOOT_PRINTK_DELAY is not set
1291# CONFIG_RCU_TORTURE_TEST is not set 1325# CONFIG_RCU_TORTURE_TEST is not set
1292# CONFIG_RCU_CPU_STALL_DETECTOR is not set 1326# CONFIG_RCU_CPU_STALL_DETECTOR is not set
@@ -1296,6 +1330,8 @@ CONFIG_DEBUG_BUGVERBOSE=y
1296# CONFIG_LATENCYTOP is not set 1330# CONFIG_LATENCYTOP is not set
1297CONFIG_SYSCTL_SYSCALL_CHECK=y 1331CONFIG_SYSCTL_SYSCALL_CHECK=y
1298CONFIG_HAVE_FUNCTION_TRACER=y 1332CONFIG_HAVE_FUNCTION_TRACER=y
1333CONFIG_HAVE_DYNAMIC_FTRACE=y
1334CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
1299 1335
1300# 1336#
1301# Tracers 1337# Tracers
@@ -1304,11 +1340,13 @@ CONFIG_HAVE_FUNCTION_TRACER=y
1304# CONFIG_SCHED_TRACER is not set 1340# CONFIG_SCHED_TRACER is not set
1305# CONFIG_CONTEXT_SWITCH_TRACER is not set 1341# CONFIG_CONTEXT_SWITCH_TRACER is not set
1306# CONFIG_BOOT_TRACER is not set 1342# CONFIG_BOOT_TRACER is not set
1343# CONFIG_TRACE_BRANCH_PROFILING is not set
1307# CONFIG_STACK_TRACER is not set 1344# CONFIG_STACK_TRACER is not set
1308# CONFIG_DYNAMIC_PRINTK_DEBUG is not set 1345# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
1309# CONFIG_SAMPLES is not set 1346# CONFIG_SAMPLES is not set
1310CONFIG_HAVE_ARCH_KGDB=y 1347CONFIG_HAVE_ARCH_KGDB=y
1311# CONFIG_KGDB is not set 1348# CONFIG_KGDB is not set
1349CONFIG_PRINT_STACK_DEPTH=64
1312# CONFIG_DEBUG_STACKOVERFLOW is not set 1350# CONFIG_DEBUG_STACKOVERFLOW is not set
1313# CONFIG_DEBUG_STACK_USAGE is not set 1351# CONFIG_DEBUG_STACK_USAGE is not set
1314# CONFIG_DEBUG_PAGEALLOC is not set 1352# CONFIG_DEBUG_PAGEALLOC is not set
@@ -1333,11 +1371,15 @@ CONFIG_CRYPTO=y
1333# 1371#
1334# CONFIG_CRYPTO_FIPS is not set 1372# CONFIG_CRYPTO_FIPS is not set
1335CONFIG_CRYPTO_ALGAPI=y 1373CONFIG_CRYPTO_ALGAPI=y
1336CONFIG_CRYPTO_AEAD=y 1374CONFIG_CRYPTO_ALGAPI2=y
1375CONFIG_CRYPTO_AEAD2=y
1337CONFIG_CRYPTO_BLKCIPHER=y 1376CONFIG_CRYPTO_BLKCIPHER=y
1377CONFIG_CRYPTO_BLKCIPHER2=y
1338CONFIG_CRYPTO_HASH=y 1378CONFIG_CRYPTO_HASH=y
1339CONFIG_CRYPTO_RNG=y 1379CONFIG_CRYPTO_HASH2=y
1380CONFIG_CRYPTO_RNG2=y
1340CONFIG_CRYPTO_MANAGER=y 1381CONFIG_CRYPTO_MANAGER=y
1382CONFIG_CRYPTO_MANAGER2=y
1341# CONFIG_CRYPTO_GF128MUL is not set 1383# CONFIG_CRYPTO_GF128MUL is not set
1342# CONFIG_CRYPTO_NULL is not set 1384# CONFIG_CRYPTO_NULL is not set
1343# CONFIG_CRYPTO_CRYPTD is not set 1385# CONFIG_CRYPTO_CRYPTD is not set
@@ -1419,5 +1461,6 @@ CONFIG_CRYPTO_LZO=m
1419CONFIG_VIRTUALIZATION=y 1461CONFIG_VIRTUALIZATION=y
1420CONFIG_KVM=y 1462CONFIG_KVM=y
1421CONFIG_KVM_440=y 1463CONFIG_KVM_440=y
1464# CONFIG_KVM_EXIT_TIMING is not set
1422# CONFIG_VIRTIO_PCI is not set 1465# CONFIG_VIRTIO_PCI is not set
1423# CONFIG_VIRTIO_BALLOON is not set 1466# CONFIG_VIRTIO_BALLOON is not set
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 698133180aee..01f51daace13 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -3,5 +3,4 @@ obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o
3obj-$(CONFIG_EBONY) += ebony.o 3obj-$(CONFIG_EBONY) += ebony.o
4obj-$(CONFIG_SAM440EP) += sam440ep.o 4obj-$(CONFIG_SAM440EP) += sam440ep.o
5obj-$(CONFIG_WARP) += warp.o 5obj-$(CONFIG_WARP) += warp.o
6obj-$(CONFIG_WARP) += warp-nand.o
7obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o 6obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
deleted file mode 100644
index 89ecd76127d8..000000000000
--- a/arch/powerpc/platforms/44x/warp-nand.c
+++ /dev/null
@@ -1,135 +0,0 @@
1/*
2 * PIKA Warp(tm) NAND flash specific routines
3 *
4 * Copyright (c) 2008 PIKA Technologies
5 * Sean MacLennan <smaclennan@pikatech.com>
6 */
7
8#include <linux/platform_device.h>
9#include <linux/mtd/mtd.h>
10#include <linux/mtd/map.h>
11#include <linux/mtd/partitions.h>
12#include <linux/mtd/nand.h>
13#include <linux/mtd/ndfc.h>
14#include <linux/of.h>
15#include <asm/machdep.h>
16
17
18#ifdef CONFIG_MTD_NAND_NDFC
19
20#define CS_NAND_0 1 /* use chip select 1 for NAND device 0 */
21
22#define WARP_NAND_FLASH_REG_ADDR 0xD0000000UL
23#define WARP_NAND_FLASH_REG_SIZE 0x2000
24
25static struct resource warp_ndfc = {
26 .start = WARP_NAND_FLASH_REG_ADDR,
27 .end = WARP_NAND_FLASH_REG_ADDR + WARP_NAND_FLASH_REG_SIZE - 1,
28 .flags = IORESOURCE_MEM,
29};
30
31static struct mtd_partition nand_parts[] = {
32 {
33 .name = "kernel",
34 .offset = 0,
35 .size = 0x0200000
36 },
37 {
38 .name = "root",
39 .offset = 0x0200000,
40 .size = 0x3E00000
41 },
42 {
43 .name = "persistent",
44 .offset = 0x4000000,
45 .size = 0x4000000
46 },
47 {
48 .name = "persistent1",
49 .offset = 0x8000000,
50 .size = 0x4000000
51 },
52 {
53 .name = "persistent2",
54 .offset = 0xC000000,
55 .size = 0x4000000
56 }
57};
58
59struct ndfc_controller_settings warp_ndfc_settings = {
60 .ccr_settings = (NDFC_CCR_BS(CS_NAND_0) | NDFC_CCR_ARAC1),
61 .ndfc_erpn = 0,
62};
63
64static struct ndfc_chip_settings warp_chip0_settings = {
65 .bank_settings = 0x80002222,
66};
67
68struct platform_nand_ctrl warp_nand_ctrl = {
69 .priv = &warp_ndfc_settings,
70};
71
72static struct platform_device warp_ndfc_device = {
73 .name = "ndfc-nand",
74 .id = 0,
75 .dev = {
76 .platform_data = &warp_nand_ctrl,
77 },
78 .num_resources = 1,
79 .resource = &warp_ndfc,
80};
81
82/* Do NOT set the ecclayout: let it default so it is correct for both
83 * 64M and 256M flash chips.
84 */
85static struct platform_nand_chip warp_nand_chip0 = {
86 .nr_chips = 1,
87 .chip_offset = CS_NAND_0,
88 .nr_partitions = ARRAY_SIZE(nand_parts),
89 .partitions = nand_parts,
90 .chip_delay = 20,
91 .priv = &warp_chip0_settings,
92};
93
94static struct platform_device warp_nand_device = {
95 .name = "ndfc-chip",
96 .id = 0,
97 .num_resources = 0,
98 .dev = {
99 .platform_data = &warp_nand_chip0,
100 .parent = &warp_ndfc_device.dev,
101 }
102};
103
104static int warp_setup_nand_flash(void)
105{
106 struct device_node *np;
107
108 /* Try to detect a rev A based on NOR size. */
109 np = of_find_compatible_node(NULL, NULL, "cfi-flash");
110 if (np) {
111 struct property *pp;
112
113 pp = of_find_property(np, "reg", NULL);
114 if (pp && (pp->length == 12)) {
115 u32 *v = pp->value;
116 if (v[2] == 0x4000000) {
117 /* Rev A = 64M NAND */
118 warp_nand_chip0.nr_partitions = 3;
119
120 nand_parts[1].size = 0x3000000;
121 nand_parts[2].offset = 0x3200000;
122 nand_parts[2].size = 0x0e00000;
123 }
124 }
125 of_node_put(np);
126 }
127
128 platform_device_register(&warp_ndfc_device);
129 platform_device_register(&warp_nand_device);
130
131 return 0;
132}
133machine_device_initcall(warp, warp_setup_nand_flash);
134
135#endif
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-10 07:53:13 -0500