diff options
author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-10-19 10:53:11 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-10-19 17:18:33 -0400 |
commit | b3af7a55da9925b73136d5358573e8962dfd35a0 (patch) | |
tree | 3335e4e2248b6ecbaa4c0001275be5e78acdc0d9 /arch/powerpc/configs | |
parent | 094624fa66758e9f555587c29b23cf5bc67c10fd (diff) |
[POWERPC] 4xx: Enable EMAC for PPC405 Walnut board
This patch enables the ibm_newemac driver for the Walnut board. It fixes the
device tree for the walnut board to order the MAL interrupts correctly and
adds the local-mac-address property to the EMAC node. The bootwrapper is also
updated to extract the MAC address from the OpenBIOS offset where it is stored.
Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r-- | arch/powerpc/configs/walnut_defconfig | 94 |
1 files changed, 54 insertions, 40 deletions
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 |
19 | CONFIG_NOT_COHERENT_CACHE=y | 19 | CONFIG_NOT_COHERENT_CACHE=y |
20 | CONFIG_PPC32=y | 20 | CONFIG_PPC32=y |
21 | CONFIG_WORD_SIZE=32 | ||
21 | CONFIG_PPC_MERGE=y | 22 | CONFIG_PPC_MERGE=y |
22 | CONFIG_MMU=y | 23 | CONFIG_MMU=y |
24 | CONFIG_GENERIC_CMOS_UPDATE=y | ||
25 | CONFIG_GENERIC_TIME=y | ||
26 | CONFIG_GENERIC_TIME_VSYSCALL=y | ||
27 | CONFIG_GENERIC_CLOCKEVENTS=y | ||
23 | CONFIG_GENERIC_HARDIRQS=y | 28 | CONFIG_GENERIC_HARDIRQS=y |
24 | CONFIG_IRQ_PER_CPU=y | 29 | CONFIG_IRQ_PER_CPU=y |
25 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 30 | CONFIG_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 |
65 | CONFIG_LOG_BUF_SHIFT=14 | 70 | CONFIG_LOG_BUF_SHIFT=14 |
71 | CONFIG_FAIR_GROUP_SCHED=y | ||
72 | CONFIG_FAIR_USER_SCHED=y | ||
66 | CONFIG_SYSFS_DEPRECATED=y | 73 | CONFIG_SYSFS_DEPRECATED=y |
67 | # CONFIG_RELAY is not set | 74 | # CONFIG_RELAY is not set |
68 | CONFIG_BLK_DEV_INITRD=y | 75 | CONFIG_BLK_DEV_INITRD=y |
@@ -83,7 +90,6 @@ CONFIG_FUTEX=y | |||
83 | CONFIG_ANON_INODES=y | 90 | CONFIG_ANON_INODES=y |
84 | CONFIG_EPOLL=y | 91 | CONFIG_EPOLL=y |
85 | CONFIG_SIGNALFD=y | 92 | CONFIG_SIGNALFD=y |
86 | CONFIG_TIMERFD=y | ||
87 | CONFIG_EVENTFD=y | 93 | CONFIG_EVENTFD=y |
88 | CONFIG_SHMEM=y | 94 | CONFIG_SHMEM=y |
89 | CONFIG_VM_EVENT_COUNTERS=y | 95 | CONFIG_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 | ||
130 | CONFIG_WALNUT=y | 137 | CONFIG_WALNUT=y |
138 | # CONFIG_XILINX_VIRTEX_GENERIC_BOARD is not set | ||
131 | CONFIG_405GP=y | 139 | CONFIG_405GP=y |
132 | CONFIG_IBM405_ERR77=y | 140 | CONFIG_IBM405_ERR77=y |
133 | CONFIG_IBM405_ERR51=y | 141 | CONFIG_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 | ||
162 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | ||
151 | # CONFIG_HZ_100 is not set | 163 | # CONFIG_HZ_100 is not set |
152 | CONFIG_HZ_250=y | 164 | CONFIG_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 | |||
169 | CONFIG_FLATMEM=y | 181 | CONFIG_FLATMEM=y |
170 | CONFIG_FLAT_NODE_MEM_MAP=y | 182 | CONFIG_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 | ||
172 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 185 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
173 | CONFIG_RESOURCES_64BIT=y | 186 | CONFIG_RESOURCES_64BIT=y |
174 | CONFIG_ZONE_DMA_FLAG=1 | 187 | CONFIG_ZONE_DMA_FLAG=1 |
@@ -177,6 +190,8 @@ CONFIG_VIRT_TO_BUS=y | |||
177 | CONFIG_PROC_DEVICETREE=y | 190 | CONFIG_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 |
193 | CONFIG_SUSPEND_UP_POSSIBLE=y | ||
194 | CONFIG_HIBERNATION_UP_POSSIBLE=y | ||
180 | CONFIG_SECCOMP=y | 195 | CONFIG_SECCOMP=y |
181 | CONFIG_WANT_DEVICE_TREE=y | 196 | CONFIG_WANT_DEVICE_TREE=y |
182 | CONFIG_DEVICE_TREE="walnut.dts" | 197 | CONFIG_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 | |||
207 | CONFIG_HIGHMEM_START=0xfe000000 | 218 | CONFIG_HIGHMEM_START=0xfe000000 |
208 | CONFIG_LOWMEM_SIZE=0x30000000 | 219 | CONFIG_LOWMEM_SIZE=0x30000000 |
209 | CONFIG_KERNEL_START=0xc0000000 | 220 | CONFIG_KERNEL_START=0xc0000000 |
210 | CONFIG_TASK_SIZE=0x80000000 | 221 | CONFIG_TASK_SIZE=0xc0000000 |
211 | CONFIG_CONSISTENT_START=0xff100000 | 222 | CONFIG_CONSISTENT_START=0xff100000 |
212 | CONFIG_CONSISTENT_SIZE=0x00200000 | 223 | CONFIG_CONSISTENT_SIZE=0x00200000 |
213 | CONFIG_BOOT_LOAD=0x00400000 | 224 | CONFIG_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 | ||
247 | CONFIG_INET_DIAG=y | 259 | CONFIG_INET_DIAG=y |
248 | CONFIG_INET_TCP_DIAG=y | 260 | CONFIG_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 | # |
316 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
304 | CONFIG_STANDALONE=y | 317 | CONFIG_STANDALONE=y |
305 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 318 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
306 | CONFIG_FW_LOADER=y | 319 | CONFIG_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 |
362 | CONFIG_MTD_PHYSMAP_OF=y | 376 | CONFIG_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 | ||
437 | CONFIG_NET_ETHERNET=y | ||
438 | # CONFIG_MII is not set | ||
439 | CONFIG_IBM_NEW_EMAC=y | ||
440 | CONFIG_IBM_NEW_EMAC_RXB=128 | ||
441 | CONFIG_IBM_NEW_EMAC_TXB=64 | ||
442 | CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32 | ||
443 | CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256 | ||
444 | CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0 | ||
445 | # CONFIG_IBM_NEW_EMAC_DEBUG is not set | ||
446 | CONFIG_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 | ||
423 | CONFIG_NETDEV_1000=y | 451 | CONFIG_NETDEV_1000=y |
424 | CONFIG_NETDEV_10000=y | 452 | CONFIG_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 | # | ||
531 | CONFIG_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 | ||
550 | CONFIG_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 | ||
522 | CONFIG_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 | |||
610 | CONFIG_TMPFS=y | 630 | CONFIG_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 |
613 | CONFIG_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 | 652 | CONFIG_NETWORK_FILESYSTEMS=y | |
634 | # | ||
635 | # Network File Systems | ||
636 | # | ||
637 | CONFIG_NFS_FS=y | 653 | CONFIG_NFS_FS=y |
638 | CONFIG_NFS_V3=y | 654 | CONFIG_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 |
661 | CONFIG_MSDOS_PARTITION=y | 677 | CONFIG_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 |
722 | CONFIG_FORCED_INLINING=y | 730 | CONFIG_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 | ||
737 | CONFIG_CRYPTO=y | 747 | CONFIG_CRYPTO=y |
738 | CONFIG_CRYPTO_ALGAPI=y | 748 | CONFIG_CRYPTO_ALGAPI=y |
739 | CONFIG_CRYPTO_BLKCIPHER=y | 749 | CONFIG_CRYPTO_BLKCIPHER=y |
@@ -753,6 +763,7 @@ CONFIG_CRYPTO_ECB=y | |||
753 | CONFIG_CRYPTO_CBC=y | 763 | CONFIG_CRYPTO_CBC=y |
754 | CONFIG_CRYPTO_PCBC=y | 764 | CONFIG_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 |
757 | CONFIG_CRYPTO_DES=y | 768 | CONFIG_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 | ||
774 | CONFIG_CRYPTO_HW=y | 787 | CONFIG_CRYPTO_HW=y |
788 | # CONFIG_PPC_CLOCK is not set | ||