diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /arch/ppc | |
parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8260_io/enet.c | 1 | ||||
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 1 | ||||
-rw-r--r-- | arch/ppc/8xx_io/commproc.c | 26 | ||||
-rw-r--r-- | arch/ppc/8xx_io/enet.c | 1 | ||||
-rw-r--r-- | arch/ppc/8xx_io/fec.c | 1 | ||||
-rw-r--r-- | arch/ppc/configs/ads8272_defconfig | 592 | ||||
-rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 2 | ||||
-rw-r--r-- | arch/ppc/lib/Makefile | 2 | ||||
-rw-r--r-- | arch/ppc/lib/strcase.c | 24 | ||||
-rw-r--r-- | arch/ppc/platforms/mpc8272ads_setup.c | 17 | ||||
-rw-r--r-- | arch/ppc/platforms/mpc866ads_setup.c | 17 | ||||
-rw-r--r-- | arch/ppc/platforms/mpc885ads_setup.c | 20 |
12 files changed, 525 insertions, 179 deletions
diff --git a/arch/ppc/8260_io/enet.c b/arch/ppc/8260_io/enet.c index a6056c29cf00..48ce84f5be93 100644 --- a/arch/ppc/8260_io/enet.c +++ b/arch/ppc/8260_io/enet.c | |||
@@ -477,7 +477,6 @@ for (;;) { | |||
477 | cep->stats.rx_dropped++; | 477 | cep->stats.rx_dropped++; |
478 | } | 478 | } |
479 | else { | 479 | else { |
480 | skb->dev = dev; | ||
481 | skb_put(skb,pkt_len-4); /* Make room */ | 480 | skb_put(skb,pkt_len-4); /* Make room */ |
482 | eth_copy_and_sum(skb, | 481 | eth_copy_and_sum(skb, |
483 | (unsigned char *)__va(bdp->cbd_bufaddr), | 482 | (unsigned char *)__va(bdp->cbd_bufaddr), |
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index 06b84c372e58..9db825fe37f0 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -734,7 +734,6 @@ for (;;) { | |||
734 | cep->stats.rx_dropped++; | 734 | cep->stats.rx_dropped++; |
735 | } | 735 | } |
736 | else { | 736 | else { |
737 | skb->dev = dev; | ||
738 | skb_put(skb,pkt_len); /* Make room */ | 737 | skb_put(skb,pkt_len); /* Make room */ |
739 | eth_copy_and_sum(skb, | 738 | eth_copy_and_sum(skb, |
740 | (unsigned char *)__va(bdp->cbd_bufaddr), | 739 | (unsigned char *)__va(bdp->cbd_bufaddr), |
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c index 3b23bcb35b7a..7a8722beac12 100644 --- a/arch/ppc/8xx_io/commproc.c +++ b/arch/ppc/8xx_io/commproc.c | |||
@@ -39,6 +39,21 @@ | |||
39 | #include <asm/tlbflush.h> | 39 | #include <asm/tlbflush.h> |
40 | #include <asm/rheap.h> | 40 | #include <asm/rheap.h> |
41 | 41 | ||
42 | #define immr_map(member) \ | ||
43 | ({ \ | ||
44 | u32 offset = offsetof(immap_t, member); \ | ||
45 | void *addr = ioremap (IMAP_ADDR + offset, \ | ||
46 | sizeof( ((immap_t*)0)->member)); \ | ||
47 | addr; \ | ||
48 | }) | ||
49 | |||
50 | #define immr_map_size(member, size) \ | ||
51 | ({ \ | ||
52 | u32 offset = offsetof(immap_t, member); \ | ||
53 | void *addr = ioremap (IMAP_ADDR + offset, size); \ | ||
54 | addr; \ | ||
55 | }) | ||
56 | |||
42 | static void m8xx_cpm_dpinit(void); | 57 | static void m8xx_cpm_dpinit(void); |
43 | static uint host_buffer; /* One page of host buffer */ | 58 | static uint host_buffer; /* One page of host buffer */ |
44 | static uint host_end; /* end + 1 */ | 59 | static uint host_end; /* end + 1 */ |
@@ -364,11 +379,16 @@ static rh_block_t cpm_boot_dpmem_rh_block[16]; | |||
364 | static rh_info_t cpm_dpmem_info; | 379 | static rh_info_t cpm_dpmem_info; |
365 | 380 | ||
366 | #define CPM_DPMEM_ALIGNMENT 8 | 381 | #define CPM_DPMEM_ALIGNMENT 8 |
382 | static u8* dpram_vbase; | ||
383 | static uint dpram_pbase; | ||
367 | 384 | ||
368 | void m8xx_cpm_dpinit(void) | 385 | void m8xx_cpm_dpinit(void) |
369 | { | 386 | { |
370 | spin_lock_init(&cpm_dpmem_lock); | 387 | spin_lock_init(&cpm_dpmem_lock); |
371 | 388 | ||
389 | dpram_vbase = immr_map_size(im_cpm.cp_dpmem, CPM_DATAONLY_BASE + CPM_DATAONLY_SIZE); | ||
390 | dpram_pbase = (uint)&((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem; | ||
391 | |||
372 | /* Initialize the info header */ | 392 | /* Initialize the info header */ |
373 | rh_init(&cpm_dpmem_info, CPM_DPMEM_ALIGNMENT, | 393 | rh_init(&cpm_dpmem_info, CPM_DPMEM_ALIGNMENT, |
374 | sizeof(cpm_boot_dpmem_rh_block) / | 394 | sizeof(cpm_boot_dpmem_rh_block) / |
@@ -442,3 +462,9 @@ void *cpm_dpram_addr(uint offset) | |||
442 | return ((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem + offset; | 462 | return ((immap_t *)IMAP_ADDR)->im_cpm.cp_dpmem + offset; |
443 | } | 463 | } |
444 | EXPORT_SYMBOL(cpm_dpram_addr); | 464 | EXPORT_SYMBOL(cpm_dpram_addr); |
465 | |||
466 | uint cpm_dpram_phys(u8* addr) | ||
467 | { | ||
468 | return (dpram_pbase + (uint)(addr - dpram_vbase)); | ||
469 | } | ||
470 | EXPORT_SYMBOL(cpm_dpram_phys); | ||
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c index b23c45bc151a..bfa3f52996d1 100644 --- a/arch/ppc/8xx_io/enet.c +++ b/arch/ppc/8xx_io/enet.c | |||
@@ -506,7 +506,6 @@ for (;;) { | |||
506 | cep->stats.rx_dropped++; | 506 | cep->stats.rx_dropped++; |
507 | } | 507 | } |
508 | else { | 508 | else { |
509 | skb->dev = dev; | ||
510 | skb_put(skb,pkt_len-4); /* Make room */ | 509 | skb_put(skb,pkt_len-4); /* Make room */ |
511 | eth_copy_and_sum(skb, | 510 | eth_copy_and_sum(skb, |
512 | cep->rx_vaddr[bdp - cep->rx_bd_base], | 511 | cep->rx_vaddr[bdp - cep->rx_bd_base], |
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c index e6c28fb423b2..57a9a61e54b5 100644 --- a/arch/ppc/8xx_io/fec.c +++ b/arch/ppc/8xx_io/fec.c | |||
@@ -724,7 +724,6 @@ while (!(bdp->cbd_sc & BD_ENET_RX_EMPTY)) { | |||
724 | printk("%s: Memory squeeze, dropping packet.\n", dev->name); | 724 | printk("%s: Memory squeeze, dropping packet.\n", dev->name); |
725 | fep->stats.rx_dropped++; | 725 | fep->stats.rx_dropped++; |
726 | } else { | 726 | } else { |
727 | skb->dev = dev; | ||
728 | skb_put(skb,pkt_len-4); /* Make room */ | 727 | skb_put(skb,pkt_len-4); /* Make room */ |
729 | eth_copy_and_sum(skb, data, pkt_len-4, 0); | 728 | eth_copy_and_sum(skb, data, pkt_len-4, 0); |
730 | skb->protocol=eth_type_trans(skb,dev); | 729 | skb->protocol=eth_type_trans(skb,dev); |
diff --git a/arch/ppc/configs/ads8272_defconfig b/arch/ppc/configs/ads8272_defconfig index d1db7d14780e..6619f9118b00 100644 --- a/arch/ppc/configs/ads8272_defconfig +++ b/arch/ppc/configs/ads8272_defconfig | |||
@@ -1,42 +1,69 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.21-rc5 | ||
4 | # Wed Apr 4 20:55:16 2007 | ||
3 | # | 5 | # |
4 | CONFIG_MMU=y | 6 | CONFIG_MMU=y |
7 | CONFIG_GENERIC_HARDIRQS=y | ||
5 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
6 | CONFIG_HAVE_DEC_LOCK=y | 9 | CONFIG_ARCH_HAS_ILOG2_U32=y |
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
12 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
7 | CONFIG_PPC=y | 13 | CONFIG_PPC=y |
8 | CONFIG_PPC32=y | 14 | CONFIG_PPC32=y |
9 | CONFIG_GENERIC_NVRAM=y | 15 | CONFIG_GENERIC_NVRAM=y |
16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
17 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
18 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
19 | CONFIG_GENERIC_BUG=y | ||
20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
10 | 21 | ||
11 | # | 22 | # |
12 | # Code maturity level options | 23 | # Code maturity level options |
13 | # | 24 | # |
14 | CONFIG_EXPERIMENTAL=y | 25 | CONFIG_EXPERIMENTAL=y |
15 | CONFIG_CLEAN_COMPILE=y | ||
16 | CONFIG_STANDALONE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | 26 | CONFIG_BROKEN_ON_SMP=y |
27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
18 | 28 | ||
19 | # | 29 | # |
20 | # General setup | 30 | # General setup |
21 | # | 31 | # |
32 | CONFIG_LOCALVERSION="" | ||
33 | CONFIG_LOCALVERSION_AUTO=y | ||
22 | CONFIG_SWAP=y | 34 | CONFIG_SWAP=y |
23 | CONFIG_SYSVIPC=y | 35 | CONFIG_SYSVIPC=y |
36 | # CONFIG_IPC_NS is not set | ||
37 | CONFIG_SYSVIPC_SYSCTL=y | ||
24 | # CONFIG_POSIX_MQUEUE is not set | 38 | # CONFIG_POSIX_MQUEUE is not set |
25 | # CONFIG_BSD_PROCESS_ACCT is not set | 39 | # CONFIG_BSD_PROCESS_ACCT is not set |
26 | CONFIG_SYSCTL=y | 40 | # CONFIG_TASKSTATS is not set |
41 | # CONFIG_UTS_NS is not set | ||
27 | # CONFIG_AUDIT is not set | 42 | # CONFIG_AUDIT is not set |
28 | CONFIG_LOG_BUF_SHIFT=14 | ||
29 | # CONFIG_HOTPLUG is not set | ||
30 | # CONFIG_IKCONFIG is not set | 43 | # CONFIG_IKCONFIG is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | ||
45 | # CONFIG_RELAY is not set | ||
46 | CONFIG_BLK_DEV_INITRD=y | ||
47 | CONFIG_INITRAMFS_SOURCE="" | ||
48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
49 | CONFIG_SYSCTL=y | ||
31 | CONFIG_EMBEDDED=y | 50 | CONFIG_EMBEDDED=y |
51 | CONFIG_SYSCTL_SYSCALL=y | ||
32 | # CONFIG_KALLSYMS is not set | 52 | # CONFIG_KALLSYMS is not set |
53 | # CONFIG_HOTPLUG is not set | ||
54 | CONFIG_PRINTK=y | ||
55 | CONFIG_BUG=y | ||
56 | CONFIG_ELF_CORE=y | ||
57 | CONFIG_BASE_FULL=y | ||
33 | CONFIG_FUTEX=y | 58 | CONFIG_FUTEX=y |
34 | # CONFIG_EPOLL is not set | 59 | # CONFIG_EPOLL is not set |
35 | CONFIG_IOSCHED_NOOP=y | 60 | CONFIG_SHMEM=y |
36 | CONFIG_IOSCHED_AS=y | 61 | CONFIG_SLAB=y |
37 | CONFIG_IOSCHED_DEADLINE=y | 62 | CONFIG_VM_EVENT_COUNTERS=y |
38 | CONFIG_IOSCHED_CFQ=y | 63 | CONFIG_RT_MUTEXES=y |
39 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 64 | # CONFIG_TINY_SHMEM is not set |
65 | CONFIG_BASE_SMALL=0 | ||
66 | # CONFIG_SLOB is not set | ||
40 | 67 | ||
41 | # | 68 | # |
42 | # Loadable module support | 69 | # Loadable module support |
@@ -44,66 +71,124 @@ CONFIG_IOSCHED_CFQ=y | |||
44 | # CONFIG_MODULES is not set | 71 | # CONFIG_MODULES is not set |
45 | 72 | ||
46 | # | 73 | # |
74 | # Block layer | ||
75 | # | ||
76 | CONFIG_BLOCK=y | ||
77 | # CONFIG_LBD is not set | ||
78 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
79 | # CONFIG_LSF is not set | ||
80 | |||
81 | # | ||
82 | # IO Schedulers | ||
83 | # | ||
84 | CONFIG_IOSCHED_NOOP=y | ||
85 | CONFIG_IOSCHED_AS=y | ||
86 | CONFIG_IOSCHED_DEADLINE=y | ||
87 | CONFIG_IOSCHED_CFQ=y | ||
88 | # CONFIG_DEFAULT_AS is not set | ||
89 | # CONFIG_DEFAULT_DEADLINE is not set | ||
90 | CONFIG_DEFAULT_CFQ=y | ||
91 | # CONFIG_DEFAULT_NOOP is not set | ||
92 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
93 | |||
94 | # | ||
47 | # Processor | 95 | # Processor |
48 | # | 96 | # |
49 | CONFIG_6xx=y | 97 | CONFIG_6xx=y |
50 | # CONFIG_40x is not set | 98 | # CONFIG_40x is not set |
51 | # CONFIG_44x is not set | 99 | # CONFIG_44x is not set |
52 | # CONFIG_POWER3 is not set | ||
53 | # CONFIG_POWER4 is not set | ||
54 | # CONFIG_8xx is not set | 100 | # CONFIG_8xx is not set |
101 | # CONFIG_E200 is not set | ||
102 | # CONFIG_E500 is not set | ||
103 | CONFIG_PPC_FPU=y | ||
104 | # CONFIG_PPC_DCR_NATIVE is not set | ||
105 | # CONFIG_KEXEC is not set | ||
55 | # CONFIG_CPU_FREQ is not set | 106 | # CONFIG_CPU_FREQ is not set |
107 | # CONFIG_WANT_EARLY_SERIAL is not set | ||
56 | CONFIG_EMBEDDEDBOOT=y | 108 | CONFIG_EMBEDDEDBOOT=y |
57 | CONFIG_PPC_STD_MMU=y | 109 | CONFIG_PPC_STD_MMU=y |
58 | 110 | ||
59 | # | 111 | # |
60 | # Platform options | 112 | # Platform options |
61 | # | 113 | # |
62 | # CONFIG_PPC_MULTIPLATFORM is not set | 114 | |
115 | # | ||
116 | # Freescale Ethernet driver platform-specific options | ||
117 | # | ||
118 | # CONFIG_PPC_PREP is not set | ||
63 | # CONFIG_APUS is not set | 119 | # CONFIG_APUS is not set |
120 | # CONFIG_KATANA is not set | ||
64 | # CONFIG_WILLOW is not set | 121 | # CONFIG_WILLOW is not set |
65 | # CONFIG_PCORE is not set | 122 | # CONFIG_CPCI690 is not set |
66 | # CONFIG_POWERPMC250 is not set | 123 | # CONFIG_POWERPMC250 is not set |
67 | # CONFIG_EV64260 is not set | 124 | # CONFIG_CHESTNUT is not set |
68 | # CONFIG_SPRUCE is not set | 125 | # CONFIG_SPRUCE is not set |
126 | # CONFIG_HDPU is not set | ||
127 | # CONFIG_EV64260 is not set | ||
69 | # CONFIG_LOPEC is not set | 128 | # CONFIG_LOPEC is not set |
70 | # CONFIG_MCPN765 is not set | ||
71 | # CONFIG_MVME5100 is not set | 129 | # CONFIG_MVME5100 is not set |
72 | # CONFIG_PPLUS is not set | 130 | # CONFIG_PPLUS is not set |
73 | # CONFIG_PRPMC750 is not set | 131 | # CONFIG_PRPMC750 is not set |
74 | # CONFIG_PRPMC800 is not set | 132 | # CONFIG_PRPMC800 is not set |
75 | # CONFIG_SANDPOINT is not set | 133 | # CONFIG_SANDPOINT is not set |
76 | # CONFIG_ADIR is not set | 134 | # CONFIG_RADSTONE_PPC7D is not set |
77 | # CONFIG_K2 is not set | ||
78 | # CONFIG_PAL4 is not set | 135 | # CONFIG_PAL4 is not set |
79 | # CONFIG_GEMINI is not set | ||
80 | # CONFIG_EST8260 is not set | 136 | # CONFIG_EST8260 is not set |
81 | # CONFIG_SBC82xx is not set | 137 | # CONFIG_SBC82xx is not set |
82 | # CONFIG_SBS8260 is not set | 138 | # CONFIG_SBS8260 is not set |
83 | # CONFIG_RPX6 is not set | 139 | # CONFIG_RPX8260 is not set |
84 | # CONFIG_TQM8260 is not set | 140 | # CONFIG_TQM8260 is not set |
85 | CONFIG_ADS8272=y | 141 | CONFIG_ADS8272=y |
142 | # CONFIG_PQ2FADS is not set | ||
143 | # CONFIG_LITE5200 is not set | ||
144 | # CONFIG_MPC834x_SYS is not set | ||
145 | # CONFIG_EV64360 is not set | ||
86 | CONFIG_PQ2ADS=y | 146 | CONFIG_PQ2ADS=y |
87 | CONFIG_8260=y | 147 | CONFIG_8260=y |
88 | CONFIG_8272=y | 148 | CONFIG_8272=y |
89 | CONFIG_CPM2=y | 149 | CONFIG_CPM2=y |
90 | # CONFIG_PC_KEYBOARD is not set | 150 | # CONFIG_PC_KEYBOARD is not set |
91 | CONFIG_SERIAL_CONSOLE=y | ||
92 | # CONFIG_SMP is not set | 151 | # CONFIG_SMP is not set |
93 | # CONFIG_PREEMPT is not set | ||
94 | # CONFIG_HIGHMEM is not set | 152 | # CONFIG_HIGHMEM is not set |
95 | CONFIG_KERNEL_ELF=y | 153 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
154 | # CONFIG_HZ_100 is not set | ||
155 | CONFIG_HZ_250=y | ||
156 | # CONFIG_HZ_300 is not set | ||
157 | # CONFIG_HZ_1000 is not set | ||
158 | CONFIG_HZ=250 | ||
159 | CONFIG_PREEMPT_NONE=y | ||
160 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
161 | # CONFIG_PREEMPT is not set | ||
162 | CONFIG_SELECT_MEMORY_MODEL=y | ||
163 | CONFIG_FLATMEM_MANUAL=y | ||
164 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
165 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
166 | CONFIG_FLATMEM=y | ||
167 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
168 | # CONFIG_SPARSEMEM_STATIC is not set | ||
169 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
170 | # CONFIG_RESOURCES_64BIT is not set | ||
171 | CONFIG_ZONE_DMA_FLAG=1 | ||
96 | CONFIG_BINFMT_ELF=y | 172 | CONFIG_BINFMT_ELF=y |
97 | # CONFIG_BINFMT_MISC is not set | 173 | # CONFIG_BINFMT_MISC is not set |
98 | # CONFIG_CMDLINE_BOOL is not set | 174 | # CONFIG_CMDLINE_BOOL is not set |
175 | # CONFIG_PM is not set | ||
176 | CONFIG_SECCOMP=y | ||
177 | CONFIG_ISA_DMA_API=y | ||
99 | 178 | ||
100 | # | 179 | # |
101 | # Bus options | 180 | # Bus options |
102 | # | 181 | # |
182 | CONFIG_ZONE_DMA=y | ||
183 | # CONFIG_PPC_I8259 is not set | ||
184 | CONFIG_PPC_INDIRECT_PCI=y | ||
103 | CONFIG_PCI=y | 185 | CONFIG_PCI=y |
104 | CONFIG_PCI_DOMAINS=y | 186 | CONFIG_PCI_DOMAINS=y |
105 | # CONFIG_PCI_LEGACY_PROC is not set | 187 | CONFIG_PCI_8260=y |
106 | # CONFIG_PCI_NAMES is not set | 188 | |
189 | # | ||
190 | # PCCARD (PCMCIA/CardBus) support | ||
191 | # | ||
107 | 192 | ||
108 | # | 193 | # |
109 | # Advanced setup | 194 | # Advanced setup |
@@ -120,12 +205,110 @@ CONFIG_TASK_SIZE=0x80000000 | |||
120 | CONFIG_BOOT_LOAD=0x00400000 | 205 | CONFIG_BOOT_LOAD=0x00400000 |
121 | 206 | ||
122 | # | 207 | # |
208 | # Networking | ||
209 | # | ||
210 | CONFIG_NET=y | ||
211 | |||
212 | # | ||
213 | # Networking options | ||
214 | # | ||
215 | # CONFIG_NETDEBUG is not set | ||
216 | CONFIG_PACKET=y | ||
217 | # CONFIG_PACKET_MMAP is not set | ||
218 | CONFIG_UNIX=y | ||
219 | CONFIG_XFRM=y | ||
220 | # CONFIG_XFRM_USER is not set | ||
221 | # CONFIG_XFRM_SUB_POLICY is not set | ||
222 | # CONFIG_XFRM_MIGRATE is not set | ||
223 | # CONFIG_NET_KEY is not set | ||
224 | CONFIG_INET=y | ||
225 | CONFIG_IP_MULTICAST=y | ||
226 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
227 | CONFIG_IP_FIB_HASH=y | ||
228 | CONFIG_IP_PNP=y | ||
229 | CONFIG_IP_PNP_DHCP=y | ||
230 | CONFIG_IP_PNP_BOOTP=y | ||
231 | # CONFIG_IP_PNP_RARP is not set | ||
232 | # CONFIG_NET_IPIP is not set | ||
233 | # CONFIG_NET_IPGRE is not set | ||
234 | # CONFIG_IP_MROUTE is not set | ||
235 | # CONFIG_ARPD is not set | ||
236 | CONFIG_SYN_COOKIES=y | ||
237 | # CONFIG_INET_AH is not set | ||
238 | # CONFIG_INET_ESP is not set | ||
239 | # CONFIG_INET_IPCOMP is not set | ||
240 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
241 | # CONFIG_INET_TUNNEL is not set | ||
242 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
243 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
244 | CONFIG_INET_XFRM_MODE_BEET=y | ||
245 | CONFIG_INET_DIAG=y | ||
246 | CONFIG_INET_TCP_DIAG=y | ||
247 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
248 | CONFIG_TCP_CONG_CUBIC=y | ||
249 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
250 | # CONFIG_TCP_MD5SIG is not set | ||
251 | # CONFIG_IPV6 is not set | ||
252 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
253 | # CONFIG_INET6_TUNNEL is not set | ||
254 | # CONFIG_NETWORK_SECMARK is not set | ||
255 | # CONFIG_NETFILTER is not set | ||
256 | |||
257 | # | ||
258 | # DCCP Configuration (EXPERIMENTAL) | ||
259 | # | ||
260 | # CONFIG_IP_DCCP is not set | ||
261 | |||
262 | # | ||
263 | # SCTP Configuration (EXPERIMENTAL) | ||
264 | # | ||
265 | # CONFIG_IP_SCTP is not set | ||
266 | |||
267 | # | ||
268 | # TIPC Configuration (EXPERIMENTAL) | ||
269 | # | ||
270 | # CONFIG_TIPC is not set | ||
271 | # CONFIG_ATM is not set | ||
272 | # CONFIG_BRIDGE is not set | ||
273 | # CONFIG_VLAN_8021Q is not set | ||
274 | # CONFIG_DECNET is not set | ||
275 | # CONFIG_LLC2 is not set | ||
276 | # CONFIG_IPX is not set | ||
277 | # CONFIG_ATALK is not set | ||
278 | # CONFIG_X25 is not set | ||
279 | # CONFIG_LAPB is not set | ||
280 | # CONFIG_ECONET is not set | ||
281 | # CONFIG_WAN_ROUTER is not set | ||
282 | |||
283 | # | ||
284 | # QoS and/or fair queueing | ||
285 | # | ||
286 | # CONFIG_NET_SCHED is not set | ||
287 | |||
288 | # | ||
289 | # Network testing | ||
290 | # | ||
291 | # CONFIG_NET_PKTGEN is not set | ||
292 | # CONFIG_HAMRADIO is not set | ||
293 | # CONFIG_IRDA is not set | ||
294 | # CONFIG_BT is not set | ||
295 | # CONFIG_IEEE80211 is not set | ||
296 | |||
297 | # | ||
123 | # Device Drivers | 298 | # Device Drivers |
124 | # | 299 | # |
125 | 300 | ||
126 | # | 301 | # |
127 | # Generic Driver Options | 302 | # Generic Driver Options |
128 | # | 303 | # |
304 | CONFIG_STANDALONE=y | ||
305 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
306 | # CONFIG_SYS_HYPERVISOR is not set | ||
307 | |||
308 | # | ||
309 | # Connector - unified userspace <-> kernelspace linker | ||
310 | # | ||
311 | # CONFIG_CONNECTOR is not set | ||
129 | 312 | ||
130 | # | 313 | # |
131 | # Memory Technology Devices (MTD) | 314 | # Memory Technology Devices (MTD) |
@@ -140,6 +323,7 @@ CONFIG_BOOT_LOAD=0x00400000 | |||
140 | # | 323 | # |
141 | # Plug and Play support | 324 | # Plug and Play support |
142 | # | 325 | # |
326 | # CONFIG_PNPACPI is not set | ||
143 | 327 | ||
144 | # | 328 | # |
145 | # Block devices | 329 | # Block devices |
@@ -149,14 +333,23 @@ CONFIG_BOOT_LOAD=0x00400000 | |||
149 | # CONFIG_BLK_CPQ_CISS_DA is not set | 333 | # CONFIG_BLK_CPQ_CISS_DA is not set |
150 | # CONFIG_BLK_DEV_DAC960 is not set | 334 | # CONFIG_BLK_DEV_DAC960 is not set |
151 | # CONFIG_BLK_DEV_UMEM is not set | 335 | # CONFIG_BLK_DEV_UMEM is not set |
336 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
152 | CONFIG_BLK_DEV_LOOP=y | 337 | CONFIG_BLK_DEV_LOOP=y |
153 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | 338 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set |
154 | # CONFIG_BLK_DEV_NBD is not set | 339 | # CONFIG_BLK_DEV_NBD is not set |
155 | # CONFIG_BLK_DEV_CARMEL is not set | 340 | # CONFIG_BLK_DEV_SX8 is not set |
156 | CONFIG_BLK_DEV_RAM=y | 341 | CONFIG_BLK_DEV_RAM=y |
342 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
157 | CONFIG_BLK_DEV_RAM_SIZE=32768 | 343 | CONFIG_BLK_DEV_RAM_SIZE=32768 |
158 | CONFIG_BLK_DEV_INITRD=y | 344 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 |
159 | # CONFIG_LBD is not set | 345 | # CONFIG_CDROM_PKTCDVD is not set |
346 | # CONFIG_ATA_OVER_ETH is not set | ||
347 | |||
348 | # | ||
349 | # Misc devices | ||
350 | # | ||
351 | # CONFIG_SGI_IOC4 is not set | ||
352 | # CONFIG_TIFM_CORE is not set | ||
160 | 353 | ||
161 | # | 354 | # |
162 | # ATA/ATAPI/MFM/RLL support | 355 | # ATA/ATAPI/MFM/RLL support |
@@ -166,7 +359,14 @@ CONFIG_BLK_DEV_INITRD=y | |||
166 | # | 359 | # |
167 | # SCSI device support | 360 | # SCSI device support |
168 | # | 361 | # |
362 | # CONFIG_RAID_ATTRS is not set | ||
169 | # CONFIG_SCSI is not set | 363 | # CONFIG_SCSI is not set |
364 | # CONFIG_SCSI_NETLINK is not set | ||
365 | |||
366 | # | ||
367 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
368 | # | ||
369 | # CONFIG_ATA is not set | ||
170 | 370 | ||
171 | # | 371 | # |
172 | # Multi-device support (RAID and LVM) | 372 | # Multi-device support (RAID and LVM) |
@@ -176,6 +376,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
176 | # | 376 | # |
177 | # Fusion MPT device support | 377 | # Fusion MPT device support |
178 | # | 378 | # |
379 | # CONFIG_FUSION is not set | ||
179 | 380 | ||
180 | # | 381 | # |
181 | # IEEE 1394 (FireWire) support | 382 | # IEEE 1394 (FireWire) support |
@@ -190,70 +391,12 @@ CONFIG_BLK_DEV_INITRD=y | |||
190 | # | 391 | # |
191 | # Macintosh device drivers | 392 | # Macintosh device drivers |
192 | # | 393 | # |
394 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
395 | # CONFIG_WINDFARM is not set | ||
193 | 396 | ||
194 | # | 397 | # |
195 | # Networking support | 398 | # Network device support |
196 | # | ||
197 | CONFIG_NET=y | ||
198 | |||
199 | # | ||
200 | # Networking options | ||
201 | # | 399 | # |
202 | CONFIG_PACKET=y | ||
203 | # CONFIG_PACKET_MMAP is not set | ||
204 | # CONFIG_NETLINK_DEV is not set | ||
205 | CONFIG_UNIX=y | ||
206 | # CONFIG_NET_KEY is not set | ||
207 | CONFIG_INET=y | ||
208 | CONFIG_IP_MULTICAST=y | ||
209 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
210 | CONFIG_IP_PNP=y | ||
211 | CONFIG_IP_PNP_DHCP=y | ||
212 | CONFIG_IP_PNP_BOOTP=y | ||
213 | # CONFIG_IP_PNP_RARP is not set | ||
214 | # CONFIG_NET_IPIP is not set | ||
215 | # CONFIG_NET_IPGRE is not set | ||
216 | # CONFIG_IP_MROUTE is not set | ||
217 | # CONFIG_ARPD is not set | ||
218 | CONFIG_SYN_COOKIES=y | ||
219 | # CONFIG_INET_AH is not set | ||
220 | # CONFIG_INET_ESP is not set | ||
221 | # CONFIG_INET_IPCOMP is not set | ||
222 | # CONFIG_IPV6 is not set | ||
223 | # CONFIG_NETFILTER is not set | ||
224 | |||
225 | # | ||
226 | # SCTP Configuration (EXPERIMENTAL) | ||
227 | # | ||
228 | # CONFIG_IP_SCTP is not set | ||
229 | # CONFIG_ATM is not set | ||
230 | # CONFIG_BRIDGE is not set | ||
231 | # CONFIG_VLAN_8021Q is not set | ||
232 | # CONFIG_DECNET is not set | ||
233 | # CONFIG_LLC2 is not set | ||
234 | # CONFIG_IPX is not set | ||
235 | # CONFIG_ATALK is not set | ||
236 | # CONFIG_X25 is not set | ||
237 | # CONFIG_LAPB is not set | ||
238 | # CONFIG_NET_DIVERT is not set | ||
239 | # CONFIG_ECONET is not set | ||
240 | # CONFIG_WAN_ROUTER is not set | ||
241 | # CONFIG_NET_HW_FLOWCONTROL is not set | ||
242 | |||
243 | # | ||
244 | # QoS and/or fair queueing | ||
245 | # | ||
246 | # CONFIG_NET_SCHED is not set | ||
247 | |||
248 | # | ||
249 | # Network testing | ||
250 | # | ||
251 | # CONFIG_NET_PKTGEN is not set | ||
252 | # CONFIG_NETPOLL is not set | ||
253 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
254 | # CONFIG_HAMRADIO is not set | ||
255 | # CONFIG_IRDA is not set | ||
256 | # CONFIG_BT is not set | ||
257 | CONFIG_NETDEVICES=y | 400 | CONFIG_NETDEVICES=y |
258 | # CONFIG_DUMMY is not set | 401 | # CONFIG_DUMMY is not set |
259 | # CONFIG_BONDING is not set | 402 | # CONFIG_BONDING is not set |
@@ -266,13 +409,31 @@ CONFIG_NETDEVICES=y | |||
266 | # CONFIG_ARCNET is not set | 409 | # CONFIG_ARCNET is not set |
267 | 410 | ||
268 | # | 411 | # |
412 | # PHY device support | ||
413 | # | ||
414 | CONFIG_PHYLIB=y | ||
415 | |||
416 | # | ||
417 | # MII PHY device drivers | ||
418 | # | ||
419 | # CONFIG_MARVELL_PHY is not set | ||
420 | CONFIG_DAVICOM_PHY=y | ||
421 | # CONFIG_QSEMI_PHY is not set | ||
422 | # CONFIG_LXT_PHY is not set | ||
423 | # CONFIG_CICADA_PHY is not set | ||
424 | # CONFIG_VITESSE_PHY is not set | ||
425 | # CONFIG_SMSC_PHY is not set | ||
426 | # CONFIG_BROADCOM_PHY is not set | ||
427 | # CONFIG_FIXED_PHY is not set | ||
428 | |||
429 | # | ||
269 | # Ethernet (10 or 100Mbit) | 430 | # Ethernet (10 or 100Mbit) |
270 | # | 431 | # |
271 | CONFIG_NET_ETHERNET=y | 432 | CONFIG_NET_ETHERNET=y |
272 | # CONFIG_MII is not set | 433 | CONFIG_MII=y |
273 | # CONFIG_OAKNET is not set | ||
274 | # CONFIG_HAPPYMEAL is not set | 434 | # CONFIG_HAPPYMEAL is not set |
275 | # CONFIG_SUNGEM is not set | 435 | # CONFIG_SUNGEM is not set |
436 | # CONFIG_CASSINI is not set | ||
276 | # CONFIG_NET_VENDOR_3COM is not set | 437 | # CONFIG_NET_VENDOR_3COM is not set |
277 | 438 | ||
278 | # | 439 | # |
@@ -281,6 +442,9 @@ CONFIG_NET_ETHERNET=y | |||
281 | # CONFIG_NET_TULIP is not set | 442 | # CONFIG_NET_TULIP is not set |
282 | # CONFIG_HP100 is not set | 443 | # CONFIG_HP100 is not set |
283 | # CONFIG_NET_PCI is not set | 444 | # CONFIG_NET_PCI is not set |
445 | CONFIG_FS_ENET=y | ||
446 | # CONFIG_FS_ENET_HAS_SCC is not set | ||
447 | CONFIG_FS_ENET_HAS_FCC=y | ||
284 | 448 | ||
285 | # | 449 | # |
286 | # Ethernet (1000 Mbit) | 450 | # Ethernet (1000 Mbit) |
@@ -292,14 +456,24 @@ CONFIG_NET_ETHERNET=y | |||
292 | # CONFIG_HAMACHI is not set | 456 | # CONFIG_HAMACHI is not set |
293 | # CONFIG_YELLOWFIN is not set | 457 | # CONFIG_YELLOWFIN is not set |
294 | # CONFIG_R8169 is not set | 458 | # CONFIG_R8169 is not set |
459 | # CONFIG_SIS190 is not set | ||
460 | # CONFIG_SKGE is not set | ||
461 | # CONFIG_SKY2 is not set | ||
295 | # CONFIG_SK98LIN is not set | 462 | # CONFIG_SK98LIN is not set |
296 | # CONFIG_TIGON3 is not set | 463 | # CONFIG_TIGON3 is not set |
464 | # CONFIG_BNX2 is not set | ||
465 | # CONFIG_QLA3XXX is not set | ||
466 | # CONFIG_ATL1 is not set | ||
297 | 467 | ||
298 | # | 468 | # |
299 | # Ethernet (10000 Mbit) | 469 | # Ethernet (10000 Mbit) |
300 | # | 470 | # |
471 | # CONFIG_CHELSIO_T1 is not set | ||
472 | # CONFIG_CHELSIO_T3 is not set | ||
301 | # CONFIG_IXGB is not set | 473 | # CONFIG_IXGB is not set |
302 | # CONFIG_S2IO is not set | 474 | # CONFIG_S2IO is not set |
475 | # CONFIG_MYRI10GE is not set | ||
476 | # CONFIG_NETXEN_NIC is not set | ||
303 | 477 | ||
304 | # | 478 | # |
305 | # Token Ring devices | 479 | # Token Ring devices |
@@ -321,6 +495,8 @@ CONFIG_NET_ETHERNET=y | |||
321 | # CONFIG_SLIP is not set | 495 | # CONFIG_SLIP is not set |
322 | # CONFIG_SHAPER is not set | 496 | # CONFIG_SHAPER is not set |
323 | # CONFIG_NETCONSOLE is not set | 497 | # CONFIG_NETCONSOLE is not set |
498 | # CONFIG_NETPOLL is not set | ||
499 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
324 | 500 | ||
325 | # | 501 | # |
326 | # ISDN subsystem | 502 | # ISDN subsystem |
@@ -336,6 +512,7 @@ CONFIG_NET_ETHERNET=y | |||
336 | # Input device support | 512 | # Input device support |
337 | # | 513 | # |
338 | CONFIG_INPUT=y | 514 | CONFIG_INPUT=y |
515 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
339 | 516 | ||
340 | # | 517 | # |
341 | # Userland interfaces | 518 | # Userland interfaces |
@@ -347,14 +524,6 @@ CONFIG_INPUT=y | |||
347 | # CONFIG_INPUT_EVBUG is not set | 524 | # CONFIG_INPUT_EVBUG is not set |
348 | 525 | ||
349 | # | 526 | # |
350 | # Input I/O drivers | ||
351 | # | ||
352 | # CONFIG_GAMEPORT is not set | ||
353 | CONFIG_SOUND_GAMEPORT=y | ||
354 | # CONFIG_SERIO is not set | ||
355 | # CONFIG_SERIO_I8042 is not set | ||
356 | |||
357 | # | ||
358 | # Input Device Drivers | 527 | # Input Device Drivers |
359 | # | 528 | # |
360 | # CONFIG_INPUT_KEYBOARD is not set | 529 | # CONFIG_INPUT_KEYBOARD is not set |
@@ -364,6 +533,12 @@ CONFIG_SOUND_GAMEPORT=y | |||
364 | # CONFIG_INPUT_MISC is not set | 533 | # CONFIG_INPUT_MISC is not set |
365 | 534 | ||
366 | # | 535 | # |
536 | # Hardware I/O ports | ||
537 | # | ||
538 | # CONFIG_SERIO is not set | ||
539 | # CONFIG_GAMEPORT is not set | ||
540 | |||
541 | # | ||
367 | # Character devices | 542 | # Character devices |
368 | # | 543 | # |
369 | # CONFIG_VT is not set | 544 | # CONFIG_VT is not set |
@@ -377,10 +552,21 @@ CONFIG_SOUND_GAMEPORT=y | |||
377 | # | 552 | # |
378 | # Non-8250 serial port support | 553 | # Non-8250 serial port support |
379 | # | 554 | # |
555 | # CONFIG_SERIAL_UARTLITE is not set | ||
556 | CONFIG_SERIAL_CORE=y | ||
557 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
558 | CONFIG_SERIAL_CPM=y | ||
559 | CONFIG_SERIAL_CPM_CONSOLE=y | ||
560 | CONFIG_SERIAL_CPM_SCC1=y | ||
561 | # CONFIG_SERIAL_CPM_SCC2 is not set | ||
562 | # CONFIG_SERIAL_CPM_SCC3 is not set | ||
563 | CONFIG_SERIAL_CPM_SCC4=y | ||
564 | # CONFIG_SERIAL_CPM_SMC1 is not set | ||
565 | # CONFIG_SERIAL_CPM_SMC2 is not set | ||
566 | # CONFIG_SERIAL_JSM is not set | ||
380 | CONFIG_UNIX98_PTYS=y | 567 | CONFIG_UNIX98_PTYS=y |
381 | CONFIG_LEGACY_PTYS=y | 568 | CONFIG_LEGACY_PTYS=y |
382 | CONFIG_LEGACY_PTY_COUNT=256 | 569 | CONFIG_LEGACY_PTY_COUNT=256 |
383 | # CONFIG_QIC02_TAPE is not set | ||
384 | 570 | ||
385 | # | 571 | # |
386 | # IPMI | 572 | # IPMI |
@@ -391,29 +577,53 @@ CONFIG_LEGACY_PTY_COUNT=256 | |||
391 | # Watchdog Cards | 577 | # Watchdog Cards |
392 | # | 578 | # |
393 | # CONFIG_WATCHDOG is not set | 579 | # CONFIG_WATCHDOG is not set |
580 | CONFIG_HW_RANDOM=y | ||
394 | # CONFIG_NVRAM is not set | 581 | # CONFIG_NVRAM is not set |
395 | CONFIG_GEN_RTC=y | 582 | CONFIG_GEN_RTC=y |
396 | # CONFIG_GEN_RTC_X is not set | 583 | # CONFIG_GEN_RTC_X is not set |
397 | # CONFIG_DTLK is not set | 584 | # CONFIG_DTLK is not set |
398 | # CONFIG_R3964 is not set | 585 | # CONFIG_R3964 is not set |
399 | # CONFIG_APPLICOM is not set | 586 | # CONFIG_APPLICOM is not set |
400 | |||
401 | # | ||
402 | # Ftape, the floppy tape device driver | ||
403 | # | ||
404 | # CONFIG_FTAPE is not set | ||
405 | # CONFIG_AGP is not set | 587 | # CONFIG_AGP is not set |
406 | # CONFIG_DRM is not set | 588 | # CONFIG_DRM is not set |
407 | # CONFIG_RAW_DRIVER is not set | 589 | # CONFIG_RAW_DRIVER is not set |
408 | 590 | ||
409 | # | 591 | # |
592 | # TPM devices | ||
593 | # | ||
594 | # CONFIG_TCG_TPM is not set | ||
595 | |||
596 | # | ||
410 | # I2C support | 597 | # I2C support |
411 | # | 598 | # |
412 | # CONFIG_I2C is not set | 599 | # CONFIG_I2C is not set |
413 | 600 | ||
414 | # | 601 | # |
415 | # Misc devices | 602 | # SPI support |
603 | # | ||
604 | # CONFIG_SPI is not set | ||
605 | # CONFIG_SPI_MASTER is not set | ||
606 | |||
416 | # | 607 | # |
608 | # Dallas's 1-wire bus | ||
609 | # | ||
610 | # CONFIG_W1 is not set | ||
611 | |||
612 | # | ||
613 | # Hardware Monitoring support | ||
614 | # | ||
615 | CONFIG_HWMON=y | ||
616 | # CONFIG_HWMON_VID is not set | ||
617 | # CONFIG_SENSORS_ABITUGURU is not set | ||
618 | # CONFIG_SENSORS_F71805F is not set | ||
619 | # CONFIG_SENSORS_PC87427 is not set | ||
620 | # CONFIG_SENSORS_VT1211 is not set | ||
621 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
622 | |||
623 | # | ||
624 | # Multifunction device drivers | ||
625 | # | ||
626 | # CONFIG_MFD_SM501 is not set | ||
417 | 627 | ||
418 | # | 628 | # |
419 | # Multimedia devices | 629 | # Multimedia devices |
@@ -428,7 +638,9 @@ CONFIG_GEN_RTC=y | |||
428 | # | 638 | # |
429 | # Graphics support | 639 | # Graphics support |
430 | # | 640 | # |
641 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
431 | # CONFIG_FB is not set | 642 | # CONFIG_FB is not set |
643 | # CONFIG_FB_IBM_GXT4500 is not set | ||
432 | 644 | ||
433 | # | 645 | # |
434 | # Sound | 646 | # Sound |
@@ -436,35 +648,110 @@ CONFIG_GEN_RTC=y | |||
436 | # CONFIG_SOUND is not set | 648 | # CONFIG_SOUND is not set |
437 | 649 | ||
438 | # | 650 | # |
651 | # HID Devices | ||
652 | # | ||
653 | CONFIG_HID=y | ||
654 | # CONFIG_HID_DEBUG is not set | ||
655 | |||
656 | # | ||
439 | # USB support | 657 | # USB support |
440 | # | 658 | # |
659 | CONFIG_USB_ARCH_HAS_HCD=y | ||
660 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
661 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
441 | # CONFIG_USB is not set | 662 | # CONFIG_USB is not set |
442 | 663 | ||
443 | # | 664 | # |
665 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
666 | # | ||
667 | |||
668 | # | ||
444 | # USB Gadget Support | 669 | # USB Gadget Support |
445 | # | 670 | # |
446 | # CONFIG_USB_GADGET is not set | 671 | # CONFIG_USB_GADGET is not set |
447 | 672 | ||
448 | # | 673 | # |
674 | # MMC/SD Card support | ||
675 | # | ||
676 | # CONFIG_MMC is not set | ||
677 | |||
678 | # | ||
679 | # LED devices | ||
680 | # | ||
681 | # CONFIG_NEW_LEDS is not set | ||
682 | |||
683 | # | ||
684 | # LED drivers | ||
685 | # | ||
686 | |||
687 | # | ||
688 | # LED Triggers | ||
689 | # | ||
690 | |||
691 | # | ||
692 | # InfiniBand support | ||
693 | # | ||
694 | # CONFIG_INFINIBAND is not set | ||
695 | |||
696 | # | ||
697 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
698 | # | ||
699 | |||
700 | # | ||
701 | # Real Time Clock | ||
702 | # | ||
703 | # CONFIG_RTC_CLASS is not set | ||
704 | |||
705 | # | ||
706 | # DMA Engine support | ||
707 | # | ||
708 | # CONFIG_DMA_ENGINE is not set | ||
709 | |||
710 | # | ||
711 | # DMA Clients | ||
712 | # | ||
713 | |||
714 | # | ||
715 | # DMA Devices | ||
716 | # | ||
717 | |||
718 | # | ||
719 | # Auxiliary Display support | ||
720 | # | ||
721 | |||
722 | # | ||
723 | # Virtualization | ||
724 | # | ||
725 | |||
726 | # | ||
449 | # File systems | 727 | # File systems |
450 | # | 728 | # |
451 | CONFIG_EXT2_FS=y | 729 | CONFIG_EXT2_FS=y |
452 | # CONFIG_EXT2_FS_XATTR is not set | 730 | # CONFIG_EXT2_FS_XATTR is not set |
731 | # CONFIG_EXT2_FS_XIP is not set | ||
453 | CONFIG_EXT3_FS=y | 732 | CONFIG_EXT3_FS=y |
454 | CONFIG_EXT3_FS_XATTR=y | 733 | CONFIG_EXT3_FS_XATTR=y |
455 | # CONFIG_EXT3_FS_POSIX_ACL is not set | 734 | # CONFIG_EXT3_FS_POSIX_ACL is not set |
456 | # CONFIG_EXT3_FS_SECURITY is not set | 735 | # CONFIG_EXT3_FS_SECURITY is not set |
736 | # CONFIG_EXT4DEV_FS is not set | ||
457 | CONFIG_JBD=y | 737 | CONFIG_JBD=y |
458 | # CONFIG_JBD_DEBUG is not set | 738 | # CONFIG_JBD_DEBUG is not set |
459 | CONFIG_FS_MBCACHE=y | 739 | CONFIG_FS_MBCACHE=y |
460 | # CONFIG_REISERFS_FS is not set | 740 | # CONFIG_REISERFS_FS is not set |
461 | # CONFIG_JFS_FS is not set | 741 | # CONFIG_JFS_FS is not set |
742 | CONFIG_FS_POSIX_ACL=y | ||
462 | # CONFIG_XFS_FS is not set | 743 | # CONFIG_XFS_FS is not set |
744 | # CONFIG_GFS2_FS is not set | ||
745 | # CONFIG_OCFS2_FS is not set | ||
463 | # CONFIG_MINIX_FS is not set | 746 | # CONFIG_MINIX_FS is not set |
464 | # CONFIG_ROMFS_FS is not set | 747 | # CONFIG_ROMFS_FS is not set |
748 | CONFIG_INOTIFY=y | ||
749 | CONFIG_INOTIFY_USER=y | ||
465 | # CONFIG_QUOTA is not set | 750 | # CONFIG_QUOTA is not set |
751 | CONFIG_DNOTIFY=y | ||
466 | # CONFIG_AUTOFS_FS is not set | 752 | # CONFIG_AUTOFS_FS is not set |
467 | # CONFIG_AUTOFS4_FS is not set | 753 | # CONFIG_AUTOFS4_FS is not set |
754 | # CONFIG_FUSE_FS is not set | ||
468 | 755 | ||
469 | # | 756 | # |
470 | # CD-ROM/DVD Filesystems | 757 | # CD-ROM/DVD Filesystems |
@@ -475,7 +762,8 @@ CONFIG_FS_MBCACHE=y | |||
475 | # | 762 | # |
476 | # DOS/FAT/NT Filesystems | 763 | # DOS/FAT/NT Filesystems |
477 | # | 764 | # |
478 | # CONFIG_FAT_FS is not set | 765 | # CONFIG_MSDOS_FS is not set |
766 | # CONFIG_VFAT_FS is not set | ||
479 | # CONFIG_NTFS_FS is not set | 767 | # CONFIG_NTFS_FS is not set |
480 | 768 | ||
481 | # | 769 | # |
@@ -483,12 +771,13 @@ CONFIG_FS_MBCACHE=y | |||
483 | # | 771 | # |
484 | CONFIG_PROC_FS=y | 772 | CONFIG_PROC_FS=y |
485 | CONFIG_PROC_KCORE=y | 773 | CONFIG_PROC_KCORE=y |
774 | CONFIG_PROC_SYSCTL=y | ||
486 | CONFIG_SYSFS=y | 775 | CONFIG_SYSFS=y |
487 | # CONFIG_DEVFS_FS is not set | ||
488 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
489 | CONFIG_TMPFS=y | 776 | CONFIG_TMPFS=y |
777 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
490 | # CONFIG_HUGETLB_PAGE is not set | 778 | # CONFIG_HUGETLB_PAGE is not set |
491 | CONFIG_RAMFS=y | 779 | CONFIG_RAMFS=y |
780 | # CONFIG_CONFIGFS_FS is not set | ||
492 | 781 | ||
493 | # | 782 | # |
494 | # Miscellaneous filesystems | 783 | # Miscellaneous filesystems |
@@ -511,20 +800,26 @@ CONFIG_RAMFS=y | |||
511 | # Network File Systems | 800 | # Network File Systems |
512 | # | 801 | # |
513 | CONFIG_NFS_FS=y | 802 | CONFIG_NFS_FS=y |
514 | # CONFIG_NFS_V3 is not set | 803 | CONFIG_NFS_V3=y |
515 | # CONFIG_NFS_V4 is not set | 804 | CONFIG_NFS_V3_ACL=y |
805 | CONFIG_NFS_V4=y | ||
516 | # CONFIG_NFS_DIRECTIO is not set | 806 | # CONFIG_NFS_DIRECTIO is not set |
517 | # CONFIG_NFSD is not set | 807 | # CONFIG_NFSD is not set |
518 | CONFIG_ROOT_NFS=y | 808 | CONFIG_ROOT_NFS=y |
519 | CONFIG_LOCKD=y | 809 | CONFIG_LOCKD=y |
520 | # CONFIG_EXPORTFS is not set | 810 | CONFIG_LOCKD_V4=y |
811 | CONFIG_NFS_ACL_SUPPORT=y | ||
812 | CONFIG_NFS_COMMON=y | ||
521 | CONFIG_SUNRPC=y | 813 | CONFIG_SUNRPC=y |
522 | # CONFIG_RPCSEC_GSS_KRB5 is not set | 814 | CONFIG_SUNRPC_GSS=y |
815 | CONFIG_RPCSEC_GSS_KRB5=y | ||
816 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
523 | # CONFIG_SMB_FS is not set | 817 | # CONFIG_SMB_FS is not set |
524 | # CONFIG_CIFS is not set | 818 | # CONFIG_CIFS is not set |
525 | # CONFIG_NCP_FS is not set | 819 | # CONFIG_NCP_FS is not set |
526 | # CONFIG_CODA_FS is not set | 820 | # CONFIG_CODA_FS is not set |
527 | # CONFIG_AFS_FS is not set | 821 | # CONFIG_AFS_FS is not set |
822 | # CONFIG_9P_FS is not set | ||
528 | 823 | ||
529 | # | 824 | # |
530 | # Partition Types | 825 | # Partition Types |
@@ -537,46 +832,99 @@ CONFIG_PARTITION_ADVANCED=y | |||
537 | # CONFIG_MAC_PARTITION is not set | 832 | # CONFIG_MAC_PARTITION is not set |
538 | # CONFIG_MSDOS_PARTITION is not set | 833 | # CONFIG_MSDOS_PARTITION is not set |
539 | # CONFIG_LDM_PARTITION is not set | 834 | # CONFIG_LDM_PARTITION is not set |
540 | # CONFIG_NEC98_PARTITION is not set | ||
541 | # CONFIG_SGI_PARTITION is not set | 835 | # CONFIG_SGI_PARTITION is not set |
542 | # CONFIG_ULTRIX_PARTITION is not set | 836 | # CONFIG_ULTRIX_PARTITION is not set |
543 | # CONFIG_SUN_PARTITION is not set | 837 | # CONFIG_SUN_PARTITION is not set |
838 | # CONFIG_KARMA_PARTITION is not set | ||
544 | # CONFIG_EFI_PARTITION is not set | 839 | # CONFIG_EFI_PARTITION is not set |
545 | 840 | ||
546 | # | 841 | # |
547 | # Native Language Support | 842 | # Native Language Support |
548 | # | 843 | # |
549 | # CONFIG_NLS is not set | 844 | # CONFIG_NLS is not set |
845 | |||
846 | # | ||
847 | # Distributed Lock Manager | ||
848 | # | ||
849 | # CONFIG_DLM is not set | ||
550 | # CONFIG_SCC_ENET is not set | 850 | # CONFIG_SCC_ENET is not set |
551 | CONFIG_FEC_ENET=y | 851 | # CONFIG_FEC_ENET is not set |
552 | # CONFIG_USE_MDIO is not set | ||
553 | 852 | ||
554 | # | 853 | # |
555 | # CPM2 Options | 854 | # CPM2 Options |
556 | # | 855 | # |
557 | CONFIG_SCC_CONSOLE=y | ||
558 | CONFIG_FCC1_ENET=y | ||
559 | # CONFIG_FCC2_ENET is not set | ||
560 | # CONFIG_FCC3_ENET is not set | ||
561 | 856 | ||
562 | # | 857 | # |
563 | # Library routines | 858 | # Library routines |
564 | # | 859 | # |
860 | # CONFIG_CRC_CCITT is not set | ||
861 | # CONFIG_CRC16 is not set | ||
565 | # CONFIG_CRC32 is not set | 862 | # CONFIG_CRC32 is not set |
566 | # CONFIG_LIBCRC32C is not set | 863 | # CONFIG_LIBCRC32C is not set |
864 | CONFIG_PLIST=y | ||
865 | CONFIG_HAS_IOMEM=y | ||
866 | CONFIG_HAS_IOPORT=y | ||
867 | # CONFIG_PROFILING is not set | ||
567 | 868 | ||
568 | # | 869 | # |
569 | # Kernel hacking | 870 | # Kernel hacking |
570 | # | 871 | # |
872 | # CONFIG_PRINTK_TIME is not set | ||
873 | CONFIG_ENABLE_MUST_CHECK=y | ||
874 | # CONFIG_MAGIC_SYSRQ is not set | ||
875 | # CONFIG_UNUSED_SYMBOLS is not set | ||
876 | # CONFIG_DEBUG_FS is not set | ||
877 | # CONFIG_HEADERS_CHECK is not set | ||
571 | # CONFIG_DEBUG_KERNEL is not set | 878 | # CONFIG_DEBUG_KERNEL is not set |
879 | CONFIG_LOG_BUF_SHIFT=14 | ||
880 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
572 | # CONFIG_KGDB_CONSOLE is not set | 881 | # CONFIG_KGDB_CONSOLE is not set |
573 | 882 | ||
574 | # | 883 | # |
575 | # Security options | 884 | # Security options |
576 | # | 885 | # |
886 | # CONFIG_KEYS is not set | ||
577 | # CONFIG_SECURITY is not set | 887 | # CONFIG_SECURITY is not set |
578 | 888 | ||
579 | # | 889 | # |
580 | # Cryptographic options | 890 | # Cryptographic options |
581 | # | 891 | # |
582 | # CONFIG_CRYPTO is not set | 892 | CONFIG_CRYPTO=y |
893 | CONFIG_CRYPTO_ALGAPI=y | ||
894 | CONFIG_CRYPTO_BLKCIPHER=y | ||
895 | CONFIG_CRYPTO_MANAGER=y | ||
896 | # CONFIG_CRYPTO_HMAC is not set | ||
897 | # CONFIG_CRYPTO_XCBC is not set | ||
898 | # CONFIG_CRYPTO_NULL is not set | ||
899 | # CONFIG_CRYPTO_MD4 is not set | ||
900 | CONFIG_CRYPTO_MD5=y | ||
901 | # CONFIG_CRYPTO_SHA1 is not set | ||
902 | # CONFIG_CRYPTO_SHA256 is not set | ||
903 | # CONFIG_CRYPTO_SHA512 is not set | ||
904 | # CONFIG_CRYPTO_WP512 is not set | ||
905 | # CONFIG_CRYPTO_TGR192 is not set | ||
906 | # CONFIG_CRYPTO_GF128MUL is not set | ||
907 | CONFIG_CRYPTO_ECB=y | ||
908 | CONFIG_CRYPTO_CBC=y | ||
909 | CONFIG_CRYPTO_PCBC=y | ||
910 | # CONFIG_CRYPTO_LRW is not set | ||
911 | CONFIG_CRYPTO_DES=y | ||
912 | # CONFIG_CRYPTO_FCRYPT is not set | ||
913 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
914 | # CONFIG_CRYPTO_TWOFISH is not set | ||
915 | # CONFIG_CRYPTO_SERPENT is not set | ||
916 | # CONFIG_CRYPTO_AES is not set | ||
917 | # CONFIG_CRYPTO_CAST5 is not set | ||
918 | # CONFIG_CRYPTO_CAST6 is not set | ||
919 | # CONFIG_CRYPTO_TEA is not set | ||
920 | # CONFIG_CRYPTO_ARC4 is not set | ||
921 | # CONFIG_CRYPTO_KHAZAD is not set | ||
922 | # CONFIG_CRYPTO_ANUBIS is not set | ||
923 | # CONFIG_CRYPTO_DEFLATE is not set | ||
924 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
925 | # CONFIG_CRYPTO_CRC32C is not set | ||
926 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
927 | |||
928 | # | ||
929 | # Hardware crypto devices | ||
930 | # | ||
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 1318b6f4c3df..4ad499605d05 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
@@ -93,8 +93,6 @@ EXPORT_SYMBOL(strncpy); | |||
93 | EXPORT_SYMBOL(strcat); | 93 | EXPORT_SYMBOL(strcat); |
94 | EXPORT_SYMBOL(strlen); | 94 | EXPORT_SYMBOL(strlen); |
95 | EXPORT_SYMBOL(strcmp); | 95 | EXPORT_SYMBOL(strcmp); |
96 | EXPORT_SYMBOL(strcasecmp); | ||
97 | EXPORT_SYMBOL(strncasecmp); | ||
98 | EXPORT_SYMBOL(__div64_32); | 96 | EXPORT_SYMBOL(__div64_32); |
99 | 97 | ||
100 | EXPORT_SYMBOL(csum_partial); | 98 | EXPORT_SYMBOL(csum_partial); |
diff --git a/arch/ppc/lib/Makefile b/arch/ppc/lib/Makefile index 50358e4ea159..422bef9bae7b 100644 --- a/arch/ppc/lib/Makefile +++ b/arch/ppc/lib/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for ppc-specific library files.. | 2 | # Makefile for ppc-specific library files.. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := checksum.o string.o strcase.o div64.o | 5 | obj-y := checksum.o string.o div64.o |
6 | 6 | ||
7 | obj-$(CONFIG_8xx) += rheap.o | 7 | obj-$(CONFIG_8xx) += rheap.o |
8 | obj-$(CONFIG_CPM2) += rheap.o | 8 | obj-$(CONFIG_CPM2) += rheap.o |
diff --git a/arch/ppc/lib/strcase.c b/arch/ppc/lib/strcase.c deleted file mode 100644 index 3b0094cc2b52..000000000000 --- a/arch/ppc/lib/strcase.c +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | #include <linux/ctype.h> | ||
2 | #include <linux/types.h> | ||
3 | |||
4 | int strcasecmp(const char *s1, const char *s2) | ||
5 | { | ||
6 | int c1, c2; | ||
7 | |||
8 | do { | ||
9 | c1 = tolower(*s1++); | ||
10 | c2 = tolower(*s2++); | ||
11 | } while (c1 == c2 && c1 != 0); | ||
12 | return c1 - c2; | ||
13 | } | ||
14 | |||
15 | int strncasecmp(const char *s1, const char *s2, size_t n) | ||
16 | { | ||
17 | int c1, c2; | ||
18 | |||
19 | do { | ||
20 | c1 = tolower(*s1++); | ||
21 | c2 = tolower(*s2++); | ||
22 | } while ((--n > 0) && c1 == c2 && c1 != 0); | ||
23 | return c1 - c2; | ||
24 | } | ||
diff --git a/arch/ppc/platforms/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c index 0bc06768cf24..47f4b38edb5f 100644 --- a/arch/ppc/platforms/mpc8272ads_setup.c +++ b/arch/ppc/platforms/mpc8272ads_setup.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/ioport.h> | 18 | #include <linux/ioport.h> |
19 | #include <linux/fs_enet_pd.h> | 19 | #include <linux/fs_enet_pd.h> |
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <linux/phy.h> | ||
21 | 22 | ||
22 | #include <asm/io.h> | 23 | #include <asm/io.h> |
23 | #include <asm/mpc8260.h> | 24 | #include <asm/mpc8260.h> |
@@ -30,10 +31,10 @@ | |||
30 | 31 | ||
31 | #include "pq2ads_pd.h" | 32 | #include "pq2ads_pd.h" |
32 | 33 | ||
33 | static void init_fcc1_ioports(void); | 34 | static void init_fcc1_ioports(struct fs_platform_info*); |
34 | static void init_fcc2_ioports(void); | 35 | static void init_fcc2_ioports(struct fs_platform_info*); |
35 | static void init_scc1_uart_ioports(void); | 36 | static void init_scc1_uart_ioports(struct fs_uart_platform_info*); |
36 | static void init_scc4_uart_ioports(void); | 37 | static void init_scc4_uart_ioports(struct fs_uart_platform_info*); |
37 | 38 | ||
38 | static struct fs_uart_platform_info mpc8272_uart_pdata[] = { | 39 | static struct fs_uart_platform_info mpc8272_uart_pdata[] = { |
39 | [fsid_scc1_uart] = { | 40 | [fsid_scc1_uart] = { |
@@ -103,7 +104,7 @@ static struct fs_platform_info mpc82xx_enet_pdata[] = { | |||
103 | }, | 104 | }, |
104 | }; | 105 | }; |
105 | 106 | ||
106 | static void init_fcc1_ioports(struct fs_platform_info*) | 107 | static void init_fcc1_ioports(struct fs_platform_info* pdata) |
107 | { | 108 | { |
108 | struct io_port *io; | 109 | struct io_port *io; |
109 | u32 tempval; | 110 | u32 tempval; |
@@ -144,7 +145,7 @@ static void init_fcc1_ioports(struct fs_platform_info*) | |||
144 | iounmap(immap); | 145 | iounmap(immap); |
145 | } | 146 | } |
146 | 147 | ||
147 | static void init_fcc2_ioports(struct fs_platform_info*) | 148 | static void init_fcc2_ioports(struct fs_platform_info* pdata) |
148 | { | 149 | { |
149 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | 150 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); |
150 | u32 *bcsr = ioremap(BCSR_ADDR+12, sizeof(u32)); | 151 | u32 *bcsr = ioremap(BCSR_ADDR+12, sizeof(u32)); |
@@ -229,7 +230,7 @@ static void mpc8272ads_fixup_uart_pdata(struct platform_device *pdev, | |||
229 | } | 230 | } |
230 | } | 231 | } |
231 | 232 | ||
232 | static void init_scc1_uart_ioports(struct fs_uart_platform_info*) | 233 | static void init_scc1_uart_ioports(struct fs_uart_platform_info* pdata) |
233 | { | 234 | { |
234 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | 235 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); |
235 | 236 | ||
@@ -246,7 +247,7 @@ static void init_scc1_uart_ioports(struct fs_uart_platform_info*) | |||
246 | iounmap(immap); | 247 | iounmap(immap); |
247 | } | 248 | } |
248 | 249 | ||
249 | static void init_scc4_uart_ioports(struct fs_uart_platform_info*) | 250 | static void init_scc4_uart_ioports(struct fs_uart_platform_info* pdata) |
250 | { | 251 | { |
251 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | 252 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); |
252 | 253 | ||
diff --git a/arch/ppc/platforms/mpc866ads_setup.c b/arch/ppc/platforms/mpc866ads_setup.c index 5b05d4bd0df7..7ce5364fdb3b 100644 --- a/arch/ppc/platforms/mpc866ads_setup.c +++ b/arch/ppc/platforms/mpc866ads_setup.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/fs_enet_pd.h> | 21 | #include <linux/fs_enet_pd.h> |
22 | #include <linux/fs_uart_pd.h> | 22 | #include <linux/fs_uart_pd.h> |
23 | #include <linux/mii.h> | 23 | #include <linux/mii.h> |
24 | #include <linux/phy.h> | ||
24 | 25 | ||
25 | #include <asm/delay.h> | 26 | #include <asm/delay.h> |
26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
@@ -37,10 +38,10 @@ | |||
37 | 38 | ||
38 | extern unsigned char __res[]; | 39 | extern unsigned char __res[]; |
39 | 40 | ||
40 | static void setup_fec1_ioports(void); | 41 | static void setup_fec1_ioports(struct fs_platform_info*); |
41 | static void setup_scc1_ioports(void); | 42 | static void setup_scc1_ioports(struct fs_platform_info*); |
42 | static void setup_smc1_ioports(void); | 43 | static void setup_smc1_ioports(struct fs_uart_platform_info*); |
43 | static void setup_smc2_ioports(void); | 44 | static void setup_smc2_ioports(struct fs_uart_platform_info*); |
44 | 45 | ||
45 | static struct fs_mii_fec_platform_info mpc8xx_mdio_fec_pdata; | 46 | static struct fs_mii_fec_platform_info mpc8xx_mdio_fec_pdata; |
46 | 47 | ||
@@ -137,7 +138,7 @@ void __init board_init(void) | |||
137 | iounmap(bcsr_io); | 138 | iounmap(bcsr_io); |
138 | } | 139 | } |
139 | 140 | ||
140 | static void setup_fec1_ioports(struct fs_platform_info*) | 141 | static void setup_fec1_ioports(struct fs_platform_info* pdata) |
141 | { | 142 | { |
142 | immap_t *immap = (immap_t *) IMAP_ADDR; | 143 | immap_t *immap = (immap_t *) IMAP_ADDR; |
143 | 144 | ||
@@ -145,7 +146,7 @@ static void setup_fec1_ioports(struct fs_platform_info*) | |||
145 | setbits16(&immap->im_ioport.iop_pddir, 0x1fff); | 146 | setbits16(&immap->im_ioport.iop_pddir, 0x1fff); |
146 | } | 147 | } |
147 | 148 | ||
148 | static void setup_scc1_ioports(struct fs_platform_info*) | 149 | static void setup_scc1_ioports(struct fs_platform_info* pdata) |
149 | { | 150 | { |
150 | immap_t *immap = (immap_t *) IMAP_ADDR; | 151 | immap_t *immap = (immap_t *) IMAP_ADDR; |
151 | unsigned *bcsr_io; | 152 | unsigned *bcsr_io; |
@@ -194,7 +195,7 @@ static void setup_scc1_ioports(struct fs_platform_info*) | |||
194 | 195 | ||
195 | } | 196 | } |
196 | 197 | ||
197 | static void setup_smc1_ioports(struct fs_uart_platform_info*) | 198 | static void setup_smc1_ioports(struct fs_uart_platform_info* pdata) |
198 | { | 199 | { |
199 | immap_t *immap = (immap_t *) IMAP_ADDR; | 200 | immap_t *immap = (immap_t *) IMAP_ADDR; |
200 | unsigned *bcsr_io; | 201 | unsigned *bcsr_io; |
@@ -216,7 +217,7 @@ static void setup_smc1_ioports(struct fs_uart_platform_info*) | |||
216 | 217 | ||
217 | } | 218 | } |
218 | 219 | ||
219 | static void setup_smc2_ioports(struct fs_uart_platform_info*) | 220 | static void setup_smc2_ioports(struct fs_uart_platform_info* pdata) |
220 | { | 221 | { |
221 | immap_t *immap = (immap_t *) IMAP_ADDR; | 222 | immap_t *immap = (immap_t *) IMAP_ADDR; |
222 | unsigned *bcsr_io; | 223 | unsigned *bcsr_io; |
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c index f8161f3557f5..87deaefd6c5b 100644 --- a/arch/ppc/platforms/mpc885ads_setup.c +++ b/arch/ppc/platforms/mpc885ads_setup.c | |||
@@ -35,13 +35,13 @@ | |||
35 | #include <asm/ppc_sys.h> | 35 | #include <asm/ppc_sys.h> |
36 | 36 | ||
37 | extern unsigned char __res[]; | 37 | extern unsigned char __res[]; |
38 | static void setup_smc1_ioports(void); | 38 | static void setup_smc1_ioports(struct fs_uart_platform_info*); |
39 | static void setup_smc2_ioports(void); | 39 | static void setup_smc2_ioports(struct fs_uart_platform_info*); |
40 | 40 | ||
41 | static struct fs_mii_fec_platform_info mpc8xx_mdio_fec_pdata; | 41 | static struct fs_mii_fec_platform_info mpc8xx_mdio_fec_pdata; |
42 | static void setup_fec1_ioports(void); | 42 | static void setup_fec1_ioports(struct fs_platform_info*); |
43 | static void setup_fec2_ioports(void); | 43 | static void setup_fec2_ioports(struct fs_platform_info*); |
44 | static void setup_scc3_ioports(void); | 44 | static void setup_scc3_ioports(struct fs_platform_info*); |
45 | 45 | ||
46 | static struct fs_uart_platform_info mpc885_uart_pdata[] = { | 46 | static struct fs_uart_platform_info mpc885_uart_pdata[] = { |
47 | [fsid_smc1_uart] = { | 47 | [fsid_smc1_uart] = { |
@@ -161,7 +161,7 @@ void __init board_init(void) | |||
161 | #endif | 161 | #endif |
162 | } | 162 | } |
163 | 163 | ||
164 | static void setup_fec1_ioports(struct fs_platform_info*) | 164 | static void setup_fec1_ioports(struct fs_platform_info* pdata) |
165 | { | 165 | { |
166 | immap_t *immap = (immap_t *) IMAP_ADDR; | 166 | immap_t *immap = (immap_t *) IMAP_ADDR; |
167 | 167 | ||
@@ -181,7 +181,7 @@ static void setup_fec1_ioports(struct fs_platform_info*) | |||
181 | clrbits32(&immap->im_cpm.cp_cptr, 0x00000100); | 181 | clrbits32(&immap->im_cpm.cp_cptr, 0x00000100); |
182 | } | 182 | } |
183 | 183 | ||
184 | static void setup_fec2_ioports(struct fs_platform_info*) | 184 | static void setup_fec2_ioports(struct fs_platform_info* pdata) |
185 | { | 185 | { |
186 | immap_t *immap = (immap_t *) IMAP_ADDR; | 186 | immap_t *immap = (immap_t *) IMAP_ADDR; |
187 | 187 | ||
@@ -193,7 +193,7 @@ static void setup_fec2_ioports(struct fs_platform_info*) | |||
193 | clrbits32(&immap->im_cpm.cp_cptr, 0x00000080); | 193 | clrbits32(&immap->im_cpm.cp_cptr, 0x00000080); |
194 | } | 194 | } |
195 | 195 | ||
196 | static void setup_scc3_ioports(struct fs_platform_info*) | 196 | static void setup_scc3_ioports(struct fs_platform_info* pdata) |
197 | { | 197 | { |
198 | immap_t *immap = (immap_t *) IMAP_ADDR; | 198 | immap_t *immap = (immap_t *) IMAP_ADDR; |
199 | unsigned *bcsr_io; | 199 | unsigned *bcsr_io; |
@@ -315,7 +315,7 @@ static void __init mpc885ads_fixup_scc_enet_pdata(struct platform_device *pdev, | |||
315 | mpc885ads_fixup_enet_pdata(pdev, fsid_scc1 + pdev->id - 1); | 315 | mpc885ads_fixup_enet_pdata(pdev, fsid_scc1 + pdev->id - 1); |
316 | } | 316 | } |
317 | 317 | ||
318 | static void setup_smc1_ioports(struct fs_uart_platform_info*) | 318 | static void setup_smc1_ioports(struct fs_uart_platform_info* pdata) |
319 | { | 319 | { |
320 | immap_t *immap = (immap_t *) IMAP_ADDR; | 320 | immap_t *immap = (immap_t *) IMAP_ADDR; |
321 | unsigned *bcsr_io; | 321 | unsigned *bcsr_io; |
@@ -335,7 +335,7 @@ static void setup_smc1_ioports(struct fs_uart_platform_info*) | |||
335 | clrbits16(&immap->im_cpm.cp_pbodr, iobits); | 335 | clrbits16(&immap->im_cpm.cp_pbodr, iobits); |
336 | } | 336 | } |
337 | 337 | ||
338 | static void setup_smc2_ioports(struct fs_uart_platform_info*) | 338 | static void setup_smc2_ioports(struct fs_uart_platform_info* pdata) |
339 | { | 339 | { |
340 | immap_t *immap = (immap_t *) IMAP_ADDR; | 340 | immap_t *immap = (immap_t *) IMAP_ADDR; |
341 | unsigned *bcsr_io; | 341 | unsigned *bcsr_io; |