aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-23 08:20:51 -0400
committerPaul Mackerras <paulus@samba.org>2007-10-23 08:20:51 -0400
commit786d3693f46579c7cd982e65de9f43eba94e4a57 (patch)
treee794415702e30899fd7181072e8753bb8068cce2 /arch/powerpc
parentdba5baf32887f58414ed7183a95309686894eab2 (diff)
parent739253765ed55742431866b19330fa0e1012c417 (diff)
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/Kconfig.debug1
-rw-r--r--arch/powerpc/boot/dts/bamboo.dts10
-rw-r--r--arch/powerpc/boot/dts/sequoia.dts14
-rw-r--r--arch/powerpc/boot/dts/walnut.dts12
-rw-r--r--arch/powerpc/boot/treeboot-walnut.c6
-rw-r--r--arch/powerpc/configs/bamboo_defconfig114
-rw-r--r--arch/powerpc/configs/ebony_defconfig115
-rw-r--r--arch/powerpc/configs/walnut_defconfig94
-rw-r--r--arch/powerpc/platforms/40x/Kconfig1
-rw-r--r--arch/powerpc/platforms/44x/Kconfig8
-rw-r--r--arch/powerpc/platforms/Kconfig.cputype1
11 files changed, 230 insertions, 146 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index c939fe86a9e0..6a79fe43e229 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -216,7 +216,6 @@ config PPC_EARLY_DEBUG_BEAT
216config PPC_EARLY_DEBUG_44x 216config PPC_EARLY_DEBUG_44x
217 bool "Early serial debugging for IBM/AMCC 44x CPUs" 217 bool "Early serial debugging for IBM/AMCC 44x CPUs"
218 depends on 44x 218 depends on 44x
219 select PPC_UDBG_16550
220 help 219 help
221 Select this to enable early debugging for IBM 44x chips via the 220 Select this to enable early debugging for IBM 44x chips via the
222 inbuilt serial port. 221 inbuilt serial port.
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index a88ae3d218a5..cb2fb50a281c 100644
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -98,11 +98,13 @@
98 interrupt-parent = <&MAL0>; 98 interrupt-parent = <&MAL0>;
99 interrupts = <0 1 2 3 4>; 99 interrupts = <0 1 2 3 4>;
100 #interrupt-cells = <1>; 100 #interrupt-cells = <1>;
101 #address-cells = <0>;
102 #size-cells = <0>;
101 interrupt-map = </*TXEOB*/ 0 &UIC0 a 4 103 interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
102 /*RXEOB*/ 1 &UIC0 b 4 104 /*RXEOB*/ 1 &UIC0 b 4
103 /*SERR*/ 2 &UIC1 0 4 105 /*SERR*/ 2 &UIC1 0 4
104 /*TXDE*/ 3 &UIC1 1 4 106 /*TXDE*/ 3 &UIC1 1 4
105 /*RXDE*/ 4 &UIC1 3 4>; 107 /*RXDE*/ 4 &UIC1 2 4>;
106 }; 108 };
107 109
108 POB0: opb { 110 POB0: opb {
@@ -196,6 +198,7 @@
196 }; 198 };
197 199
198 EMAC0: ethernet@ef600e00 { 200 EMAC0: ethernet@ef600e00 {
201 linux,network-index = <0>;
199 device_type = "network"; 202 device_type = "network";
200 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 203 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
201 interrupt-parent = <&UIC1>; 204 interrupt-parent = <&UIC1>;
@@ -210,12 +213,13 @@
210 rx-fifo-size = <1000>; 213 rx-fifo-size = <1000>;
211 tx-fifo-size = <800>; 214 tx-fifo-size = <800>;
212 phy-mode = "rmii"; 215 phy-mode = "rmii";
213 phy-map = <00000001>; 216 phy-map = <00000000>;
214 zmii-device = <&ZMII0>; 217 zmii-device = <&ZMII0>;
215 zmii-channel = <0>; 218 zmii-channel = <0>;
216 }; 219 };
217 220
218 EMAC1: ethernet@ef600f00 { 221 EMAC1: ethernet@ef600f00 {
222 linux,network-index = <1>;
219 device_type = "network"; 223 device_type = "network";
220 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac"; 224 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
221 interrupt-parent = <&UIC1>; 225 interrupt-parent = <&UIC1>;
@@ -230,7 +234,7 @@
230 rx-fifo-size = <1000>; 234 rx-fifo-size = <1000>;
231 tx-fifo-size = <800>; 235 tx-fifo-size = <800>;
232 phy-mode = "rmii"; 236 phy-mode = "rmii";
233 phy-map = <00000001>; 237 phy-map = <00000000>;
234 zmii-device = <&ZMII0>; 238 zmii-device = <&ZMII0>;
235 zmii-channel = <1>; 239 zmii-channel = <1>;
236 }; 240 };
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 36be75b04de1..8833dfe2e8b4 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -241,6 +241,12 @@
241 reg = <ef600d00 c>; 241 reg = <ef600d00 c>;
242 }; 242 };
243 243
244 RGMII0: emac-rgmii@ef601000 {
245 device_type = "rgmii-interface";
246 compatible = "ibm,rgmii-440epx", "ibm,rgmii";
247 reg = <ef601000 8>;
248 };
249
244 EMAC0: ethernet@ef600e00 { 250 EMAC0: ethernet@ef600e00 {
245 linux,network-index = <0>; 251 linux,network-index = <0>;
246 device_type = "network"; 252 device_type = "network";
@@ -261,10 +267,12 @@
261 max-frame-size = <5dc>; 267 max-frame-size = <5dc>;
262 rx-fifo-size = <1000>; 268 rx-fifo-size = <1000>;
263 tx-fifo-size = <800>; 269 tx-fifo-size = <800>;
264 phy-mode = "rmii"; 270 phy-mode = "rgmii";
265 phy-map = <00000000>; 271 phy-map = <00000000>;
266 zmii-device = <&ZMII0>; 272 zmii-device = <&ZMII0>;
267 zmii-channel = <0>; 273 zmii-channel = <0>;
274 rgmii-device = <&RGMII0>;
275 rgmii-channel = <0>;
268 }; 276 };
269 277
270 EMAC1: ethernet@ef600f00 { 278 EMAC1: ethernet@ef600f00 {
@@ -287,10 +295,12 @@
287 max-frame-size = <5dc>; 295 max-frame-size = <5dc>;
288 rx-fifo-size = <1000>; 296 rx-fifo-size = <1000>;
289 tx-fifo-size = <800>; 297 tx-fifo-size = <800>;
290 phy-mode = "rmii"; 298 phy-mode = "rgmii";
291 phy-map = <00000000>; 299 phy-map = <00000000>;
292 zmii-device = <&ZMII0>; 300 zmii-device = <&ZMII0>;
293 zmii-channel = <1>; 301 zmii-channel = <1>;
302 rgmii-device = <&RGMII0>;
303 rgmii-channel = <1>;
294 }; 304 };
295 }; 305 };
296 }; 306 };
diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
index ec54f4e04ad6..fa681f5343fe 100644
--- a/arch/powerpc/boot/dts/walnut.dts
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -64,10 +64,15 @@
64 MAL: mcmal { 64 MAL: mcmal {
65 compatible = "ibm,mcmal-405gp", "ibm,mcmal"; 65 compatible = "ibm,mcmal-405gp", "ibm,mcmal";
66 dcr-reg = <180 62>; 66 dcr-reg = <180 62>;
67 num-tx-chans = <2>; 67 num-tx-chans = <1>;
68 num-rx-chans = <1>; 68 num-rx-chans = <1>;
69 interrupt-parent = <&UIC0>; 69 interrupt-parent = <&UIC0>;
70 interrupts = <a 4 b 4 c 4 d 4 e 4>; 70 interrupts = <
71 b 4 /* TXEOB */
72 c 4 /* RXEOB */
73 a 4 /* SERR */
74 d 4 /* TXDE */
75 e 4 /* RXDE */>;
71 }; 76 };
72 77
73 POB0: opb { 78 POB0: opb {
@@ -118,9 +123,10 @@
118 compatible = "ibm,emac-405gp", "ibm,emac"; 123 compatible = "ibm,emac-405gp", "ibm,emac";
119 interrupt-parent = <&UIC0>; 124 interrupt-parent = <&UIC0>;
120 interrupts = <9 4 f 4>; 125 interrupts = <9 4 f 4>;
126 local-mac-address = [000000000000]; /* Filled in by zImage */
121 reg = <ef600800 70>; 127 reg = <ef600800 70>;
122 mal-device = <&MAL>; 128 mal-device = <&MAL>;
123 mal-tx-channel = <0 1>; 129 mal-tx-channel = <0>;
124 mal-rx-channel = <0>; 130 mal-rx-channel = <0>;
125 cell-index = <0>; 131 cell-index = <0>;
126 max-frame-size = <5dc>; 132 max-frame-size = <5dc>;
diff --git a/arch/powerpc/boot/treeboot-walnut.c b/arch/powerpc/boot/treeboot-walnut.c
index 3adf2d08a230..bb2c309d70fc 100644
--- a/arch/powerpc/boot/treeboot-walnut.c
+++ b/arch/powerpc/boot/treeboot-walnut.c
@@ -57,8 +57,8 @@ void ibm405gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
57 } 57 }
58 58
59 /* setup the timebase clock to tick at the cpu frequency */ 59 /* setup the timebase clock to tick at the cpu frequency */
60 cpc0_cr1 = cpc0_cr1 & ~ 0x00800000; 60 cpc0_cr1 = cpc0_cr1 & ~0x00800000;
61 mtdcr(DCRN_CPC0_CR1, cpc0_cr1); 61 mtdcr(DCRN_405_CPC0_CR1, cpc0_cr1);
62 tb = cpu; 62 tb = cpu;
63 63
64 dt_fixup_cpu_clocks(cpu, tb, 0); 64 dt_fixup_cpu_clocks(cpu, tb, 0);
@@ -109,6 +109,7 @@ static void walnut_flashsel_fixup(void)
109 setprop(sram, "reg", reg_sram, sizeof(reg_sram)); 109 setprop(sram, "reg", reg_sram, sizeof(reg_sram));
110} 110}
111 111
112#define WALNUT_OPENBIOS_MAC_OFF 0xfffffe0b
112static void walnut_fixups(void) 113static void walnut_fixups(void)
113{ 114{
114 ibm4xx_fixup_memsize(); 115 ibm4xx_fixup_memsize();
@@ -116,6 +117,7 @@ static void walnut_fixups(void)
116 ibm4xx_quiesce_eth((u32 *)0xef600800, NULL); 117 ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
117 ibm4xx_fixup_ebc_ranges("/plb/ebc"); 118 ibm4xx_fixup_ebc_ranges("/plb/ebc");
118 walnut_flashsel_fixup(); 119 walnut_flashsel_fixup();
120 dt_fixup_mac_addresses((u8 *) WALNUT_OPENBIOS_MAC_OFF);
119} 121}
120 122
121void platform_init(void) 123void platform_init(void)
diff --git a/arch/powerpc/configs/bamboo_defconfig b/arch/powerpc/configs/bamboo_defconfig
index d22fed6d2cd9..844808ebf245 100644
--- a/arch/powerpc/configs/bamboo_defconfig
+++ b/arch/powerpc/configs/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.23-rc1 3# Linux kernel version: 2.6.23
4# Fri Aug 3 10:46:53 2007 4# Fri Oct 19 09:01:11 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -22,8 +22,13 @@ CONFIG_PHYS_64BIT=y
22# CONFIG_PPC_MM_SLICES is not set 22# CONFIG_PPC_MM_SLICES is not set
23CONFIG_NOT_COHERENT_CACHE=y 23CONFIG_NOT_COHERENT_CACHE=y
24CONFIG_PPC32=y 24CONFIG_PPC32=y
25CONFIG_WORD_SIZE=32
25CONFIG_PPC_MERGE=y 26CONFIG_PPC_MERGE=y
26CONFIG_MMU=y 27CONFIG_MMU=y
28CONFIG_GENERIC_CMOS_UPDATE=y
29CONFIG_GENERIC_TIME=y
30CONFIG_GENERIC_TIME_VSYSCALL=y
31CONFIG_GENERIC_CLOCKEVENTS=y
27CONFIG_GENERIC_HARDIRQS=y 32CONFIG_GENERIC_HARDIRQS=y
28CONFIG_IRQ_PER_CPU=y 33CONFIG_IRQ_PER_CPU=y
29CONFIG_RWSEM_XCHGADD_ALGORITHM=y 34CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -67,6 +72,8 @@ CONFIG_POSIX_MQUEUE=y
67# CONFIG_AUDIT is not set 72# CONFIG_AUDIT is not set
68# CONFIG_IKCONFIG is not set 73# CONFIG_IKCONFIG is not set
69CONFIG_LOG_BUF_SHIFT=14 74CONFIG_LOG_BUF_SHIFT=14
75CONFIG_FAIR_GROUP_SCHED=y
76CONFIG_FAIR_USER_SCHED=y
70CONFIG_SYSFS_DEPRECATED=y 77CONFIG_SYSFS_DEPRECATED=y
71# CONFIG_RELAY is not set 78# CONFIG_RELAY is not set
72CONFIG_BLK_DEV_INITRD=y 79CONFIG_BLK_DEV_INITRD=y
@@ -87,7 +94,6 @@ CONFIG_FUTEX=y
87CONFIG_ANON_INODES=y 94CONFIG_ANON_INODES=y
88CONFIG_EPOLL=y 95CONFIG_EPOLL=y
89CONFIG_SIGNALFD=y 96CONFIG_SIGNALFD=y
90CONFIG_TIMERFD=y
91CONFIG_EVENTFD=y 97CONFIG_EVENTFD=y
92CONFIG_SHMEM=y 98CONFIG_SHMEM=y
93CONFIG_VM_EVENT_COUNTERS=y 99CONFIG_VM_EVENT_COUNTERS=y
@@ -133,6 +139,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
133# CONFIG_PQ2ADS is not set 139# CONFIG_PQ2ADS is not set
134CONFIG_BAMBOO=y 140CONFIG_BAMBOO=y
135# CONFIG_EBONY is not set 141# CONFIG_EBONY is not set
142# CONFIG_SEQUOIA is not set
136CONFIG_440EP=y 143CONFIG_440EP=y
137CONFIG_IBM440EP_ERR42=y 144CONFIG_IBM440EP_ERR42=y
138# CONFIG_MPIC is not set 145# CONFIG_MPIC is not set
@@ -146,11 +153,16 @@ CONFIG_IBM440EP_ERR42=y
146# CONFIG_GENERIC_IOMAP is not set 153# CONFIG_GENERIC_IOMAP is not set
147# CONFIG_CPU_FREQ is not set 154# CONFIG_CPU_FREQ is not set
148# CONFIG_CPM2 is not set 155# CONFIG_CPM2 is not set
156# CONFIG_FSL_ULI1575 is not set
149 157
150# 158#
151# Kernel options 159# Kernel options
152# 160#
153# CONFIG_HIGHMEM is not set 161# CONFIG_HIGHMEM is not set
162# CONFIG_TICK_ONESHOT is not set
163# CONFIG_NO_HZ is not set
164# CONFIG_HIGH_RES_TIMERS is not set
165CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
154# CONFIG_HZ_100 is not set 166# CONFIG_HZ_100 is not set
155CONFIG_HZ_250=y 167CONFIG_HZ_250=y
156# CONFIG_HZ_300 is not set 168# CONFIG_HZ_300 is not set
@@ -172,6 +184,7 @@ CONFIG_FLATMEM_MANUAL=y
172CONFIG_FLATMEM=y 184CONFIG_FLATMEM=y
173CONFIG_FLAT_NODE_MEM_MAP=y 185CONFIG_FLAT_NODE_MEM_MAP=y
174# CONFIG_SPARSEMEM_STATIC is not set 186# CONFIG_SPARSEMEM_STATIC is not set
187# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
175CONFIG_SPLIT_PTLOCK_CPUS=4 188CONFIG_SPLIT_PTLOCK_CPUS=4
176CONFIG_RESOURCES_64BIT=y 189CONFIG_RESOURCES_64BIT=y
177CONFIG_ZONE_DMA_FLAG=1 190CONFIG_ZONE_DMA_FLAG=1
@@ -197,10 +210,6 @@ CONFIG_PCI_SYSCALL=y
197CONFIG_ARCH_SUPPORTS_MSI=y 210CONFIG_ARCH_SUPPORTS_MSI=y
198# CONFIG_PCI_MSI is not set 211# CONFIG_PCI_MSI is not set
199# CONFIG_PCI_DEBUG is not set 212# CONFIG_PCI_DEBUG is not set
200
201#
202# PCCARD (PCMCIA/CardBus) support
203#
204# CONFIG_PCCARD is not set 213# CONFIG_PCCARD is not set
205# CONFIG_HOTPLUG_PCI is not set 214# CONFIG_HOTPLUG_PCI is not set
206 215
@@ -215,7 +224,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
215CONFIG_HIGHMEM_START=0xfe000000 224CONFIG_HIGHMEM_START=0xfe000000
216CONFIG_LOWMEM_SIZE=0x30000000 225CONFIG_LOWMEM_SIZE=0x30000000
217CONFIG_KERNEL_START=0xc0000000 226CONFIG_KERNEL_START=0xc0000000
218CONFIG_TASK_SIZE=0x80000000 227CONFIG_TASK_SIZE=0xc0000000
219CONFIG_CONSISTENT_START=0xff100000 228CONFIG_CONSISTENT_START=0xff100000
220CONFIG_CONSISTENT_SIZE=0x00200000 229CONFIG_CONSISTENT_SIZE=0x00200000
221CONFIG_BOOT_LOAD=0x01000000 230CONFIG_BOOT_LOAD=0x01000000
@@ -252,6 +261,7 @@ CONFIG_IP_PNP_BOOTP=y
252# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 261# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
253# CONFIG_INET_XFRM_MODE_TUNNEL is not set 262# CONFIG_INET_XFRM_MODE_TUNNEL is not set
254# CONFIG_INET_XFRM_MODE_BEET is not set 263# CONFIG_INET_XFRM_MODE_BEET is not set
264# CONFIG_INET_LRO is not set
255CONFIG_INET_DIAG=y 265CONFIG_INET_DIAG=y
256CONFIG_INET_TCP_DIAG=y 266CONFIG_INET_TCP_DIAG=y
257# CONFIG_TCP_CONG_ADVANCED is not set 267# CONFIG_TCP_CONG_ADVANCED is not set
@@ -309,6 +319,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
309# 319#
310# Generic Driver Options 320# Generic Driver Options
311# 321#
322CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
312CONFIG_STANDALONE=y 323CONFIG_STANDALONE=y
313CONFIG_PREVENT_FIRMWARE_BUILD=y 324CONFIG_PREVENT_FIRMWARE_BUILD=y
314CONFIG_FW_LOADER=y 325CONFIG_FW_LOADER=y
@@ -353,10 +364,6 @@ CONFIG_MISC_DEVICES=y
353# CONFIG_SCSI_NETLINK is not set 364# CONFIG_SCSI_NETLINK is not set
354# CONFIG_ATA is not set 365# CONFIG_ATA is not set
355# CONFIG_MD is not set 366# CONFIG_MD is not set
356
357#
358# Fusion MPT device support
359#
360# CONFIG_FUSION is not set 367# CONFIG_FUSION is not set
361 368
362# 369#
@@ -375,12 +382,36 @@ CONFIG_NETDEVICES=y
375# CONFIG_MACVLAN is not set 382# CONFIG_MACVLAN is not set
376# CONFIG_EQUALIZER is not set 383# CONFIG_EQUALIZER is not set
377# CONFIG_TUN is not set 384# CONFIG_TUN is not set
385# CONFIG_VETH is not set
386# CONFIG_IP1000 is not set
378# CONFIG_ARCNET is not set 387# CONFIG_ARCNET is not set
379# CONFIG_NET_ETHERNET is not set 388# CONFIG_PHYLIB is not set
389CONFIG_NET_ETHERNET=y
390# CONFIG_MII is not set
391# CONFIG_HAPPYMEAL is not set
392# CONFIG_SUNGEM is not set
393# CONFIG_CASSINI is not set
394# CONFIG_NET_VENDOR_3COM is not set
395# CONFIG_NET_TULIP is not set
396# CONFIG_HP100 is not set
397CONFIG_IBM_NEW_EMAC=y
398CONFIG_IBM_NEW_EMAC_RXB=128
399CONFIG_IBM_NEW_EMAC_TXB=64
400CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
401CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
402CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
403# CONFIG_IBM_NEW_EMAC_DEBUG is not set
404CONFIG_IBM_NEW_EMAC_ZMII=y
405# CONFIG_IBM_NEW_EMAC_RGMII is not set
406# CONFIG_IBM_NEW_EMAC_TAH is not set
407# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
408# CONFIG_NET_PCI is not set
409# CONFIG_B44 is not set
380CONFIG_NETDEV_1000=y 410CONFIG_NETDEV_1000=y
381# CONFIG_ACENIC is not set 411# CONFIG_ACENIC is not set
382# CONFIG_DL2K is not set 412# CONFIG_DL2K is not set
383# CONFIG_E1000 is not set 413# CONFIG_E1000 is not set
414# CONFIG_E1000E is not set
384# CONFIG_NS83820 is not set 415# CONFIG_NS83820 is not set
385# CONFIG_HAMACHI is not set 416# CONFIG_HAMACHI is not set
386# CONFIG_YELLOWFIN is not set 417# CONFIG_YELLOWFIN is not set
@@ -388,6 +419,7 @@ CONFIG_NETDEV_1000=y
388# CONFIG_SIS190 is not set 419# CONFIG_SIS190 is not set
389# CONFIG_SKGE is not set 420# CONFIG_SKGE is not set
390# CONFIG_SKY2 is not set 421# CONFIG_SKY2 is not set
422# CONFIG_SK98LIN is not set
391# CONFIG_VIA_VELOCITY is not set 423# CONFIG_VIA_VELOCITY is not set
392# CONFIG_TIGON3 is not set 424# CONFIG_TIGON3 is not set
393# CONFIG_BNX2 is not set 425# CONFIG_BNX2 is not set
@@ -396,11 +428,14 @@ CONFIG_NETDEV_1000=y
396CONFIG_NETDEV_10000=y 428CONFIG_NETDEV_10000=y
397# CONFIG_CHELSIO_T1 is not set 429# CONFIG_CHELSIO_T1 is not set
398# CONFIG_CHELSIO_T3 is not set 430# CONFIG_CHELSIO_T3 is not set
431# CONFIG_IXGBE is not set
399# CONFIG_IXGB is not set 432# CONFIG_IXGB is not set
400# CONFIG_S2IO is not set 433# CONFIG_S2IO is not set
401# CONFIG_MYRI10GE is not set 434# CONFIG_MYRI10GE is not set
402# CONFIG_NETXEN_NIC is not set 435# CONFIG_NETXEN_NIC is not set
436# CONFIG_NIU is not set
403# CONFIG_MLX4_CORE is not set 437# CONFIG_MLX4_CORE is not set
438# CONFIG_TEHUTI is not set
404# CONFIG_TR is not set 439# CONFIG_TR is not set
405 440
406# 441#
@@ -463,14 +498,11 @@ CONFIG_UNIX98_PTYS=y
463CONFIG_LEGACY_PTYS=y 498CONFIG_LEGACY_PTYS=y
464CONFIG_LEGACY_PTY_COUNT=256 499CONFIG_LEGACY_PTY_COUNT=256
465# CONFIG_IPMI_HANDLER is not set 500# CONFIG_IPMI_HANDLER is not set
466# CONFIG_WATCHDOG is not set
467# CONFIG_HW_RANDOM is not set 501# CONFIG_HW_RANDOM is not set
468# CONFIG_NVRAM is not set 502# CONFIG_NVRAM is not set
469# CONFIG_GEN_RTC is not set 503# CONFIG_GEN_RTC is not set
470# CONFIG_R3964 is not set 504# CONFIG_R3964 is not set
471# CONFIG_APPLICOM is not set 505# CONFIG_APPLICOM is not set
472# CONFIG_AGP is not set
473# CONFIG_DRM is not set
474# CONFIG_RAW_DRIVER is not set 506# CONFIG_RAW_DRIVER is not set
475# CONFIG_TCG_TPM is not set 507# CONFIG_TCG_TPM is not set
476CONFIG_DEVPORT=y 508CONFIG_DEVPORT=y
@@ -484,6 +516,13 @@ CONFIG_DEVPORT=y
484# CONFIG_W1 is not set 516# CONFIG_W1 is not set
485# CONFIG_POWER_SUPPLY is not set 517# CONFIG_POWER_SUPPLY is not set
486# CONFIG_HWMON is not set 518# CONFIG_HWMON is not set
519# CONFIG_WATCHDOG is not set
520
521#
522# Sonics Silicon Backplane
523#
524CONFIG_SSB_POSSIBLE=y
525# CONFIG_SSB is not set
487 526
488# 527#
489# Multifunction device drivers 528# Multifunction device drivers
@@ -500,16 +539,17 @@ CONFIG_DAB=y
500# 539#
501# Graphics support 540# Graphics support
502# 541#
542# CONFIG_AGP is not set
543# CONFIG_DRM is not set
544# CONFIG_VGASTATE is not set
545CONFIG_VIDEO_OUTPUT_CONTROL=m
546# CONFIG_FB is not set
503# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 547# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
504 548
505# 549#
506# Display device support 550# Display device support
507# 551#
508# CONFIG_DISPLAY_SUPPORT is not set 552# CONFIG_DISPLAY_SUPPORT is not set
509# CONFIG_VGASTATE is not set
510CONFIG_VIDEO_OUTPUT_CONTROL=m
511# CONFIG_FB is not set
512# CONFIG_FB_IBM_GXT4500 is not set
513 553
514# 554#
515# Sound 555# Sound
@@ -536,19 +576,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
536# CONFIG_RTC_CLASS is not set 576# CONFIG_RTC_CLASS is not set
537 577
538# 578#
539# DMA Engine support
540#
541# CONFIG_DMA_ENGINE is not set
542
543#
544# DMA Clients
545#
546
547#
548# DMA Devices
549#
550
551#
552# Userspace I/O 579# Userspace I/O
553# 580#
554# CONFIG_UIO is not set 581# CONFIG_UIO is not set
@@ -600,7 +627,6 @@ CONFIG_SYSFS=y
600CONFIG_TMPFS=y 627CONFIG_TMPFS=y
601# CONFIG_TMPFS_POSIX_ACL is not set 628# CONFIG_TMPFS_POSIX_ACL is not set
602# CONFIG_HUGETLB_PAGE is not set 629# CONFIG_HUGETLB_PAGE is not set
603CONFIG_RAMFS=y
604# CONFIG_CONFIGFS_FS is not set 630# CONFIG_CONFIGFS_FS is not set
605 631
606# 632#
@@ -619,10 +645,7 @@ CONFIG_CRAMFS=y
619# CONFIG_QNX4FS_FS is not set 645# CONFIG_QNX4FS_FS is not set
620# CONFIG_SYSV_FS is not set 646# CONFIG_SYSV_FS is not set
621# CONFIG_UFS_FS is not set 647# CONFIG_UFS_FS is not set
622 648CONFIG_NETWORK_FILESYSTEMS=y
623#
624# Network File Systems
625#
626CONFIG_NFS_FS=y 649CONFIG_NFS_FS=y
627CONFIG_NFS_V3=y 650CONFIG_NFS_V3=y
628# CONFIG_NFS_V3_ACL is not set 651# CONFIG_NFS_V3_ACL is not set
@@ -648,15 +671,7 @@ CONFIG_SUNRPC=y
648# 671#
649# CONFIG_PARTITION_ADVANCED is not set 672# CONFIG_PARTITION_ADVANCED is not set
650CONFIG_MSDOS_PARTITION=y 673CONFIG_MSDOS_PARTITION=y
651
652#
653# Native Language Support
654#
655# CONFIG_NLS is not set 674# CONFIG_NLS is not set
656
657#
658# Distributed Lock Manager
659#
660# CONFIG_DLM is not set 675# CONFIG_DLM is not set
661# CONFIG_UCC_SLOW is not set 676# CONFIG_UCC_SLOW is not set
662 677
@@ -709,6 +724,7 @@ CONFIG_SCHED_DEBUG=y
709# CONFIG_DEBUG_VM is not set 724# CONFIG_DEBUG_VM is not set
710# CONFIG_DEBUG_LIST is not set 725# CONFIG_DEBUG_LIST is not set
711CONFIG_FORCED_INLINING=y 726CONFIG_FORCED_INLINING=y
727# CONFIG_BOOT_PRINTK_DELAY is not set
712# CONFIG_RCU_TORTURE_TEST is not set 728# CONFIG_RCU_TORTURE_TEST is not set
713# CONFIG_FAULT_INJECTION is not set 729# CONFIG_FAULT_INJECTION is not set
714# CONFIG_DEBUG_STACKOVERFLOW is not set 730# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -728,6 +744,7 @@ CONFIG_PPC_EARLY_DEBUG=y
728# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set 744# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
729# CONFIG_PPC_EARLY_DEBUG_BEAT is not set 745# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
730CONFIG_PPC_EARLY_DEBUG_44x=y 746CONFIG_PPC_EARLY_DEBUG_44x=y
747# CONFIG_PPC_EARLY_DEBUG_CPM is not set
731CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300 748CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
732CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x0 749CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x0
733 750
@@ -736,6 +753,7 @@ CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x0
736# 753#
737# CONFIG_KEYS is not set 754# CONFIG_KEYS is not set
738# CONFIG_SECURITY is not set 755# CONFIG_SECURITY is not set
756# CONFIG_SECURITY_FILE_CAPABILITIES is not set
739CONFIG_CRYPTO=y 757CONFIG_CRYPTO=y
740CONFIG_CRYPTO_ALGAPI=y 758CONFIG_CRYPTO_ALGAPI=y
741CONFIG_CRYPTO_BLKCIPHER=y 759CONFIG_CRYPTO_BLKCIPHER=y
@@ -755,6 +773,7 @@ CONFIG_CRYPTO_ECB=y
755CONFIG_CRYPTO_CBC=y 773CONFIG_CRYPTO_CBC=y
756CONFIG_CRYPTO_PCBC=y 774CONFIG_CRYPTO_PCBC=y
757# CONFIG_CRYPTO_LRW is not set 775# CONFIG_CRYPTO_LRW is not set
776# CONFIG_CRYPTO_XTS is not set
758# CONFIG_CRYPTO_CRYPTD is not set 777# CONFIG_CRYPTO_CRYPTD is not set
759CONFIG_CRYPTO_DES=y 778CONFIG_CRYPTO_DES=y
760# CONFIG_CRYPTO_FCRYPT is not set 779# CONFIG_CRYPTO_FCRYPT is not set
@@ -768,9 +787,12 @@ CONFIG_CRYPTO_DES=y
768# CONFIG_CRYPTO_ARC4 is not set 787# CONFIG_CRYPTO_ARC4 is not set
769# CONFIG_CRYPTO_KHAZAD is not set 788# CONFIG_CRYPTO_KHAZAD is not set
770# CONFIG_CRYPTO_ANUBIS is not set 789# CONFIG_CRYPTO_ANUBIS is not set
790# CONFIG_CRYPTO_SEED is not set
771# CONFIG_CRYPTO_DEFLATE is not set 791# CONFIG_CRYPTO_DEFLATE is not set
772# CONFIG_CRYPTO_MICHAEL_MIC is not set 792# CONFIG_CRYPTO_MICHAEL_MIC is not set
773# CONFIG_CRYPTO_CRC32C is not set 793# CONFIG_CRYPTO_CRC32C is not set
774# CONFIG_CRYPTO_CAMELLIA is not set 794# CONFIG_CRYPTO_CAMELLIA is not set
775# CONFIG_CRYPTO_TEST is not set 795# CONFIG_CRYPTO_TEST is not set
796# CONFIG_CRYPTO_AUTHENC is not set
776CONFIG_CRYPTO_HW=y 797CONFIG_CRYPTO_HW=y
798# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/ebony_defconfig b/arch/powerpc/configs/ebony_defconfig
index 35a95dda681e..d3ef642811ef 100644
--- a/arch/powerpc/configs/ebony_defconfig
+++ b/arch/powerpc/configs/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.23-rc4 3# Linux kernel version: 2.6.23
4# Thu Aug 30 16:34:11 2007 4# Thu Oct 18 08:01:57 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -21,8 +21,13 @@ CONFIG_PHYS_64BIT=y
21# CONFIG_PPC_MM_SLICES is not set 21# CONFIG_PPC_MM_SLICES is not set
22CONFIG_NOT_COHERENT_CACHE=y 22CONFIG_NOT_COHERENT_CACHE=y
23CONFIG_PPC32=y 23CONFIG_PPC32=y
24CONFIG_WORD_SIZE=32
24CONFIG_PPC_MERGE=y 25CONFIG_PPC_MERGE=y
25CONFIG_MMU=y 26CONFIG_MMU=y
27CONFIG_GENERIC_CMOS_UPDATE=y
28CONFIG_GENERIC_TIME=y
29CONFIG_GENERIC_TIME_VSYSCALL=y
30CONFIG_GENERIC_CLOCKEVENTS=y
26CONFIG_GENERIC_HARDIRQS=y 31CONFIG_GENERIC_HARDIRQS=y
27CONFIG_IRQ_PER_CPU=y 32CONFIG_IRQ_PER_CPU=y
28CONFIG_RWSEM_XCHGADD_ALGORITHM=y 33CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -66,6 +71,8 @@ CONFIG_POSIX_MQUEUE=y
66# CONFIG_AUDIT is not set 71# CONFIG_AUDIT is not set
67# CONFIG_IKCONFIG is not set 72# CONFIG_IKCONFIG is not set
68CONFIG_LOG_BUF_SHIFT=14 73CONFIG_LOG_BUF_SHIFT=14
74CONFIG_FAIR_GROUP_SCHED=y
75CONFIG_FAIR_USER_SCHED=y
69CONFIG_SYSFS_DEPRECATED=y 76CONFIG_SYSFS_DEPRECATED=y
70# CONFIG_RELAY is not set 77# CONFIG_RELAY is not set
71CONFIG_BLK_DEV_INITRD=y 78CONFIG_BLK_DEV_INITRD=y
@@ -86,7 +93,6 @@ CONFIG_FUTEX=y
86CONFIG_ANON_INODES=y 93CONFIG_ANON_INODES=y
87CONFIG_EPOLL=y 94CONFIG_EPOLL=y
88CONFIG_SIGNALFD=y 95CONFIG_SIGNALFD=y
89CONFIG_TIMERFD=y
90CONFIG_EVENTFD=y 96CONFIG_EVENTFD=y
91CONFIG_SHMEM=y 97CONFIG_SHMEM=y
92CONFIG_VM_EVENT_COUNTERS=y 98CONFIG_VM_EVENT_COUNTERS=y
@@ -130,7 +136,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
130# CONFIG_PPC_CELL is not set 136# CONFIG_PPC_CELL is not set
131# CONFIG_PPC_CELL_NATIVE is not set 137# CONFIG_PPC_CELL_NATIVE is not set
132# CONFIG_PQ2ADS is not set 138# CONFIG_PQ2ADS is not set
139# CONFIG_BAMBOO is not set
133CONFIG_EBONY=y 140CONFIG_EBONY=y
141# CONFIG_SEQUOIA is not set
134CONFIG_440GP=y 142CONFIG_440GP=y
135# CONFIG_MPIC is not set 143# CONFIG_MPIC is not set
136# CONFIG_MPIC_WEIRD is not set 144# CONFIG_MPIC_WEIRD is not set
@@ -149,6 +157,10 @@ CONFIG_440GP=y
149# Kernel options 157# Kernel options
150# 158#
151# CONFIG_HIGHMEM is not set 159# CONFIG_HIGHMEM is not set
160# CONFIG_TICK_ONESHOT is not set
161# CONFIG_NO_HZ is not set
162# CONFIG_HIGH_RES_TIMERS is not set
163CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
152# CONFIG_HZ_100 is not set 164# CONFIG_HZ_100 is not set
153CONFIG_HZ_250=y 165CONFIG_HZ_250=y
154# CONFIG_HZ_300 is not set 166# CONFIG_HZ_300 is not set
@@ -170,6 +182,7 @@ CONFIG_FLATMEM_MANUAL=y
170CONFIG_FLATMEM=y 182CONFIG_FLATMEM=y
171CONFIG_FLAT_NODE_MEM_MAP=y 183CONFIG_FLAT_NODE_MEM_MAP=y
172# CONFIG_SPARSEMEM_STATIC is not set 184# CONFIG_SPARSEMEM_STATIC is not set
185# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
173CONFIG_SPLIT_PTLOCK_CPUS=4 186CONFIG_SPLIT_PTLOCK_CPUS=4
174CONFIG_RESOURCES_64BIT=y 187CONFIG_RESOURCES_64BIT=y
175CONFIG_ZONE_DMA_FLAG=1 188CONFIG_ZONE_DMA_FLAG=1
@@ -194,10 +207,6 @@ CONFIG_PCI_SYSCALL=y
194CONFIG_ARCH_SUPPORTS_MSI=y 207CONFIG_ARCH_SUPPORTS_MSI=y
195# CONFIG_PCI_MSI is not set 208# CONFIG_PCI_MSI is not set
196# CONFIG_PCI_DEBUG is not set 209# CONFIG_PCI_DEBUG is not set
197
198#
199# PCCARD (PCMCIA/CardBus) support
200#
201# CONFIG_PCCARD is not set 210# CONFIG_PCCARD is not set
202# CONFIG_HOTPLUG_PCI is not set 211# CONFIG_HOTPLUG_PCI is not set
203 212
@@ -212,7 +221,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y
212CONFIG_HIGHMEM_START=0xfe000000 221CONFIG_HIGHMEM_START=0xfe000000
213CONFIG_LOWMEM_SIZE=0x30000000 222CONFIG_LOWMEM_SIZE=0x30000000
214CONFIG_KERNEL_START=0xc0000000 223CONFIG_KERNEL_START=0xc0000000
215CONFIG_TASK_SIZE=0x80000000 224CONFIG_TASK_SIZE=0xc0000000
216CONFIG_CONSISTENT_START=0xff100000 225CONFIG_CONSISTENT_START=0xff100000
217CONFIG_CONSISTENT_SIZE=0x00200000 226CONFIG_CONSISTENT_SIZE=0x00200000
218CONFIG_BOOT_LOAD=0x01000000 227CONFIG_BOOT_LOAD=0x01000000
@@ -249,6 +258,7 @@ CONFIG_IP_PNP_BOOTP=y
249# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 258# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
250# CONFIG_INET_XFRM_MODE_TUNNEL is not set 259# CONFIG_INET_XFRM_MODE_TUNNEL is not set
251# CONFIG_INET_XFRM_MODE_BEET is not set 260# CONFIG_INET_XFRM_MODE_BEET is not set
261# CONFIG_INET_LRO is not set
252CONFIG_INET_DIAG=y 262CONFIG_INET_DIAG=y
253CONFIG_INET_TCP_DIAG=y 263CONFIG_INET_TCP_DIAG=y
254# CONFIG_TCP_CONG_ADVANCED is not set 264# CONFIG_TCP_CONG_ADVANCED is not set
@@ -306,6 +316,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
306# 316#
307# Generic Driver Options 317# Generic Driver Options
308# 318#
319CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
309CONFIG_STANDALONE=y 320CONFIG_STANDALONE=y
310CONFIG_PREVENT_FIRMWARE_BUILD=y 321CONFIG_PREVENT_FIRMWARE_BUILD=y
311CONFIG_FW_LOADER=y 322CONFIG_FW_LOADER=y
@@ -332,6 +343,7 @@ CONFIG_MTD_BLOCK=y
332# CONFIG_INFTL is not set 343# CONFIG_INFTL is not set
333# CONFIG_RFD_FTL is not set 344# CONFIG_RFD_FTL is not set
334# CONFIG_SSFDC is not set 345# CONFIG_SSFDC is not set
346# CONFIG_MTD_OOPS is not set
335 347
336# 348#
337# RAM/ROM/Flash chip drivers 349# RAM/ROM/Flash chip drivers
@@ -364,6 +376,7 @@ CONFIG_MTD_CFI_UTIL=y
364# CONFIG_MTD_COMPLEX_MAPPINGS is not set 376# CONFIG_MTD_COMPLEX_MAPPINGS is not set
365# CONFIG_MTD_PHYSMAP is not set 377# CONFIG_MTD_PHYSMAP is not set
366CONFIG_MTD_PHYSMAP_OF=y 378CONFIG_MTD_PHYSMAP_OF=y
379# CONFIG_MTD_INTEL_VR_NOR is not set
367# CONFIG_MTD_PLATRAM is not set 380# CONFIG_MTD_PLATRAM is not set
368 381
369# 382#
@@ -423,10 +436,6 @@ CONFIG_MISC_DEVICES=y
423# CONFIG_SCSI_NETLINK is not set 436# CONFIG_SCSI_NETLINK is not set
424# CONFIG_ATA is not set 437# CONFIG_ATA is not set
425# CONFIG_MD is not set 438# CONFIG_MD is not set
426
427#
428# Fusion MPT device support
429#
430# CONFIG_FUSION is not set 439# CONFIG_FUSION is not set
431 440
432# 441#
@@ -443,12 +452,36 @@ CONFIG_NETDEVICES=y
443# CONFIG_MACVLAN is not set 452# CONFIG_MACVLAN is not set
444# CONFIG_EQUALIZER is not set 453# CONFIG_EQUALIZER is not set
445# CONFIG_TUN is not set 454# CONFIG_TUN is not set
455# CONFIG_VETH is not set
456# CONFIG_IP1000 is not set
446# CONFIG_ARCNET is not set 457# CONFIG_ARCNET is not set
447# CONFIG_NET_ETHERNET is not set 458# CONFIG_PHYLIB is not set
459CONFIG_NET_ETHERNET=y
460# CONFIG_MII is not set
461# CONFIG_HAPPYMEAL is not set
462# CONFIG_SUNGEM is not set
463# CONFIG_CASSINI is not set
464# CONFIG_NET_VENDOR_3COM is not set
465# CONFIG_NET_TULIP is not set
466# CONFIG_HP100 is not set
467CONFIG_IBM_NEW_EMAC=y
468CONFIG_IBM_NEW_EMAC_RXB=128
469CONFIG_IBM_NEW_EMAC_TXB=64
470CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
471CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
472CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
473# CONFIG_IBM_NEW_EMAC_DEBUG is not set
474CONFIG_IBM_NEW_EMAC_ZMII=y
475# CONFIG_IBM_NEW_EMAC_RGMII is not set
476# CONFIG_IBM_NEW_EMAC_TAH is not set
477# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
478# CONFIG_NET_PCI is not set
479# CONFIG_B44 is not set
448CONFIG_NETDEV_1000=y 480CONFIG_NETDEV_1000=y
449# CONFIG_ACENIC is not set 481# CONFIG_ACENIC is not set
450# CONFIG_DL2K is not set 482# CONFIG_DL2K is not set
451# CONFIG_E1000 is not set 483# CONFIG_E1000 is not set
484# CONFIG_E1000E is not set
452# CONFIG_NS83820 is not set 485# CONFIG_NS83820 is not set
453# CONFIG_HAMACHI is not set 486# CONFIG_HAMACHI is not set
454# CONFIG_YELLOWFIN is not set 487# CONFIG_YELLOWFIN is not set
@@ -456,6 +489,7 @@ CONFIG_NETDEV_1000=y
456# CONFIG_SIS190 is not set 489# CONFIG_SIS190 is not set
457# CONFIG_SKGE is not set 490# CONFIG_SKGE is not set
458# CONFIG_SKY2 is not set 491# CONFIG_SKY2 is not set
492# CONFIG_SK98LIN is not set
459# CONFIG_VIA_VELOCITY is not set 493# CONFIG_VIA_VELOCITY is not set
460# CONFIG_TIGON3 is not set 494# CONFIG_TIGON3 is not set
461# CONFIG_BNX2 is not set 495# CONFIG_BNX2 is not set
@@ -464,11 +498,14 @@ CONFIG_NETDEV_1000=y
464CONFIG_NETDEV_10000=y 498CONFIG_NETDEV_10000=y
465# CONFIG_CHELSIO_T1 is not set 499# CONFIG_CHELSIO_T1 is not set
466# CONFIG_CHELSIO_T3 is not set 500# CONFIG_CHELSIO_T3 is not set
501# CONFIG_IXGBE is not set
467# CONFIG_IXGB is not set 502# CONFIG_IXGB is not set
468# CONFIG_S2IO is not set 503# CONFIG_S2IO is not set
469# CONFIG_MYRI10GE is not set 504# CONFIG_MYRI10GE is not set
470# CONFIG_NETXEN_NIC is not set 505# CONFIG_NETXEN_NIC is not set
506# CONFIG_NIU is not set
471# CONFIG_MLX4_CORE is not set 507# CONFIG_MLX4_CORE is not set
508# CONFIG_TEHUTI is not set
472# CONFIG_TR is not set 509# CONFIG_TR is not set
473 510
474# 511#
@@ -537,8 +574,6 @@ CONFIG_LEGACY_PTY_COUNT=256
537# CONFIG_GEN_RTC is not set 574# CONFIG_GEN_RTC is not set
538# CONFIG_R3964 is not set 575# CONFIG_R3964 is not set
539# CONFIG_APPLICOM is not set 576# CONFIG_APPLICOM is not set
540# CONFIG_AGP is not set
541# CONFIG_DRM is not set
542# CONFIG_RAW_DRIVER is not set 577# CONFIG_RAW_DRIVER is not set
543# CONFIG_TCG_TPM is not set 578# CONFIG_TCG_TPM is not set
544CONFIG_DEVPORT=y 579CONFIG_DEVPORT=y
@@ -554,6 +589,12 @@ CONFIG_DEVPORT=y
554# CONFIG_HWMON is not set 589# CONFIG_HWMON is not set
555 590
556# 591#
592# Sonics Silicon Backplane
593#
594CONFIG_SSB_POSSIBLE=y
595# CONFIG_SSB is not set
596
597#
557# Multifunction device drivers 598# Multifunction device drivers
558# 599#
559# CONFIG_MFD_SM501 is not set 600# CONFIG_MFD_SM501 is not set
@@ -568,16 +609,17 @@ CONFIG_DEVPORT=y
568# 609#
569# Graphics support 610# Graphics support
570# 611#
612# CONFIG_AGP is not set
613# CONFIG_DRM is not set
614# CONFIG_VGASTATE is not set
615# CONFIG_VIDEO_OUTPUT_CONTROL is not set
616# CONFIG_FB is not set
571# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 617# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
572 618
573# 619#
574# Display device support 620# Display device support
575# 621#
576# CONFIG_DISPLAY_SUPPORT is not set 622# CONFIG_DISPLAY_SUPPORT is not set
577# CONFIG_VGASTATE is not set
578# CONFIG_VIDEO_OUTPUT_CONTROL is not set
579# CONFIG_FB is not set
580# CONFIG_FB_IBM_GXT4500 is not set
581 623
582# 624#
583# Sound 625# Sound
@@ -604,19 +646,6 @@ CONFIG_USB_ARCH_HAS_EHCI=y
604# CONFIG_RTC_CLASS is not set 646# CONFIG_RTC_CLASS is not set
605 647
606# 648#
607# DMA Engine support
608#
609# CONFIG_DMA_ENGINE is not set
610
611#
612# DMA Clients
613#
614
615#
616# DMA Devices
617#
618
619#
620# Userspace I/O 649# Userspace I/O
621# 650#
622# CONFIG_UIO is not set 651# CONFIG_UIO is not set
@@ -668,7 +697,6 @@ CONFIG_SYSFS=y
668CONFIG_TMPFS=y 697CONFIG_TMPFS=y
669# CONFIG_TMPFS_POSIX_ACL is not set 698# CONFIG_TMPFS_POSIX_ACL is not set
670# CONFIG_HUGETLB_PAGE is not set 699# CONFIG_HUGETLB_PAGE is not set
671CONFIG_RAMFS=y
672# CONFIG_CONFIGFS_FS is not set 700# CONFIG_CONFIGFS_FS is not set
673 701
674# 702#
@@ -684,10 +712,12 @@ CONFIG_RAMFS=y
684CONFIG_JFFS2_FS=y 712CONFIG_JFFS2_FS=y
685CONFIG_JFFS2_FS_DEBUG=0 713CONFIG_JFFS2_FS_DEBUG=0
686CONFIG_JFFS2_FS_WRITEBUFFER=y 714CONFIG_JFFS2_FS_WRITEBUFFER=y
715# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
687# CONFIG_JFFS2_SUMMARY is not set 716# CONFIG_JFFS2_SUMMARY is not set
688# CONFIG_JFFS2_FS_XATTR is not set 717# CONFIG_JFFS2_FS_XATTR is not set
689# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set 718# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
690CONFIG_JFFS2_ZLIB=y 719CONFIG_JFFS2_ZLIB=y
720# CONFIG_JFFS2_LZO is not set
691CONFIG_JFFS2_RTIME=y 721CONFIG_JFFS2_RTIME=y
692# CONFIG_JFFS2_RUBIN is not set 722# CONFIG_JFFS2_RUBIN is not set
693CONFIG_CRAMFS=y 723CONFIG_CRAMFS=y
@@ -696,10 +726,7 @@ CONFIG_CRAMFS=y
696# CONFIG_QNX4FS_FS is not set 726# CONFIG_QNX4FS_FS is not set
697# CONFIG_SYSV_FS is not set 727# CONFIG_SYSV_FS is not set
698# CONFIG_UFS_FS is not set 728# CONFIG_UFS_FS is not set
699 729CONFIG_NETWORK_FILESYSTEMS=y
700#
701# Network File Systems
702#
703CONFIG_NFS_FS=y 730CONFIG_NFS_FS=y
704CONFIG_NFS_V3=y 731CONFIG_NFS_V3=y
705# CONFIG_NFS_V3_ACL is not set 732# CONFIG_NFS_V3_ACL is not set
@@ -725,15 +752,7 @@ CONFIG_SUNRPC=y
725# 752#
726# CONFIG_PARTITION_ADVANCED is not set 753# CONFIG_PARTITION_ADVANCED is not set
727CONFIG_MSDOS_PARTITION=y 754CONFIG_MSDOS_PARTITION=y
728
729#
730# Native Language Support
731#
732# CONFIG_NLS is not set 755# CONFIG_NLS is not set
733
734#
735# Distributed Lock Manager
736#
737# CONFIG_DLM is not set 756# CONFIG_DLM is not set
738# CONFIG_UCC_SLOW is not set 757# CONFIG_UCC_SLOW is not set
739 758
@@ -787,6 +806,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
787# CONFIG_DEBUG_VM is not set 806# CONFIG_DEBUG_VM is not set
788# CONFIG_DEBUG_LIST is not set 807# CONFIG_DEBUG_LIST is not set
789CONFIG_FORCED_INLINING=y 808CONFIG_FORCED_INLINING=y
809# CONFIG_BOOT_PRINTK_DELAY is not set
790# CONFIG_RCU_TORTURE_TEST is not set 810# CONFIG_RCU_TORTURE_TEST is not set
791# CONFIG_FAULT_INJECTION is not set 811# CONFIG_FAULT_INJECTION is not set
792# CONFIG_DEBUG_STACKOVERFLOW is not set 812# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -801,6 +821,7 @@ CONFIG_FORCED_INLINING=y
801# 821#
802# CONFIG_KEYS is not set 822# CONFIG_KEYS is not set
803# CONFIG_SECURITY is not set 823# CONFIG_SECURITY is not set
824# CONFIG_SECURITY_FILE_CAPABILITIES is not set
804CONFIG_CRYPTO=y 825CONFIG_CRYPTO=y
805CONFIG_CRYPTO_ALGAPI=y 826CONFIG_CRYPTO_ALGAPI=y
806CONFIG_CRYPTO_BLKCIPHER=y 827CONFIG_CRYPTO_BLKCIPHER=y
@@ -820,6 +841,7 @@ CONFIG_CRYPTO_ECB=y
820CONFIG_CRYPTO_CBC=y 841CONFIG_CRYPTO_CBC=y
821CONFIG_CRYPTO_PCBC=y 842CONFIG_CRYPTO_PCBC=y
822# CONFIG_CRYPTO_LRW is not set 843# CONFIG_CRYPTO_LRW is not set
844# CONFIG_CRYPTO_XTS is not set
823# CONFIG_CRYPTO_CRYPTD is not set 845# CONFIG_CRYPTO_CRYPTD is not set
824CONFIG_CRYPTO_DES=y 846CONFIG_CRYPTO_DES=y
825# CONFIG_CRYPTO_FCRYPT is not set 847# CONFIG_CRYPTO_FCRYPT is not set
@@ -833,9 +855,12 @@ CONFIG_CRYPTO_DES=y
833# CONFIG_CRYPTO_ARC4 is not set 855# CONFIG_CRYPTO_ARC4 is not set
834# CONFIG_CRYPTO_KHAZAD is not set 856# CONFIG_CRYPTO_KHAZAD is not set
835# CONFIG_CRYPTO_ANUBIS is not set 857# CONFIG_CRYPTO_ANUBIS is not set
858# CONFIG_CRYPTO_SEED is not set
836# CONFIG_CRYPTO_DEFLATE is not set 859# CONFIG_CRYPTO_DEFLATE is not set
837# CONFIG_CRYPTO_MICHAEL_MIC is not set 860# CONFIG_CRYPTO_MICHAEL_MIC is not set
838# CONFIG_CRYPTO_CRC32C is not set 861# CONFIG_CRYPTO_CRC32C is not set
839# CONFIG_CRYPTO_CAMELLIA is not set 862# CONFIG_CRYPTO_CAMELLIA is not set
840# CONFIG_CRYPTO_TEST is not set 863# CONFIG_CRYPTO_TEST is not set
864# CONFIG_CRYPTO_AUTHENC is not set
841# CONFIG_CRYPTO_HW is not set 865# CONFIG_CRYPTO_HW is not set
866# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/walnut_defconfig b/arch/powerpc/configs/walnut_defconfig
index 7724292cc06d..02896ecba490 100644
--- a/arch/powerpc/configs/walnut_defconfig
+++ b/arch/powerpc/configs/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.23-rc4 3# Linux kernel version: 2.6.23
4# Wed Sep 5 12:06:37 2007 4# Thu Oct 18 12:54:18 2007
5# 5#
6# CONFIG_PPC64 is not set 6# CONFIG_PPC64 is not set
7 7
@@ -18,8 +18,13 @@ CONFIG_4xx=y
18# CONFIG_PPC_MM_SLICES is not set 18# CONFIG_PPC_MM_SLICES is not set
19CONFIG_NOT_COHERENT_CACHE=y 19CONFIG_NOT_COHERENT_CACHE=y
20CONFIG_PPC32=y 20CONFIG_PPC32=y
21CONFIG_WORD_SIZE=32
21CONFIG_PPC_MERGE=y 22CONFIG_PPC_MERGE=y
22CONFIG_MMU=y 23CONFIG_MMU=y
24CONFIG_GENERIC_CMOS_UPDATE=y
25CONFIG_GENERIC_TIME=y
26CONFIG_GENERIC_TIME_VSYSCALL=y
27CONFIG_GENERIC_CLOCKEVENTS=y
23CONFIG_GENERIC_HARDIRQS=y 28CONFIG_GENERIC_HARDIRQS=y
24CONFIG_IRQ_PER_CPU=y 29CONFIG_IRQ_PER_CPU=y
25CONFIG_RWSEM_XCHGADD_ALGORITHM=y 30CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -63,6 +68,8 @@ CONFIG_POSIX_MQUEUE=y
63# CONFIG_AUDIT is not set 68# CONFIG_AUDIT is not set
64# CONFIG_IKCONFIG is not set 69# CONFIG_IKCONFIG is not set
65CONFIG_LOG_BUF_SHIFT=14 70CONFIG_LOG_BUF_SHIFT=14
71CONFIG_FAIR_GROUP_SCHED=y
72CONFIG_FAIR_USER_SCHED=y
66CONFIG_SYSFS_DEPRECATED=y 73CONFIG_SYSFS_DEPRECATED=y
67# CONFIG_RELAY is not set 74# CONFIG_RELAY is not set
68CONFIG_BLK_DEV_INITRD=y 75CONFIG_BLK_DEV_INITRD=y
@@ -83,7 +90,6 @@ CONFIG_FUTEX=y
83CONFIG_ANON_INODES=y 90CONFIG_ANON_INODES=y
84CONFIG_EPOLL=y 91CONFIG_EPOLL=y
85CONFIG_SIGNALFD=y 92CONFIG_SIGNALFD=y
86CONFIG_TIMERFD=y
87CONFIG_EVENTFD=y 93CONFIG_EVENTFD=y
88CONFIG_SHMEM=y 94CONFIG_SHMEM=y
89CONFIG_VM_EVENT_COUNTERS=y 95CONFIG_VM_EVENT_COUNTERS=y
@@ -127,7 +133,9 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
127# CONFIG_PPC_CELL is not set 133# CONFIG_PPC_CELL is not set
128# CONFIG_PPC_CELL_NATIVE is not set 134# CONFIG_PPC_CELL_NATIVE is not set
129# CONFIG_PQ2ADS is not set 135# CONFIG_PQ2ADS is not set
136# CONFIG_KILAUEA is not set
130CONFIG_WALNUT=y 137CONFIG_WALNUT=y
138# CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set
131CONFIG_405GP=y 139CONFIG_405GP=y
132CONFIG_IBM405_ERR77=y 140CONFIG_IBM405_ERR77=y
133CONFIG_IBM405_ERR51=y 141CONFIG_IBM405_ERR51=y
@@ -148,6 +156,10 @@ CONFIG_IBM405_ERR51=y
148# Kernel options 156# Kernel options
149# 157#
150# CONFIG_HIGHMEM is not set 158# CONFIG_HIGHMEM is not set
159# CONFIG_TICK_ONESHOT is not set
160# CONFIG_NO_HZ is not set
161# CONFIG_HIGH_RES_TIMERS is not set
162CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
151# CONFIG_HZ_100 is not set 163# CONFIG_HZ_100 is not set
152CONFIG_HZ_250=y 164CONFIG_HZ_250=y
153# CONFIG_HZ_300 is not set 165# CONFIG_HZ_300 is not set
@@ -169,6 +181,7 @@ CONFIG_FLATMEM_MANUAL=y
169CONFIG_FLATMEM=y 181CONFIG_FLATMEM=y
170CONFIG_FLAT_NODE_MEM_MAP=y 182CONFIG_FLAT_NODE_MEM_MAP=y
171# CONFIG_SPARSEMEM_STATIC is not set 183# CONFIG_SPARSEMEM_STATIC is not set
184# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
172CONFIG_SPLIT_PTLOCK_CPUS=4 185CONFIG_SPLIT_PTLOCK_CPUS=4
173CONFIG_RESOURCES_64BIT=y 186CONFIG_RESOURCES_64BIT=y
174CONFIG_ZONE_DMA_FLAG=1 187CONFIG_ZONE_DMA_FLAG=1
@@ -177,6 +190,8 @@ CONFIG_VIRT_TO_BUS=y
177CONFIG_PROC_DEVICETREE=y 190CONFIG_PROC_DEVICETREE=y
178# CONFIG_CMDLINE_BOOL is not set 191# CONFIG_CMDLINE_BOOL is not set
179# CONFIG_PM is not set 192# CONFIG_PM is not set
193CONFIG_SUSPEND_UP_POSSIBLE=y
194CONFIG_HIBERNATION_UP_POSSIBLE=y
180CONFIG_SECCOMP=y 195CONFIG_SECCOMP=y
181CONFIG_WANT_DEVICE_TREE=y 196CONFIG_WANT_DEVICE_TREE=y
182CONFIG_DEVICE_TREE="walnut.dts" 197CONFIG_DEVICE_TREE="walnut.dts"
@@ -190,10 +205,6 @@ CONFIG_ZONE_DMA=y
190# CONFIG_PCI_DOMAINS is not set 205# CONFIG_PCI_DOMAINS is not set
191# CONFIG_PCI_SYSCALL is not set 206# CONFIG_PCI_SYSCALL is not set
192# CONFIG_ARCH_SUPPORTS_MSI is not set 207# CONFIG_ARCH_SUPPORTS_MSI is not set
193
194#
195# PCCARD (PCMCIA/CardBus) support
196#
197# CONFIG_PCCARD is not set 208# CONFIG_PCCARD is not set
198 209
199# 210#
@@ -207,7 +218,7 @@ CONFIG_ZONE_DMA=y
207CONFIG_HIGHMEM_START=0xfe000000 218CONFIG_HIGHMEM_START=0xfe000000
208CONFIG_LOWMEM_SIZE=0x30000000 219CONFIG_LOWMEM_SIZE=0x30000000
209CONFIG_KERNEL_START=0xc0000000 220CONFIG_KERNEL_START=0xc0000000
210CONFIG_TASK_SIZE=0x80000000 221CONFIG_TASK_SIZE=0xc0000000
211CONFIG_CONSISTENT_START=0xff100000 222CONFIG_CONSISTENT_START=0xff100000
212CONFIG_CONSISTENT_SIZE=0x00200000 223CONFIG_CONSISTENT_SIZE=0x00200000
213CONFIG_BOOT_LOAD=0x00400000 224CONFIG_BOOT_LOAD=0x00400000
@@ -244,6 +255,7 @@ CONFIG_IP_PNP_BOOTP=y
244# CONFIG_INET_XFRM_MODE_TRANSPORT is not set 255# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
245# CONFIG_INET_XFRM_MODE_TUNNEL is not set 256# CONFIG_INET_XFRM_MODE_TUNNEL is not set
246# CONFIG_INET_XFRM_MODE_BEET is not set 257# CONFIG_INET_XFRM_MODE_BEET is not set
258# CONFIG_INET_LRO is not set
247CONFIG_INET_DIAG=y 259CONFIG_INET_DIAG=y
248CONFIG_INET_TCP_DIAG=y 260CONFIG_INET_TCP_DIAG=y
249# CONFIG_TCP_CONG_ADVANCED is not set 261# CONFIG_TCP_CONG_ADVANCED is not set
@@ -301,6 +313,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
301# 313#
302# Generic Driver Options 314# Generic Driver Options
303# 315#
316CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
304CONFIG_STANDALONE=y 317CONFIG_STANDALONE=y
305CONFIG_PREVENT_FIRMWARE_BUILD=y 318CONFIG_PREVENT_FIRMWARE_BUILD=y
306CONFIG_FW_LOADER=y 319CONFIG_FW_LOADER=y
@@ -328,6 +341,7 @@ CONFIG_MTD_BLOCK=m
328# CONFIG_INFTL is not set 341# CONFIG_INFTL is not set
329# CONFIG_RFD_FTL is not set 342# CONFIG_RFD_FTL is not set
330# CONFIG_SSFDC is not set 343# CONFIG_SSFDC is not set
344# CONFIG_MTD_OOPS is not set
331 345
332# 346#
333# RAM/ROM/Flash chip drivers 347# RAM/ROM/Flash chip drivers
@@ -360,7 +374,6 @@ CONFIG_MTD_CFI_UTIL=y
360# CONFIG_MTD_COMPLEX_MAPPINGS is not set 374# CONFIG_MTD_COMPLEX_MAPPINGS is not set
361# CONFIG_MTD_PHYSMAP is not set 375# CONFIG_MTD_PHYSMAP is not set
362CONFIG_MTD_PHYSMAP_OF=y 376CONFIG_MTD_PHYSMAP_OF=y
363# CONFIG_MTD_WALNUT is not set
364# CONFIG_MTD_PLATRAM is not set 377# CONFIG_MTD_PLATRAM is not set
365 378
366# 379#
@@ -419,7 +432,22 @@ CONFIG_NETDEVICES=y
419# CONFIG_MACVLAN is not set 432# CONFIG_MACVLAN is not set
420# CONFIG_EQUALIZER is not set 433# CONFIG_EQUALIZER is not set
421# CONFIG_TUN is not set 434# CONFIG_TUN is not set
422# CONFIG_NET_ETHERNET is not set 435# CONFIG_VETH is not set
436# CONFIG_PHYLIB is not set
437CONFIG_NET_ETHERNET=y
438# CONFIG_MII is not set
439CONFIG_IBM_NEW_EMAC=y
440CONFIG_IBM_NEW_EMAC_RXB=128
441CONFIG_IBM_NEW_EMAC_TXB=64
442CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
443CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
444CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
445# CONFIG_IBM_NEW_EMAC_DEBUG is not set
446CONFIG_IBM_NEW_EMAC_ZMII=y
447# CONFIG_IBM_NEW_EMAC_RGMII is not set
448# CONFIG_IBM_NEW_EMAC_TAH is not set
449# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
450# CONFIG_B44 is not set
423CONFIG_NETDEV_1000=y 451CONFIG_NETDEV_1000=y
424CONFIG_NETDEV_10000=y 452CONFIG_NETDEV_10000=y
425 453
@@ -498,6 +526,12 @@ CONFIG_LEGACY_PTY_COUNT=256
498# CONFIG_HWMON is not set 526# CONFIG_HWMON is not set
499 527
500# 528#
529# Sonics Silicon Backplane
530#
531CONFIG_SSB_POSSIBLE=y
532# CONFIG_SSB is not set
533
534#
501# Multifunction device drivers 535# Multifunction device drivers
502# 536#
503# CONFIG_MFD_SM501 is not set 537# CONFIG_MFD_SM501 is not set
@@ -512,16 +546,15 @@ CONFIG_LEGACY_PTY_COUNT=256
512# 546#
513# Graphics support 547# Graphics support
514# 548#
549# CONFIG_VGASTATE is not set
550CONFIG_VIDEO_OUTPUT_CONTROL=m
551# CONFIG_FB is not set
515# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 552# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
516 553
517# 554#
518# Display device support 555# Display device support
519# 556#
520# CONFIG_DISPLAY_SUPPORT is not set 557# CONFIG_DISPLAY_SUPPORT is not set
521# CONFIG_VGASTATE is not set
522CONFIG_VIDEO_OUTPUT_CONTROL=m
523# CONFIG_FB is not set
524# CONFIG_FB_IBM_GXT4500 is not set
525 558
526# 559#
527# Sound 560# Sound
@@ -546,19 +579,6 @@ CONFIG_USB_SUPPORT=y
546# CONFIG_RTC_CLASS is not set 579# CONFIG_RTC_CLASS is not set
547 580
548# 581#
549# DMA Engine support
550#
551# CONFIG_DMA_ENGINE is not set
552
553#
554# DMA Clients
555#
556
557#
558# DMA Devices
559#
560
561#
562# Userspace I/O 582# Userspace I/O
563# 583#
564# CONFIG_UIO is not set 584# CONFIG_UIO is not set
@@ -610,7 +630,6 @@ CONFIG_SYSFS=y
610CONFIG_TMPFS=y 630CONFIG_TMPFS=y
611# CONFIG_TMPFS_POSIX_ACL is not set 631# CONFIG_TMPFS_POSIX_ACL is not set
612# CONFIG_HUGETLB_PAGE is not set 632# CONFIG_HUGETLB_PAGE is not set
613CONFIG_RAMFS=y
614# CONFIG_CONFIGFS_FS is not set 633# CONFIG_CONFIGFS_FS is not set
615 634
616# 635#
@@ -630,10 +649,7 @@ CONFIG_CRAMFS=y
630# CONFIG_QNX4FS_FS is not set 649# CONFIG_QNX4FS_FS is not set
631# CONFIG_SYSV_FS is not set 650# CONFIG_SYSV_FS is not set
632# CONFIG_UFS_FS is not set 651# CONFIG_UFS_FS is not set
633 652CONFIG_NETWORK_FILESYSTEMS=y
634#
635# Network File Systems
636#
637CONFIG_NFS_FS=y 653CONFIG_NFS_FS=y
638CONFIG_NFS_V3=y 654CONFIG_NFS_V3=y
639# CONFIG_NFS_V3_ACL is not set 655# CONFIG_NFS_V3_ACL is not set
@@ -659,15 +675,7 @@ CONFIG_SUNRPC=y
659# 675#
660# CONFIG_PARTITION_ADVANCED is not set 676# CONFIG_PARTITION_ADVANCED is not set
661CONFIG_MSDOS_PARTITION=y 677CONFIG_MSDOS_PARTITION=y
662
663#
664# Native Language Support
665#
666# CONFIG_NLS is not set 678# CONFIG_NLS is not set
667
668#
669# Distributed Lock Manager
670#
671# CONFIG_DLM is not set 679# CONFIG_DLM is not set
672# CONFIG_UCC_SLOW is not set 680# CONFIG_UCC_SLOW is not set
673 681
@@ -720,6 +728,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
720# CONFIG_DEBUG_VM is not set 728# CONFIG_DEBUG_VM is not set
721# CONFIG_DEBUG_LIST is not set 729# CONFIG_DEBUG_LIST is not set
722CONFIG_FORCED_INLINING=y 730CONFIG_FORCED_INLINING=y
731# CONFIG_BOOT_PRINTK_DELAY is not set
723# CONFIG_RCU_TORTURE_TEST is not set 732# CONFIG_RCU_TORTURE_TEST is not set
724# CONFIG_FAULT_INJECTION is not set 733# CONFIG_FAULT_INJECTION is not set
725# CONFIG_DEBUG_STACKOVERFLOW is not set 734# CONFIG_DEBUG_STACKOVERFLOW is not set
@@ -734,6 +743,7 @@ CONFIG_FORCED_INLINING=y
734# 743#
735# CONFIG_KEYS is not set 744# CONFIG_KEYS is not set
736# CONFIG_SECURITY is not set 745# CONFIG_SECURITY is not set
746# CONFIG_SECURITY_FILE_CAPABILITIES is not set
737CONFIG_CRYPTO=y 747CONFIG_CRYPTO=y
738CONFIG_CRYPTO_ALGAPI=y 748CONFIG_CRYPTO_ALGAPI=y
739CONFIG_CRYPTO_BLKCIPHER=y 749CONFIG_CRYPTO_BLKCIPHER=y
@@ -753,6 +763,7 @@ CONFIG_CRYPTO_ECB=y
753CONFIG_CRYPTO_CBC=y 763CONFIG_CRYPTO_CBC=y
754CONFIG_CRYPTO_PCBC=y 764CONFIG_CRYPTO_PCBC=y
755# CONFIG_CRYPTO_LRW is not set 765# CONFIG_CRYPTO_LRW is not set
766# CONFIG_CRYPTO_XTS is not set
756# CONFIG_CRYPTO_CRYPTD is not set 767# CONFIG_CRYPTO_CRYPTD is not set
757CONFIG_CRYPTO_DES=y 768CONFIG_CRYPTO_DES=y
758# CONFIG_CRYPTO_FCRYPT is not set 769# CONFIG_CRYPTO_FCRYPT is not set
@@ -766,9 +777,12 @@ CONFIG_CRYPTO_DES=y
766# CONFIG_CRYPTO_ARC4 is not set 777# CONFIG_CRYPTO_ARC4 is not set
767# CONFIG_CRYPTO_KHAZAD is not set 778# CONFIG_CRYPTO_KHAZAD is not set
768# CONFIG_CRYPTO_ANUBIS is not set 779# CONFIG_CRYPTO_ANUBIS is not set
780# CONFIG_CRYPTO_SEED is not set
769# CONFIG_CRYPTO_DEFLATE is not set 781# CONFIG_CRYPTO_DEFLATE is not set
770# CONFIG_CRYPTO_MICHAEL_MIC is not set 782# CONFIG_CRYPTO_MICHAEL_MIC is not set
771# CONFIG_CRYPTO_CRC32C is not set 783# CONFIG_CRYPTO_CRC32C is not set
772# CONFIG_CRYPTO_CAMELLIA is not set 784# CONFIG_CRYPTO_CAMELLIA is not set
773# CONFIG_CRYPTO_TEST is not set 785# CONFIG_CRYPTO_TEST is not set
786# CONFIG_CRYPTO_AUTHENC is not set
774CONFIG_CRYPTO_HW=y 787CONFIG_CRYPTO_HW=y
788# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index 47b3b0a3864a..8f6699fcc145 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -100,6 +100,7 @@ config 405GP
100 bool 100 bool
101 select IBM405_ERR77 101 select IBM405_ERR77
102 select IBM405_ERR51 102 select IBM405_ERR51
103 select IBM_NEW_EMAC_ZMII
103 104
104config 405EP 105config 405EP
105 bool 106 bool
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 51f3ea40a285..8390cc164135 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -43,14 +43,14 @@ config 440EP
43 bool 43 bool
44 select PPC_FPU 44 select PPC_FPU
45 select IBM440EP_ERR42 45 select IBM440EP_ERR42
46# select IBM_NEW_EMAC_ZMII 46 select IBM_NEW_EMAC_ZMII
47 47
48config 440EPX 48config 440EPX
49 bool 49 bool
50 select PPC_FPU 50 select PPC_FPU
51# Disabled until the new EMAC Driver is merged. 51 select IBM_NEW_EMAC_EMAC4
52# select IBM_NEW_EMAC_EMAC4 52 select IBM_NEW_EMAC_RGMII
53# select IBM_NEW_EMAC_ZMII 53 select IBM_NEW_EMAC_ZMII
54 54
55config 440GP 55config 440GP
56 bool 56 bool
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 3c7325ec36ec..99684ea606af 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -48,6 +48,7 @@ config 44x
48 bool "AMCC 44x" 48 bool "AMCC 44x"
49 select PPC_DCR_NATIVE 49 select PPC_DCR_NATIVE
50 select WANT_DEVICE_TREE 50 select WANT_DEVICE_TREE
51 select PPC_UDBG_16550
51 52
52config E200 53config E200
53 bool "Freescale e200" 54 bool "Freescale e200"
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-28 18:14:30 -0500