aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-10-19 10:53:12 -0400
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-10-19 17:18:35 -0400
commit739253765ed55742431866b19330fa0e1012c417 (patch)
tree2ea59d01e57c0da0582fef7d1fe0f51aed7dfa3a /arch/powerpc
parentb3af7a55da9925b73136d5358573e8962dfd35a0 (diff)
[POWERPC] 4xx: Enable EMAC on Bamboo board
Fix some device tree omissions that prevented the new EMAC driver from setting up ethernet on the Bamboo board correctly and update the Bamboo defconfig. Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/boot/dts/bamboo.dts10
-rw-r--r--arch/powerpc/configs/bamboo_defconfig114
-rw-r--r--arch/powerpc/platforms/44x/Kconfig2
3 files changed, 76 insertions, 50 deletions
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/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/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 97c2c4a3ee8b..8390cc164135 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -43,7 +43,7 @@ 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