diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-04-19 11:48:34 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-04-21 11:19:09 -0400 |
commit | 87c448c2f2dd734910617274637e726c82d0af25 (patch) | |
tree | a578838517bbcc3a1f71ada0045b870cffb4ebf2 /arch/ppc | |
parent | 546be91915a17e4faa9df91caa3ace0c92efa3ab (diff) |
[PPC] Remove mpc885ads and mpc86x ads boards from arch/ppc
We have a board port in arch/powerpc so we dont need this one anymore.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8xx_io/enet.c | 23 | ||||
-rw-r--r-- | arch/ppc/Kconfig | 63 | ||||
-rw-r--r-- | arch/ppc/configs/mpc86x_ads_defconfig | 633 | ||||
-rw-r--r-- | arch/ppc/configs/mpc885ads_defconfig | 622 | ||||
-rw-r--r-- | arch/ppc/platforms/Makefile | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/fads.h | 25 | ||||
-rw-r--r-- | arch/ppc/platforms/mpc885ads.h | 93 | ||||
-rw-r--r-- | arch/ppc/platforms/mpc885ads_setup.c | 476 | ||||
-rw-r--r-- | arch/ppc/syslib/m8xx_setup.c | 10 |
9 files changed, 0 insertions, 1947 deletions
diff --git a/arch/ppc/8xx_io/enet.c b/arch/ppc/8xx_io/enet.c index c6d047ae77a..5899aea1644 100644 --- a/arch/ppc/8xx_io/enet.c +++ b/arch/ppc/8xx_io/enet.c | |||
@@ -946,29 +946,6 @@ static int __init scc_enet_init(void) | |||
946 | *((volatile uint *)BCSR1) &= ~BCSR1_ETHEN; | 946 | *((volatile uint *)BCSR1) &= ~BCSR1_ETHEN; |
947 | #endif | 947 | #endif |
948 | 948 | ||
949 | #ifdef CONFIG_MPC885ADS | ||
950 | |||
951 | /* Deassert PHY reset and enable the PHY. | ||
952 | */ | ||
953 | { | ||
954 | volatile uint __iomem *bcsr = ioremap(BCSR_ADDR, BCSR_SIZE); | ||
955 | uint tmp; | ||
956 | |||
957 | tmp = in_be32(bcsr + 1 /* BCSR1 */); | ||
958 | tmp |= BCSR1_ETHEN; | ||
959 | out_be32(bcsr + 1, tmp); | ||
960 | tmp = in_be32(bcsr + 4 /* BCSR4 */); | ||
961 | tmp |= BCSR4_ETH10_RST; | ||
962 | out_be32(bcsr + 4, tmp); | ||
963 | iounmap(bcsr); | ||
964 | } | ||
965 | |||
966 | /* On MPC885ADS SCC ethernet PHY defaults to the full duplex mode | ||
967 | * upon reset. SCC is set to half duplex by default. So this | ||
968 | * inconsistency should be better fixed by the software. | ||
969 | */ | ||
970 | #endif | ||
971 | |||
972 | dev->base_addr = (unsigned long)ep; | 949 | dev->base_addr = (unsigned long)ep; |
973 | #if 0 | 950 | #if 0 |
974 | dev->name = "CPM_ENET"; | 951 | dev->name = "CPM_ENET"; |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 3fc45e219ff..0f1863ed9c1 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -372,22 +372,6 @@ config MPC8XXFADS | |||
372 | bool "FADS" | 372 | bool "FADS" |
373 | select FADS | 373 | select FADS |
374 | 374 | ||
375 | config MPC86XADS | ||
376 | bool "MPC86XADS" | ||
377 | help | ||
378 | MPC86x Application Development System by Freescale Semiconductor. | ||
379 | The MPC86xADS is meant to serve as a platform for s/w and h/w | ||
380 | development around the MPC86X processor families. | ||
381 | select FADS | ||
382 | |||
383 | config MPC885ADS | ||
384 | bool "MPC885ADS" | ||
385 | help | ||
386 | Freescale Semiconductor MPC885 Application Development System (ADS). | ||
387 | Also known as DUET. | ||
388 | The MPC885ADS is meant to serve as a platform for s/w and h/w | ||
389 | development around the MPC885 processor family. | ||
390 | |||
391 | config TQM823L | 375 | config TQM823L |
392 | bool "TQM823L" | 376 | bool "TQM823L" |
393 | help | 377 | help |
@@ -479,53 +463,6 @@ config WINCEPT | |||
479 | 463 | ||
480 | endchoice | 464 | endchoice |
481 | 465 | ||
482 | menu "Freescale Ethernet driver platform-specific options" | ||
483 | depends on FS_ENET | ||
484 | |||
485 | config MPC8xx_SECOND_ETH | ||
486 | bool "Second Ethernet channel" | ||
487 | depends on (MPC885ADS || MPC86XADS) | ||
488 | default y | ||
489 | help | ||
490 | This enables support for second Ethernet on MPC885ADS and MPC86xADS boards. | ||
491 | The latter will use SCC1, for 885ADS you can select it below. | ||
492 | |||
493 | choice | ||
494 | prompt "Second Ethernet channel" | ||
495 | depends on MPC8xx_SECOND_ETH | ||
496 | default MPC8xx_SECOND_ETH_FEC2 | ||
497 | |||
498 | config MPC8xx_SECOND_ETH_FEC2 | ||
499 | bool "FEC2" | ||
500 | depends on MPC885ADS | ||
501 | help | ||
502 | Enable FEC2 to serve as 2-nd Ethernet channel. Note that SMC2 | ||
503 | (often 2-nd UART) will not work if this is enabled. | ||
504 | |||
505 | config MPC8xx_SECOND_ETH_SCC1 | ||
506 | bool "SCC1" | ||
507 | depends on MPC86XADS | ||
508 | select MPC8xx_SCC_ENET_FIXED | ||
509 | help | ||
510 | Enable SCC1 to serve as 2-nd Ethernet channel. Note that SMC1 | ||
511 | (often 1-nd UART) will not work if this is enabled. | ||
512 | |||
513 | config MPC8xx_SECOND_ETH_SCC3 | ||
514 | bool "SCC3" | ||
515 | depends on MPC885ADS | ||
516 | help | ||
517 | Enable SCC3 to serve as 2-nd Ethernet channel. Note that SMC1 | ||
518 | (often 1-nd UART) will not work if this is enabled. | ||
519 | |||
520 | endchoice | ||
521 | |||
522 | config MPC8xx_SCC_ENET_FIXED | ||
523 | depends on MPC8xx_SECOND_ETH_SCC | ||
524 | default n | ||
525 | bool "Use fixed MII-less mode for SCC Ethernet" | ||
526 | |||
527 | endmenu | ||
528 | |||
529 | choice | 466 | choice |
530 | prompt "Machine Type" | 467 | prompt "Machine Type" |
531 | depends on 6xx | 468 | depends on 6xx |
diff --git a/arch/ppc/configs/mpc86x_ads_defconfig b/arch/ppc/configs/mpc86x_ads_defconfig deleted file mode 100644 index f63c6f59d68..00000000000 --- a/arch/ppc/configs/mpc86x_ads_defconfig +++ /dev/null | |||
@@ -1,633 +0,0 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.12-rc4 | ||
4 | # Tue Jun 14 13:36:35 2005 | ||
5 | # | ||
6 | CONFIG_MMU=y | ||
7 | CONFIG_GENERIC_HARDIRQS=y | ||
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
10 | CONFIG_HAVE_DEC_LOCK=y | ||
11 | CONFIG_PPC=y | ||
12 | CONFIG_PPC32=y | ||
13 | CONFIG_GENERIC_NVRAM=y | ||
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
15 | |||
16 | # | ||
17 | # Code maturity level options | ||
18 | # | ||
19 | CONFIG_EXPERIMENTAL=y | ||
20 | # CONFIG_CLEAN_COMPILE is not set | ||
21 | CONFIG_BROKEN=y | ||
22 | CONFIG_BROKEN_ON_SMP=y | ||
23 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
24 | |||
25 | # | ||
26 | # General setup | ||
27 | # | ||
28 | CONFIG_LOCALVERSION="" | ||
29 | # CONFIG_SWAP is not set | ||
30 | CONFIG_SYSVIPC=y | ||
31 | # CONFIG_POSIX_MQUEUE is not set | ||
32 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
33 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_AUDIT is not set | ||
35 | # CONFIG_HOTPLUG is not set | ||
36 | CONFIG_KOBJECT_UEVENT=y | ||
37 | # CONFIG_IKCONFIG is not set | ||
38 | CONFIG_EMBEDDED=y | ||
39 | # CONFIG_KALLSYMS is not set | ||
40 | CONFIG_PRINTK=y | ||
41 | CONFIG_BUG=y | ||
42 | # CONFIG_BASE_FULL is not set | ||
43 | CONFIG_FUTEX=y | ||
44 | # CONFIG_EPOLL is not set | ||
45 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
46 | # CONFIG_SHMEM is not set | ||
47 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
48 | CONFIG_CC_ALIGN_LABELS=0 | ||
49 | CONFIG_CC_ALIGN_LOOPS=0 | ||
50 | CONFIG_CC_ALIGN_JUMPS=0 | ||
51 | CONFIG_TINY_SHMEM=y | ||
52 | CONFIG_BASE_SMALL=1 | ||
53 | |||
54 | # | ||
55 | # Loadable module support | ||
56 | # | ||
57 | CONFIG_MODULES=y | ||
58 | # CONFIG_MODULE_UNLOAD is not set | ||
59 | CONFIG_OBSOLETE_MODPARM=y | ||
60 | # CONFIG_MODVERSIONS is not set | ||
61 | # CONFIG_MODULE_SRCVERSION_ALL is not set | ||
62 | # CONFIG_KMOD is not set | ||
63 | |||
64 | # | ||
65 | # Processor | ||
66 | # | ||
67 | # CONFIG_6xx is not set | ||
68 | # CONFIG_40x is not set | ||
69 | # CONFIG_44x is not set | ||
70 | # CONFIG_POWER3 is not set | ||
71 | # CONFIG_POWER4 is not set | ||
72 | CONFIG_8xx=y | ||
73 | # CONFIG_E500 is not set | ||
74 | # CONFIG_MATH_EMULATION is not set | ||
75 | # CONFIG_CPU_FREQ is not set | ||
76 | CONFIG_EMBEDDEDBOOT=y | ||
77 | # CONFIG_PM is not set | ||
78 | CONFIG_NOT_COHERENT_CACHE=y | ||
79 | |||
80 | # | ||
81 | # Platform options | ||
82 | # | ||
83 | CONFIG_FADS=y | ||
84 | # CONFIG_RPXLITE is not set | ||
85 | # CONFIG_RPXCLASSIC is not set | ||
86 | # CONFIG_BSEIP is not set | ||
87 | # CONFIG_MPC8XXFADS is not set | ||
88 | CONFIG_MPC86XADS=y | ||
89 | # CONFIG_TQM823L is not set | ||
90 | # CONFIG_TQM850L is not set | ||
91 | # CONFIG_TQM855L is not set | ||
92 | # CONFIG_TQM860L is not set | ||
93 | # CONFIG_FPS850L is not set | ||
94 | # CONFIG_SPD823TS is not set | ||
95 | # CONFIG_IVMS8 is not set | ||
96 | # CONFIG_IVML24 is not set | ||
97 | # CONFIG_SM850 is not set | ||
98 | # CONFIG_HERMES_PRO is not set | ||
99 | # CONFIG_IP860 is not set | ||
100 | # CONFIG_LWMON is not set | ||
101 | # CONFIG_PCU_E is not set | ||
102 | # CONFIG_CCM is not set | ||
103 | # CONFIG_LANTEC is not set | ||
104 | # CONFIG_MBX is not set | ||
105 | # CONFIG_WINCEPT is not set | ||
106 | # CONFIG_SMP is not set | ||
107 | # CONFIG_PREEMPT is not set | ||
108 | # CONFIG_HIGHMEM is not set | ||
109 | CONFIG_BINFMT_ELF=y | ||
110 | # CONFIG_BINFMT_MISC is not set | ||
111 | # CONFIG_CMDLINE_BOOL is not set | ||
112 | CONFIG_ISA_DMA_API=y | ||
113 | |||
114 | # | ||
115 | # Bus options | ||
116 | # | ||
117 | # CONFIG_PCI is not set | ||
118 | # CONFIG_PCI_DOMAINS is not set | ||
119 | # CONFIG_PCI_QSPAN is not set | ||
120 | |||
121 | # | ||
122 | # PCCARD (PCMCIA/CardBus) support | ||
123 | # | ||
124 | # CONFIG_PCCARD is not set | ||
125 | |||
126 | # | ||
127 | # Advanced setup | ||
128 | # | ||
129 | # CONFIG_ADVANCED_OPTIONS is not set | ||
130 | |||
131 | # | ||
132 | # Default settings for advanced configuration options are used | ||
133 | # | ||
134 | CONFIG_HIGHMEM_START=0xfe000000 | ||
135 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
136 | CONFIG_KERNEL_START=0xc0000000 | ||
137 | CONFIG_TASK_SIZE=0x80000000 | ||
138 | CONFIG_CONSISTENT_START=0xff100000 | ||
139 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
140 | CONFIG_BOOT_LOAD=0x00400000 | ||
141 | |||
142 | # | ||
143 | # Device Drivers | ||
144 | # | ||
145 | |||
146 | # | ||
147 | # Generic Driver Options | ||
148 | # | ||
149 | # CONFIG_STANDALONE is not set | ||
150 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
151 | # CONFIG_FW_LOADER is not set | ||
152 | |||
153 | # | ||
154 | # Memory Technology Devices (MTD) | ||
155 | # | ||
156 | # CONFIG_MTD is not set | ||
157 | |||
158 | # | ||
159 | # Parallel port support | ||
160 | # | ||
161 | # CONFIG_PARPORT is not set | ||
162 | |||
163 | # | ||
164 | # Plug and Play support | ||
165 | # | ||
166 | |||
167 | # | ||
168 | # Block devices | ||
169 | # | ||
170 | # CONFIG_BLK_DEV_FD is not set | ||
171 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
172 | CONFIG_BLK_DEV_LOOP=y | ||
173 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
174 | # CONFIG_BLK_DEV_NBD is not set | ||
175 | # CONFIG_BLK_DEV_RAM is not set | ||
176 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
177 | CONFIG_INITRAMFS_SOURCE="" | ||
178 | # CONFIG_LBD is not set | ||
179 | # CONFIG_CDROM_PKTCDVD is not set | ||
180 | |||
181 | # | ||
182 | # IO Schedulers | ||
183 | # | ||
184 | CONFIG_IOSCHED_NOOP=y | ||
185 | CONFIG_IOSCHED_AS=y | ||
186 | CONFIG_IOSCHED_DEADLINE=y | ||
187 | CONFIG_IOSCHED_CFQ=y | ||
188 | # CONFIG_ATA_OVER_ETH is not set | ||
189 | |||
190 | # | ||
191 | # ATA/ATAPI/MFM/RLL support | ||
192 | # | ||
193 | # CONFIG_IDE is not set | ||
194 | |||
195 | # | ||
196 | # SCSI device support | ||
197 | # | ||
198 | # CONFIG_SCSI is not set | ||
199 | |||
200 | # | ||
201 | # Multi-device support (RAID and LVM) | ||
202 | # | ||
203 | # CONFIG_MD is not set | ||
204 | |||
205 | # | ||
206 | # Fusion MPT device support | ||
207 | # | ||
208 | |||
209 | # | ||
210 | # IEEE 1394 (FireWire) support | ||
211 | # | ||
212 | # CONFIG_IEEE1394 is not set | ||
213 | |||
214 | # | ||
215 | # I2O device support | ||
216 | # | ||
217 | |||
218 | # | ||
219 | # Macintosh device drivers | ||
220 | # | ||
221 | |||
222 | # | ||
223 | # Networking support | ||
224 | # | ||
225 | CONFIG_NET=y | ||
226 | |||
227 | # | ||
228 | # Networking options | ||
229 | # | ||
230 | CONFIG_PACKET=y | ||
231 | # CONFIG_PACKET_MMAP is not set | ||
232 | CONFIG_UNIX=y | ||
233 | # CONFIG_NET_KEY is not set | ||
234 | CONFIG_INET=y | ||
235 | # CONFIG_IP_MULTICAST is not set | ||
236 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
237 | CONFIG_IP_PNP=y | ||
238 | CONFIG_IP_PNP_DHCP=y | ||
239 | # CONFIG_IP_PNP_BOOTP is not set | ||
240 | # CONFIG_IP_PNP_RARP is not set | ||
241 | # CONFIG_NET_IPIP is not set | ||
242 | # CONFIG_NET_IPGRE is not set | ||
243 | # CONFIG_ARPD is not set | ||
244 | # CONFIG_SYN_COOKIES is not set | ||
245 | # CONFIG_INET_AH is not set | ||
246 | # CONFIG_INET_ESP is not set | ||
247 | # CONFIG_INET_IPCOMP is not set | ||
248 | # CONFIG_INET_TUNNEL is not set | ||
249 | CONFIG_IP_TCPDIAG=y | ||
250 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
251 | CONFIG_IPV6=m | ||
252 | # CONFIG_IPV6_PRIVACY is not set | ||
253 | # CONFIG_INET6_AH is not set | ||
254 | # CONFIG_INET6_ESP is not set | ||
255 | # CONFIG_INET6_IPCOMP is not set | ||
256 | # CONFIG_INET6_TUNNEL is not set | ||
257 | # CONFIG_IPV6_TUNNEL is not set | ||
258 | # CONFIG_NETFILTER is not set | ||
259 | |||
260 | # | ||
261 | # SCTP Configuration (EXPERIMENTAL) | ||
262 | # | ||
263 | # CONFIG_IP_SCTP is not set | ||
264 | # CONFIG_ATM is not set | ||
265 | # CONFIG_BRIDGE is not set | ||
266 | # CONFIG_VLAN_8021Q is not set | ||
267 | # CONFIG_DECNET is not set | ||
268 | # CONFIG_LLC2 is not set | ||
269 | # CONFIG_IPX is not set | ||
270 | # CONFIG_ATALK is not set | ||
271 | # CONFIG_X25 is not set | ||
272 | # CONFIG_LAPB is not set | ||
273 | # CONFIG_NET_DIVERT is not set | ||
274 | # CONFIG_ECONET is not set | ||
275 | # CONFIG_WAN_ROUTER is not set | ||
276 | |||
277 | # | ||
278 | # QoS and/or fair queueing | ||
279 | # | ||
280 | # CONFIG_NET_SCHED is not set | ||
281 | # CONFIG_NET_CLS_ROUTE is not set | ||
282 | |||
283 | # | ||
284 | # Network testing | ||
285 | # | ||
286 | # CONFIG_NET_PKTGEN is not set | ||
287 | # CONFIG_NETPOLL is not set | ||
288 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
289 | # CONFIG_HAMRADIO is not set | ||
290 | # CONFIG_IRDA is not set | ||
291 | # CONFIG_BT is not set | ||
292 | CONFIG_NETDEVICES=y | ||
293 | # CONFIG_DUMMY is not set | ||
294 | # CONFIG_BONDING is not set | ||
295 | # CONFIG_EQUALIZER is not set | ||
296 | # CONFIG_TUN is not set | ||
297 | |||
298 | # | ||
299 | # Ethernet (10 or 100Mbit) | ||
300 | # | ||
301 | CONFIG_NET_ETHERNET=y | ||
302 | # CONFIG_MII is not set | ||
303 | # CONFIG_OAKNET is not set | ||
304 | |||
305 | # | ||
306 | # Ethernet (1000 Mbit) | ||
307 | # | ||
308 | |||
309 | # | ||
310 | # Ethernet (10000 Mbit) | ||
311 | # | ||
312 | |||
313 | # | ||
314 | # Token Ring devices | ||
315 | # | ||
316 | |||
317 | # | ||
318 | # Wireless LAN (non-hamradio) | ||
319 | # | ||
320 | # CONFIG_NET_RADIO is not set | ||
321 | |||
322 | # | ||
323 | # Wan interfaces | ||
324 | # | ||
325 | # CONFIG_WAN is not set | ||
326 | # CONFIG_PPP is not set | ||
327 | # CONFIG_SLIP is not set | ||
328 | # CONFIG_SHAPER is not set | ||
329 | # CONFIG_NETCONSOLE is not set | ||
330 | |||
331 | # | ||
332 | # ISDN subsystem | ||
333 | # | ||
334 | # CONFIG_ISDN is not set | ||
335 | |||
336 | # | ||
337 | # Telephony Support | ||
338 | # | ||
339 | # CONFIG_PHONE is not set | ||
340 | |||
341 | # | ||
342 | # Input device support | ||
343 | # | ||
344 | # CONFIG_INPUT is not set | ||
345 | |||
346 | # | ||
347 | # Hardware I/O ports | ||
348 | # | ||
349 | # CONFIG_SERIO is not set | ||
350 | # CONFIG_GAMEPORT is not set | ||
351 | CONFIG_SOUND_GAMEPORT=y | ||
352 | |||
353 | # | ||
354 | # Character devices | ||
355 | # | ||
356 | # CONFIG_VT is not set | ||
357 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
358 | |||
359 | # | ||
360 | # Serial drivers | ||
361 | # | ||
362 | # CONFIG_SERIAL_8250 is not set | ||
363 | |||
364 | # | ||
365 | # Non-8250 serial port support | ||
366 | # | ||
367 | CONFIG_SERIAL_CORE=y | ||
368 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
369 | CONFIG_SERIAL_CPM=y | ||
370 | CONFIG_SERIAL_CPM_CONSOLE=y | ||
371 | # CONFIG_SERIAL_CPM_SCC1 is not set | ||
372 | # CONFIG_SERIAL_CPM_SCC2 is not set | ||
373 | # CONFIG_SERIAL_CPM_SCC3 is not set | ||
374 | # CONFIG_SERIAL_CPM_SCC4 is not set | ||
375 | CONFIG_SERIAL_CPM_SMC1=y | ||
376 | # CONFIG_SERIAL_CPM_SMC2 is not set | ||
377 | CONFIG_UNIX98_PTYS=y | ||
378 | # CONFIG_LEGACY_PTYS is not set | ||
379 | |||
380 | # | ||
381 | # IPMI | ||
382 | # | ||
383 | # CONFIG_IPMI_HANDLER is not set | ||
384 | |||
385 | # | ||
386 | # Watchdog Cards | ||
387 | # | ||
388 | # CONFIG_WATCHDOG is not set | ||
389 | # CONFIG_NVRAM is not set | ||
390 | # CONFIG_GEN_RTC is not set | ||
391 | # CONFIG_DTLK is not set | ||
392 | # CONFIG_R3964 is not set | ||
393 | |||
394 | # | ||
395 | # Ftape, the floppy tape device driver | ||
396 | # | ||
397 | # CONFIG_AGP is not set | ||
398 | # CONFIG_DRM is not set | ||
399 | # CONFIG_RAW_DRIVER is not set | ||
400 | |||
401 | # | ||
402 | # TPM devices | ||
403 | # | ||
404 | |||
405 | # | ||
406 | # I2C support | ||
407 | # | ||
408 | # CONFIG_I2C is not set | ||
409 | |||
410 | # | ||
411 | # Dallas's 1-wire bus | ||
412 | # | ||
413 | # CONFIG_W1 is not set | ||
414 | |||
415 | # | ||
416 | # Misc devices | ||
417 | # | ||
418 | |||
419 | # | ||
420 | # Multimedia devices | ||
421 | # | ||
422 | # CONFIG_VIDEO_DEV is not set | ||
423 | |||
424 | # | ||
425 | # Digital Video Broadcasting Devices | ||
426 | # | ||
427 | # CONFIG_DVB is not set | ||
428 | |||
429 | # | ||
430 | # Graphics support | ||
431 | # | ||
432 | # CONFIG_FB is not set | ||
433 | |||
434 | # | ||
435 | # Sound | ||
436 | # | ||
437 | # CONFIG_SOUND is not set | ||
438 | |||
439 | # | ||
440 | # USB support | ||
441 | # | ||
442 | # CONFIG_USB_ARCH_HAS_HCD is not set | ||
443 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
444 | |||
445 | # | ||
446 | # USB Gadget Support | ||
447 | # | ||
448 | # CONFIG_USB_GADGET is not set | ||
449 | |||
450 | # | ||
451 | # MMC/SD Card support | ||
452 | # | ||
453 | # CONFIG_MMC is not set | ||
454 | |||
455 | # | ||
456 | # InfiniBand support | ||
457 | # | ||
458 | # CONFIG_INFINIBAND is not set | ||
459 | |||
460 | # | ||
461 | # File systems | ||
462 | # | ||
463 | # CONFIG_EXT2_FS is not set | ||
464 | CONFIG_EXT3_FS=y | ||
465 | # CONFIG_EXT3_FS_XATTR is not set | ||
466 | CONFIG_JBD=y | ||
467 | # CONFIG_JBD_DEBUG is not set | ||
468 | # CONFIG_REISERFS_FS is not set | ||
469 | # CONFIG_JFS_FS is not set | ||
470 | |||
471 | # | ||
472 | # XFS support | ||
473 | # | ||
474 | # CONFIG_XFS_FS is not set | ||
475 | # CONFIG_MINIX_FS is not set | ||
476 | # CONFIG_ROMFS_FS is not set | ||
477 | # CONFIG_QUOTA is not set | ||
478 | # CONFIG_DNOTIFY is not set | ||
479 | # CONFIG_AUTOFS_FS is not set | ||
480 | # CONFIG_AUTOFS4_FS is not set | ||
481 | |||
482 | # | ||
483 | # CD-ROM/DVD Filesystems | ||
484 | # | ||
485 | # CONFIG_ISO9660_FS is not set | ||
486 | # CONFIG_UDF_FS is not set | ||
487 | |||
488 | # | ||
489 | # DOS/FAT/NT Filesystems | ||
490 | # | ||
491 | # CONFIG_MSDOS_FS is not set | ||
492 | # CONFIG_VFAT_FS is not set | ||
493 | # CONFIG_NTFS_FS is not set | ||
494 | |||
495 | # | ||
496 | # Pseudo filesystems | ||
497 | # | ||
498 | CONFIG_PROC_FS=y | ||
499 | CONFIG_PROC_KCORE=y | ||
500 | CONFIG_SYSFS=y | ||
501 | # CONFIG_DEVFS_FS is not set | ||
502 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
503 | # CONFIG_TMPFS is not set | ||
504 | # CONFIG_HUGETLBFS is not set | ||
505 | # CONFIG_HUGETLB_PAGE is not set | ||
506 | CONFIG_RAMFS=y | ||
507 | |||
508 | # | ||
509 | # Miscellaneous filesystems | ||
510 | # | ||
511 | # CONFIG_ADFS_FS is not set | ||
512 | # CONFIG_AFFS_FS is not set | ||
513 | # CONFIG_HFS_FS is not set | ||
514 | # CONFIG_HFSPLUS_FS is not set | ||
515 | # CONFIG_BEFS_FS is not set | ||
516 | # CONFIG_BFS_FS is not set | ||
517 | # CONFIG_EFS_FS is not set | ||
518 | # CONFIG_CRAMFS is not set | ||
519 | # CONFIG_VXFS_FS is not set | ||
520 | # CONFIG_HPFS_FS is not set | ||
521 | # CONFIG_QNX4FS_FS is not set | ||
522 | # CONFIG_SYSV_FS is not set | ||
523 | # CONFIG_UFS_FS is not set | ||
524 | |||
525 | # | ||
526 | # Network File Systems | ||
527 | # | ||
528 | CONFIG_NFS_FS=y | ||
529 | CONFIG_NFS_V3=y | ||
530 | CONFIG_NFS_V4=y | ||
531 | # CONFIG_NFS_DIRECTIO is not set | ||
532 | # CONFIG_NFSD is not set | ||
533 | CONFIG_ROOT_NFS=y | ||
534 | CONFIG_LOCKD=y | ||
535 | CONFIG_LOCKD_V4=y | ||
536 | CONFIG_SUNRPC=y | ||
537 | CONFIG_SUNRPC_GSS=y | ||
538 | CONFIG_RPCSEC_GSS_KRB5=y | ||
539 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
540 | # CONFIG_SMB_FS is not set | ||
541 | # CONFIG_CIFS is not set | ||
542 | # CONFIG_NCP_FS is not set | ||
543 | # CONFIG_CODA_FS is not set | ||
544 | # CONFIG_AFS_FS is not set | ||
545 | |||
546 | # | ||
547 | # Partition Types | ||
548 | # | ||
549 | # CONFIG_PARTITION_ADVANCED is not set | ||
550 | CONFIG_MSDOS_PARTITION=y | ||
551 | |||
552 | # | ||
553 | # Native Language Support | ||
554 | # | ||
555 | # CONFIG_NLS is not set | ||
556 | |||
557 | # | ||
558 | # MPC8xx CPM Options | ||
559 | # | ||
560 | CONFIG_SCC_ENET=y | ||
561 | CONFIG_SCC1_ENET=y | ||
562 | # CONFIG_SCC2_ENET is not set | ||
563 | # CONFIG_SCC3_ENET is not set | ||
564 | # CONFIG_FEC_ENET is not set | ||
565 | # CONFIG_ENET_BIG_BUFFERS is not set | ||
566 | |||
567 | # | ||
568 | # Generic MPC8xx Options | ||
569 | # | ||
570 | # CONFIG_8xx_COPYBACK is not set | ||
571 | # CONFIG_8xx_CPU6 is not set | ||
572 | CONFIG_NO_UCODE_PATCH=y | ||
573 | # CONFIG_USB_SOF_UCODE_PATCH is not set | ||
574 | # CONFIG_I2C_SPI_UCODE_PATCH is not set | ||
575 | # CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set | ||
576 | |||
577 | # | ||
578 | # Library routines | ||
579 | # | ||
580 | # CONFIG_CRC_CCITT is not set | ||
581 | # CONFIG_CRC32 is not set | ||
582 | # CONFIG_LIBCRC32C is not set | ||
583 | |||
584 | # | ||
585 | # Profiling support | ||
586 | # | ||
587 | # CONFIG_PROFILING is not set | ||
588 | |||
589 | # | ||
590 | # Kernel hacking | ||
591 | # | ||
592 | # CONFIG_PRINTK_TIME is not set | ||
593 | # CONFIG_DEBUG_KERNEL is not set | ||
594 | CONFIG_LOG_BUF_SHIFT=14 | ||
595 | |||
596 | # | ||
597 | # Security options | ||
598 | # | ||
599 | # CONFIG_KEYS is not set | ||
600 | # CONFIG_SECURITY is not set | ||
601 | |||
602 | # | ||
603 | # Cryptographic options | ||
604 | # | ||
605 | CONFIG_CRYPTO=y | ||
606 | # CONFIG_CRYPTO_HMAC is not set | ||
607 | # CONFIG_CRYPTO_NULL is not set | ||
608 | # CONFIG_CRYPTO_MD4 is not set | ||
609 | CONFIG_CRYPTO_MD5=y | ||
610 | # CONFIG_CRYPTO_SHA1 is not set | ||
611 | # CONFIG_CRYPTO_SHA256 is not set | ||
612 | # CONFIG_CRYPTO_SHA512 is not set | ||
613 | # CONFIG_CRYPTO_WP512 is not set | ||
614 | # CONFIG_CRYPTO_TGR192 is not set | ||
615 | CONFIG_CRYPTO_DES=y | ||
616 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
617 | # CONFIG_CRYPTO_TWOFISH is not set | ||
618 | # CONFIG_CRYPTO_SERPENT is not set | ||
619 | # CONFIG_CRYPTO_AES is not set | ||
620 | # CONFIG_CRYPTO_CAST5 is not set | ||
621 | # CONFIG_CRYPTO_CAST6 is not set | ||
622 | # CONFIG_CRYPTO_TEA is not set | ||
623 | # CONFIG_CRYPTO_ARC4 is not set | ||
624 | # CONFIG_CRYPTO_KHAZAD is not set | ||
625 | # CONFIG_CRYPTO_ANUBIS is not set | ||
626 | # CONFIG_CRYPTO_DEFLATE is not set | ||
627 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
628 | # CONFIG_CRYPTO_CRC32C is not set | ||
629 | # CONFIG_CRYPTO_TEST is not set | ||
630 | |||
631 | # | ||
632 | # Hardware crypto devices | ||
633 | # | ||
diff --git a/arch/ppc/configs/mpc885ads_defconfig b/arch/ppc/configs/mpc885ads_defconfig deleted file mode 100644 index 016f94d9325..00000000000 --- a/arch/ppc/configs/mpc885ads_defconfig +++ /dev/null | |||
@@ -1,622 +0,0 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.12-rc6 | ||
4 | # Thu Jun 9 21:17:29 2005 | ||
5 | # | ||
6 | CONFIG_MMU=y | ||
7 | CONFIG_GENERIC_HARDIRQS=y | ||
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
9 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
10 | CONFIG_HAVE_DEC_LOCK=y | ||
11 | CONFIG_PPC=y | ||
12 | CONFIG_PPC32=y | ||
13 | CONFIG_GENERIC_NVRAM=y | ||
14 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
15 | |||
16 | # | ||
17 | # Code maturity level options | ||
18 | # | ||
19 | CONFIG_EXPERIMENTAL=y | ||
20 | # CONFIG_CLEAN_COMPILE is not set | ||
21 | CONFIG_BROKEN=y | ||
22 | CONFIG_BROKEN_ON_SMP=y | ||
23 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
24 | |||
25 | # | ||
26 | # General setup | ||
27 | # | ||
28 | CONFIG_LOCALVERSION="" | ||
29 | # CONFIG_SWAP is not set | ||
30 | CONFIG_SYSVIPC=y | ||
31 | # CONFIG_POSIX_MQUEUE is not set | ||
32 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
33 | CONFIG_SYSCTL=y | ||
34 | # CONFIG_AUDIT is not set | ||
35 | CONFIG_HOTPLUG=y | ||
36 | CONFIG_KOBJECT_UEVENT=y | ||
37 | # CONFIG_IKCONFIG is not set | ||
38 | CONFIG_EMBEDDED=y | ||
39 | # CONFIG_KALLSYMS is not set | ||
40 | CONFIG_PRINTK=y | ||
41 | CONFIG_BUG=y | ||
42 | CONFIG_BASE_FULL=y | ||
43 | CONFIG_FUTEX=y | ||
44 | # CONFIG_EPOLL is not set | ||
45 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
46 | CONFIG_SHMEM=y | ||
47 | CONFIG_CC_ALIGN_FUNCTIONS=0 | ||
48 | CONFIG_CC_ALIGN_LABELS=0 | ||
49 | CONFIG_CC_ALIGN_LOOPS=0 | ||
50 | CONFIG_CC_ALIGN_JUMPS=0 | ||
51 | # CONFIG_TINY_SHMEM is not set | ||
52 | CONFIG_BASE_SMALL=0 | ||
53 | |||
54 | # | ||
55 | # Loadable module support | ||
56 | # | ||
57 | # CONFIG_MODULES is not set | ||
58 | |||
59 | # | ||
60 | # Processor | ||
61 | # | ||
62 | # CONFIG_6xx is not set | ||
63 | # CONFIG_40x is not set | ||
64 | # CONFIG_44x is not set | ||
65 | # CONFIG_POWER3 is not set | ||
66 | # CONFIG_POWER4 is not set | ||
67 | CONFIG_8xx=y | ||
68 | # CONFIG_E500 is not set | ||
69 | # CONFIG_MATH_EMULATION is not set | ||
70 | # CONFIG_CPU_FREQ is not set | ||
71 | CONFIG_EMBEDDEDBOOT=y | ||
72 | # CONFIG_PM is not set | ||
73 | CONFIG_NOT_COHERENT_CACHE=y | ||
74 | |||
75 | # | ||
76 | # Platform options | ||
77 | # | ||
78 | # CONFIG_RPXLITE is not set | ||
79 | # CONFIG_RPXCLASSIC is not set | ||
80 | # CONFIG_BSEIP is not set | ||
81 | # CONFIG_FADS is not set | ||
82 | CONFIG_MPC885ADS=y | ||
83 | # CONFIG_TQM823L is not set | ||
84 | # CONFIG_TQM850L is not set | ||
85 | # CONFIG_TQM855L is not set | ||
86 | # CONFIG_TQM860L is not set | ||
87 | # CONFIG_FPS850L is not set | ||
88 | # CONFIG_SPD823TS is not set | ||
89 | # CONFIG_IVMS8 is not set | ||
90 | # CONFIG_IVML24 is not set | ||
91 | # CONFIG_SM850 is not set | ||
92 | # CONFIG_HERMES_PRO is not set | ||
93 | # CONFIG_IP860 is not set | ||
94 | # CONFIG_LWMON is not set | ||
95 | # CONFIG_PCU_E is not set | ||
96 | # CONFIG_CCM is not set | ||
97 | # CONFIG_LANTEC is not set | ||
98 | # CONFIG_MBX is not set | ||
99 | # CONFIG_WINCEPT is not set | ||
100 | # CONFIG_SMP is not set | ||
101 | # CONFIG_PREEMPT is not set | ||
102 | # CONFIG_HIGHMEM is not set | ||
103 | CONFIG_BINFMT_ELF=y | ||
104 | # CONFIG_BINFMT_MISC is not set | ||
105 | # CONFIG_CMDLINE_BOOL is not set | ||
106 | CONFIG_ISA_DMA_API=y | ||
107 | |||
108 | # | ||
109 | # Bus options | ||
110 | # | ||
111 | # CONFIG_PCI is not set | ||
112 | # CONFIG_PCI_DOMAINS is not set | ||
113 | # CONFIG_PCI_QSPAN is not set | ||
114 | |||
115 | # | ||
116 | # PCCARD (PCMCIA/CardBus) support | ||
117 | # | ||
118 | # CONFIG_PCCARD is not set | ||
119 | |||
120 | # | ||
121 | # Advanced setup | ||
122 | # | ||
123 | # CONFIG_ADVANCED_OPTIONS is not set | ||
124 | |||
125 | # | ||
126 | # Default settings for advanced configuration options are used | ||
127 | # | ||
128 | CONFIG_HIGHMEM_START=0xfe000000 | ||
129 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
130 | CONFIG_KERNEL_START=0xc0000000 | ||
131 | CONFIG_TASK_SIZE=0x80000000 | ||
132 | CONFIG_CONSISTENT_START=0xff100000 | ||
133 | CONFIG_CONSISTENT_SIZE=0x00200000 | ||
134 | CONFIG_BOOT_LOAD=0x00400000 | ||
135 | |||
136 | # | ||
137 | # Device Drivers | ||
138 | # | ||
139 | |||
140 | # | ||
141 | # Generic Driver Options | ||
142 | # | ||
143 | CONFIG_STANDALONE=y | ||
144 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
145 | # CONFIG_FW_LOADER is not set | ||
146 | |||
147 | # | ||
148 | # Memory Technology Devices (MTD) | ||
149 | # | ||
150 | # CONFIG_MTD is not set | ||
151 | |||
152 | # | ||
153 | # Parallel port support | ||
154 | # | ||
155 | # CONFIG_PARPORT is not set | ||
156 | |||
157 | # | ||
158 | # Plug and Play support | ||
159 | # | ||
160 | |||
161 | # | ||
162 | # Block devices | ||
163 | # | ||
164 | # CONFIG_BLK_DEV_FD is not set | ||
165 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
166 | # CONFIG_BLK_DEV_LOOP is not set | ||
167 | # CONFIG_BLK_DEV_NBD is not set | ||
168 | # CONFIG_BLK_DEV_RAM is not set | ||
169 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
170 | CONFIG_INITRAMFS_SOURCE="" | ||
171 | # CONFIG_LBD is not set | ||
172 | # CONFIG_CDROM_PKTCDVD is not set | ||
173 | |||
174 | # | ||
175 | # IO Schedulers | ||
176 | # | ||
177 | CONFIG_IOSCHED_NOOP=y | ||
178 | # CONFIG_IOSCHED_AS is not set | ||
179 | # CONFIG_IOSCHED_DEADLINE is not set | ||
180 | # CONFIG_IOSCHED_CFQ is not set | ||
181 | # CONFIG_ATA_OVER_ETH is not set | ||
182 | |||
183 | # | ||
184 | # ATA/ATAPI/MFM/RLL support | ||
185 | # | ||
186 | # CONFIG_IDE is not set | ||
187 | |||
188 | # | ||
189 | # SCSI device support | ||
190 | # | ||
191 | # CONFIG_SCSI is not set | ||
192 | |||
193 | # | ||
194 | # Multi-device support (RAID and LVM) | ||
195 | # | ||
196 | # CONFIG_MD is not set | ||
197 | |||
198 | # | ||
199 | # Fusion MPT device support | ||
200 | # | ||
201 | |||
202 | # | ||
203 | # IEEE 1394 (FireWire) support | ||
204 | # | ||
205 | # CONFIG_IEEE1394 is not set | ||
206 | |||
207 | # | ||
208 | # I2O device support | ||
209 | # | ||
210 | |||
211 | # | ||
212 | # Macintosh device drivers | ||
213 | # | ||
214 | |||
215 | # | ||
216 | # Networking support | ||
217 | # | ||
218 | CONFIG_NET=y | ||
219 | |||
220 | # | ||
221 | # Networking options | ||
222 | # | ||
223 | CONFIG_PACKET=y | ||
224 | # CONFIG_PACKET_MMAP is not set | ||
225 | CONFIG_UNIX=y | ||
226 | # CONFIG_NET_KEY is not set | ||
227 | CONFIG_INET=y | ||
228 | # CONFIG_IP_MULTICAST is not set | ||
229 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
230 | CONFIG_IP_PNP=y | ||
231 | CONFIG_IP_PNP_DHCP=y | ||
232 | CONFIG_IP_PNP_BOOTP=y | ||
233 | # CONFIG_IP_PNP_RARP is not set | ||
234 | # CONFIG_NET_IPIP is not set | ||
235 | # CONFIG_NET_IPGRE is not set | ||
236 | # CONFIG_ARPD is not set | ||
237 | # CONFIG_SYN_COOKIES is not set | ||
238 | # CONFIG_INET_AH is not set | ||
239 | # CONFIG_INET_ESP is not set | ||
240 | # CONFIG_INET_IPCOMP is not set | ||
241 | # CONFIG_INET_TUNNEL is not set | ||
242 | CONFIG_IP_TCPDIAG=y | ||
243 | # CONFIG_IP_TCPDIAG_IPV6 is not set | ||
244 | # CONFIG_IPV6 is not set | ||
245 | # CONFIG_NETFILTER is not set | ||
246 | |||
247 | # | ||
248 | # SCTP Configuration (EXPERIMENTAL) | ||
249 | # | ||
250 | # CONFIG_IP_SCTP is not set | ||
251 | # CONFIG_ATM is not set | ||
252 | # CONFIG_BRIDGE is not set | ||
253 | # CONFIG_VLAN_8021Q is not set | ||
254 | # CONFIG_DECNET is not set | ||
255 | # CONFIG_LLC2 is not set | ||
256 | # CONFIG_IPX is not set | ||
257 | # CONFIG_ATALK is not set | ||
258 | # CONFIG_X25 is not set | ||
259 | # CONFIG_LAPB is not set | ||
260 | # CONFIG_NET_DIVERT is not set | ||
261 | # CONFIG_ECONET is not set | ||
262 | # CONFIG_WAN_ROUTER is not set | ||
263 | |||
264 | # | ||
265 | # QoS and/or fair queueing | ||
266 | # | ||
267 | # CONFIG_NET_SCHED is not set | ||
268 | # CONFIG_NET_CLS_ROUTE is not set | ||
269 | |||
270 | # | ||
271 | # Network testing | ||
272 | # | ||
273 | # CONFIG_NET_PKTGEN is not set | ||
274 | # CONFIG_NETPOLL is not set | ||
275 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
276 | # CONFIG_HAMRADIO is not set | ||
277 | # CONFIG_IRDA is not set | ||
278 | # CONFIG_BT is not set | ||
279 | CONFIG_NETDEVICES=y | ||
280 | # CONFIG_DUMMY is not set | ||
281 | # CONFIG_BONDING is not set | ||
282 | # CONFIG_EQUALIZER is not set | ||
283 | # CONFIG_TUN is not set | ||
284 | |||
285 | # | ||
286 | # Ethernet (10 or 100Mbit) | ||
287 | # | ||
288 | CONFIG_NET_ETHERNET=y | ||
289 | CONFIG_MII=y | ||
290 | # CONFIG_OAKNET is not set | ||
291 | |||
292 | # | ||
293 | # Ethernet (1000 Mbit) | ||
294 | # | ||
295 | |||
296 | # | ||
297 | # Ethernet (10000 Mbit) | ||
298 | # | ||
299 | |||
300 | # | ||
301 | # Token Ring devices | ||
302 | # | ||
303 | |||
304 | # | ||
305 | # Wireless LAN (non-hamradio) | ||
306 | # | ||
307 | # CONFIG_NET_RADIO is not set | ||
308 | |||
309 | # | ||
310 | # Wan interfaces | ||
311 | # | ||
312 | # CONFIG_WAN is not set | ||
313 | CONFIG_PPP=y | ||
314 | # CONFIG_PPP_MULTILINK is not set | ||
315 | # CONFIG_PPP_FILTER is not set | ||
316 | CONFIG_PPP_ASYNC=y | ||
317 | CONFIG_PPP_SYNC_TTY=y | ||
318 | CONFIG_PPP_DEFLATE=y | ||
319 | # CONFIG_PPP_BSDCOMP is not set | ||
320 | # CONFIG_PPPOE is not set | ||
321 | # CONFIG_SLIP is not set | ||
322 | # CONFIG_SHAPER is not set | ||
323 | # CONFIG_NETCONSOLE is not set | ||
324 | |||
325 | # | ||
326 | # ISDN subsystem | ||
327 | # | ||
328 | # CONFIG_ISDN is not set | ||
329 | |||
330 | # | ||
331 | # Telephony Support | ||
332 | # | ||
333 | # CONFIG_PHONE is not set | ||
334 | |||
335 | # | ||
336 | # Input device support | ||
337 | # | ||
338 | # CONFIG_INPUT is not set | ||
339 | |||
340 | # | ||
341 | # Hardware I/O ports | ||
342 | # | ||
343 | # CONFIG_SERIO is not set | ||
344 | # CONFIG_GAMEPORT is not set | ||
345 | |||
346 | # | ||
347 | # Character devices | ||
348 | # | ||
349 | # CONFIG_VT is not set | ||
350 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
351 | |||
352 | # | ||
353 | # Serial drivers | ||
354 | # | ||
355 | # CONFIG_SERIAL_8250 is not set | ||
356 | |||
357 | # | ||
358 | # Non-8250 serial port support | ||
359 | # | ||
360 | CONFIG_SERIAL_CORE=y | ||
361 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
362 | CONFIG_SERIAL_CPM=y | ||
363 | CONFIG_SERIAL_CPM_CONSOLE=y | ||
364 | # CONFIG_SERIAL_CPM_SCC1 is not set | ||
365 | # CONFIG_SERIAL_CPM_SCC2 is not set | ||
366 | # CONFIG_SERIAL_CPM_SCC3 is not set | ||
367 | # CONFIG_SERIAL_CPM_SCC4 is not set | ||
368 | CONFIG_SERIAL_CPM_SMC1=y | ||
369 | CONFIG_SERIAL_CPM_SMC2=y | ||
370 | CONFIG_UNIX98_PTYS=y | ||
371 | # CONFIG_LEGACY_PTYS is not set | ||
372 | |||
373 | # | ||
374 | # IPMI | ||
375 | # | ||
376 | # CONFIG_IPMI_HANDLER is not set | ||
377 | |||
378 | # | ||
379 | # Watchdog Cards | ||
380 | # | ||
381 | # CONFIG_WATCHDOG is not set | ||
382 | # CONFIG_NVRAM is not set | ||
383 | # CONFIG_GEN_RTC is not set | ||
384 | # CONFIG_DTLK is not set | ||
385 | # CONFIG_R3964 is not set | ||
386 | |||
387 | # | ||
388 | # Ftape, the floppy tape device driver | ||
389 | # | ||
390 | # CONFIG_AGP is not set | ||
391 | # CONFIG_DRM is not set | ||
392 | # CONFIG_RAW_DRIVER is not set | ||
393 | |||
394 | # | ||
395 | # TPM devices | ||
396 | # | ||
397 | |||
398 | # | ||
399 | # I2C support | ||
400 | # | ||
401 | # CONFIG_I2C is not set | ||
402 | |||
403 | # | ||
404 | # Dallas's 1-wire bus | ||
405 | # | ||
406 | # CONFIG_W1 is not set | ||
407 | |||
408 | # | ||
409 | # Misc devices | ||
410 | # | ||
411 | |||
412 | # | ||
413 | # Multimedia devices | ||
414 | # | ||
415 | # CONFIG_VIDEO_DEV is not set | ||
416 | |||
417 | # | ||
418 | # Digital Video Broadcasting Devices | ||
419 | # | ||
420 | # CONFIG_DVB is not set | ||
421 | |||
422 | # | ||
423 | # Graphics support | ||
424 | # | ||
425 | # CONFIG_FB is not set | ||
426 | |||
427 | # | ||
428 | # Sound | ||
429 | # | ||
430 | # CONFIG_SOUND is not set | ||
431 | |||
432 | # | ||
433 | # USB support | ||
434 | # | ||
435 | # CONFIG_USB_ARCH_HAS_HCD is not set | ||
436 | # CONFIG_USB_ARCH_HAS_OHCI is not set | ||
437 | |||
438 | # | ||
439 | # USB Gadget Support | ||
440 | # | ||
441 | # CONFIG_USB_GADGET is not set | ||
442 | |||
443 | # | ||
444 | # MMC/SD Card support | ||
445 | # | ||
446 | # CONFIG_MMC is not set | ||
447 | |||
448 | # | ||
449 | # InfiniBand support | ||
450 | # | ||
451 | # CONFIG_INFINIBAND is not set | ||
452 | |||
453 | # | ||
454 | # File systems | ||
455 | # | ||
456 | CONFIG_EXT2_FS=y | ||
457 | CONFIG_EXT2_FS_XATTR=y | ||
458 | # CONFIG_EXT2_FS_POSIX_ACL is not set | ||
459 | # CONFIG_EXT2_FS_SECURITY is not set | ||
460 | CONFIG_EXT3_FS=y | ||
461 | CONFIG_EXT3_FS_XATTR=y | ||
462 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
463 | # CONFIG_EXT3_FS_SECURITY is not set | ||
464 | CONFIG_JBD=y | ||
465 | # CONFIG_JBD_DEBUG is not set | ||
466 | CONFIG_FS_MBCACHE=y | ||
467 | # CONFIG_REISERFS_FS is not set | ||
468 | # CONFIG_JFS_FS is not set | ||
469 | |||
470 | # | ||
471 | # XFS support | ||
472 | # | ||
473 | # CONFIG_XFS_FS is not set | ||
474 | # CONFIG_MINIX_FS is not set | ||
475 | # CONFIG_ROMFS_FS is not set | ||
476 | # CONFIG_QUOTA is not set | ||
477 | # CONFIG_DNOTIFY is not set | ||
478 | # CONFIG_AUTOFS_FS is not set | ||
479 | # CONFIG_AUTOFS4_FS is not set | ||
480 | |||
481 | # | ||
482 | # CD-ROM/DVD Filesystems | ||
483 | # | ||
484 | # CONFIG_ISO9660_FS is not set | ||
485 | # CONFIG_UDF_FS is not set | ||
486 | |||
487 | # | ||
488 | # DOS/FAT/NT Filesystems | ||
489 | # | ||
490 | # CONFIG_MSDOS_FS is not set | ||
491 | # CONFIG_VFAT_FS is not set | ||
492 | # CONFIG_NTFS_FS is not set | ||
493 | |||
494 | # | ||
495 | # Pseudo filesystems | ||
496 | # | ||
497 | CONFIG_PROC_FS=y | ||
498 | # CONFIG_PROC_KCORE is not set | ||
499 | CONFIG_SYSFS=y | ||
500 | # CONFIG_DEVFS_FS is not set | ||
501 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
502 | # CONFIG_TMPFS is not set | ||
503 | # CONFIG_HUGETLBFS is not set | ||
504 | # CONFIG_HUGETLB_PAGE is not set | ||
505 | CONFIG_RAMFS=y | ||
506 | |||
507 | # | ||
508 | # Miscellaneous filesystems | ||
509 | # | ||
510 | # CONFIG_ADFS_FS is not set | ||
511 | # CONFIG_AFFS_FS is not set | ||
512 | # CONFIG_HFS_FS is not set | ||
513 | # CONFIG_HFSPLUS_FS is not set | ||
514 | # CONFIG_BEFS_FS is not set | ||
515 | # CONFIG_BFS_FS is not set | ||
516 | # CONFIG_EFS_FS is not set | ||
517 | # CONFIG_CRAMFS is not set | ||
518 | # CONFIG_VXFS_FS is not set | ||
519 | # CONFIG_HPFS_FS is not set | ||
520 | # CONFIG_QNX4FS_FS is not set | ||
521 | # CONFIG_SYSV_FS is not set | ||
522 | # CONFIG_UFS_FS is not set | ||
523 | |||
524 | # | ||
525 | # Network File Systems | ||
526 | # | ||
527 | CONFIG_NFS_FS=y | ||
528 | # CONFIG_NFS_V3 is not set | ||
529 | # CONFIG_NFS_V4 is not set | ||
530 | # CONFIG_NFS_DIRECTIO is not set | ||
531 | # CONFIG_NFSD is not set | ||
532 | CONFIG_ROOT_NFS=y | ||
533 | CONFIG_LOCKD=y | ||
534 | CONFIG_SUNRPC=y | ||
535 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
536 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
537 | # CONFIG_SMB_FS is not set | ||
538 | # CONFIG_CIFS is not set | ||
539 | # CONFIG_NCP_FS is not set | ||
540 | # CONFIG_CODA_FS is not set | ||
541 | # CONFIG_AFS_FS is not set | ||
542 | |||
543 | # | ||
544 | # Partition Types | ||
545 | # | ||
546 | CONFIG_PARTITION_ADVANCED=y | ||
547 | # CONFIG_ACORN_PARTITION is not set | ||
548 | # CONFIG_OSF_PARTITION is not set | ||
549 | # CONFIG_AMIGA_PARTITION is not set | ||
550 | # CONFIG_ATARI_PARTITION is not set | ||
551 | # CONFIG_MAC_PARTITION is not set | ||
552 | CONFIG_MSDOS_PARTITION=y | ||
553 | # CONFIG_BSD_DISKLABEL is not set | ||
554 | # CONFIG_MINIX_SUBPARTITION is not set | ||
555 | # CONFIG_SOLARIS_X86_PARTITION is not set | ||
556 | # CONFIG_UNIXWARE_DISKLABEL is not set | ||
557 | # CONFIG_LDM_PARTITION is not set | ||
558 | # CONFIG_SGI_PARTITION is not set | ||
559 | # CONFIG_ULTRIX_PARTITION is not set | ||
560 | # CONFIG_SUN_PARTITION is not set | ||
561 | # CONFIG_EFI_PARTITION is not set | ||
562 | |||
563 | # | ||
564 | # Native Language Support | ||
565 | # | ||
566 | # CONFIG_NLS is not set | ||
567 | |||
568 | # | ||
569 | # MPC8xx CPM Options | ||
570 | # | ||
571 | CONFIG_SCC_ENET=y | ||
572 | # CONFIG_SCC1_ENET is not set | ||
573 | # CONFIG_SCC2_ENET is not set | ||
574 | CONFIG_SCC3_ENET=y | ||
575 | # CONFIG_FEC_ENET is not set | ||
576 | # CONFIG_ENET_BIG_BUFFERS is not set | ||
577 | |||
578 | # | ||
579 | # Generic MPC8xx Options | ||
580 | # | ||
581 | CONFIG_8xx_COPYBACK=y | ||
582 | CONFIG_8xx_CPU6=y | ||
583 | CONFIG_NO_UCODE_PATCH=y | ||
584 | # CONFIG_USB_SOF_UCODE_PATCH is not set | ||
585 | # CONFIG_I2C_SPI_UCODE_PATCH is not set | ||
586 | # CONFIG_I2C_SPI_SMC1_UCODE_PATCH is not set | ||
587 | |||
588 | # | ||
589 | # Library routines | ||
590 | # | ||
591 | CONFIG_CRC_CCITT=y | ||
592 | # CONFIG_CRC32 is not set | ||
593 | # CONFIG_LIBCRC32C is not set | ||
594 | CONFIG_ZLIB_INFLATE=y | ||
595 | CONFIG_ZLIB_DEFLATE=y | ||
596 | |||
597 | # | ||
598 | # Profiling support | ||
599 | # | ||
600 | # CONFIG_PROFILING is not set | ||
601 | |||
602 | # | ||
603 | # Kernel hacking | ||
604 | # | ||
605 | # CONFIG_PRINTK_TIME is not set | ||
606 | # CONFIG_DEBUG_KERNEL is not set | ||
607 | CONFIG_LOG_BUF_SHIFT=14 | ||
608 | |||
609 | # | ||
610 | # Security options | ||
611 | # | ||
612 | # CONFIG_KEYS is not set | ||
613 | # CONFIG_SECURITY is not set | ||
614 | |||
615 | # | ||
616 | # Cryptographic options | ||
617 | # | ||
618 | # CONFIG_CRYPTO is not set | ||
619 | |||
620 | # | ||
621 | # Hardware crypto devices | ||
622 | # | ||
diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile index ef74a7b00f4..6260231987c 100644 --- a/arch/ppc/platforms/Makefile +++ b/arch/ppc/platforms/Makefile | |||
@@ -23,5 +23,3 @@ obj-$(CONFIG_SBC82xx) += sbc82xx.o | |||
23 | obj-$(CONFIG_SPRUCE) += spruce.o | 23 | obj-$(CONFIG_SPRUCE) += spruce.o |
24 | obj-$(CONFIG_LITE5200) += lite5200.o | 24 | obj-$(CONFIG_LITE5200) += lite5200.o |
25 | obj-$(CONFIG_EV64360) += ev64360.o | 25 | obj-$(CONFIG_EV64360) += ev64360.o |
26 | obj-$(CONFIG_MPC86XADS) += mpc866ads_setup.o | ||
27 | obj-$(CONFIG_MPC885ADS) += mpc885ads_setup.o | ||
diff --git a/arch/ppc/platforms/fads.h b/arch/ppc/platforms/fads.h index 2f9f0f60e3f..5219366667b 100644 --- a/arch/ppc/platforms/fads.h +++ b/arch/ppc/platforms/fads.h | |||
@@ -22,29 +22,6 @@ | |||
22 | 22 | ||
23 | #include <asm/ppcboot.h> | 23 | #include <asm/ppcboot.h> |
24 | 24 | ||
25 | #if defined(CONFIG_MPC86XADS) | ||
26 | |||
27 | #define BOARD_CHIP_NAME "MPC86X" | ||
28 | |||
29 | /* U-Boot maps BCSR to 0xff080000 */ | ||
30 | #define BCSR_ADDR ((uint)0xff080000) | ||
31 | |||
32 | /* MPC86XADS has one more CPLD and an additional BCSR. | ||
33 | */ | ||
34 | #define CFG_PHYDEV_ADDR ((uint)0xff0a0000) | ||
35 | #define BCSR5 ((uint)(CFG_PHYDEV_ADDR + 0x300)) | ||
36 | |||
37 | #define BCSR5_T1_RST 0x10 | ||
38 | #define BCSR5_ATM155_RST 0x08 | ||
39 | #define BCSR5_ATM25_RST 0x04 | ||
40 | #define BCSR5_MII1_EN 0x02 | ||
41 | #define BCSR5_MII1_RST 0x01 | ||
42 | |||
43 | /* There is no PHY link change interrupt */ | ||
44 | #define PHY_INTERRUPT (-1) | ||
45 | |||
46 | #else /* FADS */ | ||
47 | |||
48 | /* Memory map is configured by the PROM startup. | 25 | /* Memory map is configured by the PROM startup. |
49 | * I tried to follow the FADS manual, although the startup PROM | 26 | * I tried to follow the FADS manual, although the startup PROM |
50 | * dictates this and we simply have to move some of the physical | 27 | * dictates this and we simply have to move some of the physical |
@@ -55,8 +32,6 @@ | |||
55 | /* PHY link change interrupt */ | 32 | /* PHY link change interrupt */ |
56 | #define PHY_INTERRUPT SIU_IRQ2 | 33 | #define PHY_INTERRUPT SIU_IRQ2 |
57 | 34 | ||
58 | #endif /* CONFIG_MPC86XADS */ | ||
59 | |||
60 | #define BCSR_SIZE ((uint)(64 * 1024)) | 35 | #define BCSR_SIZE ((uint)(64 * 1024)) |
61 | #define BCSR0 ((uint)(BCSR_ADDR + 0x00)) | 36 | #define BCSR0 ((uint)(BCSR_ADDR + 0x00)) |
62 | #define BCSR1 ((uint)(BCSR_ADDR + 0x04)) | 37 | #define BCSR1 ((uint)(BCSR_ADDR + 0x04)) |
diff --git a/arch/ppc/platforms/mpc885ads.h b/arch/ppc/platforms/mpc885ads.h deleted file mode 100644 index d3bbbb3c9a1..00000000000 --- a/arch/ppc/platforms/mpc885ads.h +++ /dev/null | |||
@@ -1,93 +0,0 @@ | |||
1 | /* | ||
2 | * A collection of structures, addresses, and values associated with | ||
3 | * the Freescale MPC885ADS board. | ||
4 | * Copied from the FADS stuff. | ||
5 | * | ||
6 | * Author: MontaVista Software, Inc. | ||
7 | * source@mvista.com | ||
8 | * | ||
9 | * 2005 (c) MontaVista Software, Inc. This file is licensed under the | ||
10 | * terms of the GNU General Public License version 2. This program is licensed | ||
11 | * "as is" without any warranty of any kind, whether express or implied. | ||
12 | */ | ||
13 | |||
14 | #ifdef __KERNEL__ | ||
15 | #ifndef __ASM_MPC885ADS_H__ | ||
16 | #define __ASM_MPC885ADS_H__ | ||
17 | |||
18 | |||
19 | #include <asm/ppcboot.h> | ||
20 | |||
21 | /* U-Boot maps BCSR to 0xff080000 */ | ||
22 | #define BCSR_ADDR ((uint)0xff080000) | ||
23 | #define BCSR_SIZE ((uint)32) | ||
24 | #define BCSR0 ((uint)(BCSR_ADDR + 0x00)) | ||
25 | #define BCSR1 ((uint)(BCSR_ADDR + 0x04)) | ||
26 | #define BCSR2 ((uint)(BCSR_ADDR + 0x08)) | ||
27 | #define BCSR3 ((uint)(BCSR_ADDR + 0x0c)) | ||
28 | #define BCSR4 ((uint)(BCSR_ADDR + 0x10)) | ||
29 | |||
30 | #define CFG_PHYDEV_ADDR ((uint)0xff0a0000) | ||
31 | #define BCSR5 ((uint)(CFG_PHYDEV_ADDR + 0x300)) | ||
32 | |||
33 | #define IMAP_ADDR ((uint)0xff000000) | ||
34 | #define IMAP_SIZE ((uint)(64 * 1024)) | ||
35 | |||
36 | #define PCMCIA_MEM_ADDR ((uint)0xff020000) | ||
37 | #define PCMCIA_MEM_SIZE ((uint)(64 * 1024)) | ||
38 | |||
39 | /* Bits of interest in the BCSRs. | ||
40 | */ | ||
41 | #define BCSR1_ETHEN ((uint)0x20000000) | ||
42 | #define BCSR1_IRDAEN ((uint)0x10000000) | ||
43 | #define BCSR1_RS232EN_1 ((uint)0x01000000) | ||
44 | #define BCSR1_PCCEN ((uint)0x00800000) | ||
45 | #define BCSR1_PCCVCC0 ((uint)0x00400000) | ||
46 | #define BCSR1_PCCVPP0 ((uint)0x00200000) | ||
47 | #define BCSR1_PCCVPP1 ((uint)0x00100000) | ||
48 | #define BCSR1_PCCVPP_MASK (BCSR1_PCCVPP0 | BCSR1_PCCVPP1) | ||
49 | #define BCSR1_RS232EN_2 ((uint)0x00040000) | ||
50 | #define BCSR1_PCCVCC1 ((uint)0x00010000) | ||
51 | #define BCSR1_PCCVCC_MASK (BCSR1_PCCVCC0 | BCSR1_PCCVCC1) | ||
52 | |||
53 | #define BCSR4_ETH10_RST ((uint)0x80000000) /* 10Base-T PHY reset*/ | ||
54 | #define BCSR4_USB_LO_SPD ((uint)0x04000000) | ||
55 | #define BCSR4_USB_VCC ((uint)0x02000000) | ||
56 | #define BCSR4_USB_FULL_SPD ((uint)0x00040000) | ||
57 | #define BCSR4_USB_EN ((uint)0x00020000) | ||
58 | |||
59 | #define BCSR5_MII2_EN 0x40 | ||
60 | #define BCSR5_MII2_RST 0x20 | ||
61 | #define BCSR5_T1_RST 0x10 | ||
62 | #define BCSR5_ATM155_RST 0x08 | ||
63 | #define BCSR5_ATM25_RST 0x04 | ||
64 | #define BCSR5_MII1_EN 0x02 | ||
65 | #define BCSR5_MII1_RST 0x01 | ||
66 | |||
67 | /* Interrupt level assignments */ | ||
68 | #define PHY_INTERRUPT SIU_IRQ7 /* PHY link change interrupt */ | ||
69 | #define SIU_INT_FEC1 SIU_LEVEL1 /* FEC1 interrupt */ | ||
70 | #define SIU_INT_FEC2 SIU_LEVEL3 /* FEC2 interrupt */ | ||
71 | #define FEC_INTERRUPT SIU_INT_FEC1 /* FEC interrupt */ | ||
72 | |||
73 | /* We don't use the 8259 */ | ||
74 | #define NR_8259_INTS 0 | ||
75 | |||
76 | /* CPM Ethernet through SCC3 */ | ||
77 | #define PA_ENET_RXD ((ushort)0x0040) | ||
78 | #define PA_ENET_TXD ((ushort)0x0080) | ||
79 | #define PE_ENET_TCLK ((uint)0x00004000) | ||
80 | #define PE_ENET_RCLK ((uint)0x00008000) | ||
81 | #define PE_ENET_TENA ((uint)0x00000010) | ||
82 | #define PC_ENET_CLSN ((ushort)0x0400) | ||
83 | #define PC_ENET_RENA ((ushort)0x0800) | ||
84 | |||
85 | /* Control bits in the SICR to route TCLK (CLK5) and RCLK (CLK6) to | ||
86 | * SCC3. Also, make sure GR3 (bit 8) and SC3 (bit 9) are zero */ | ||
87 | #define SICR_ENET_MASK ((uint)0x00ff0000) | ||
88 | #define SICR_ENET_CLKRT ((uint)0x002c0000) | ||
89 | |||
90 | #define BOARD_CHIP_NAME "MPC885" | ||
91 | |||
92 | #endif /* __ASM_MPC885ADS_H__ */ | ||
93 | #endif /* __KERNEL__ */ | ||
diff --git a/arch/ppc/platforms/mpc885ads_setup.c b/arch/ppc/platforms/mpc885ads_setup.c deleted file mode 100644 index ba06cc08cda..00000000000 --- a/arch/ppc/platforms/mpc885ads_setup.c +++ /dev/null | |||
@@ -1,476 +0,0 @@ | |||
1 | /*arch/ppc/platforms/mpc885ads_setup.c | ||
2 | * | ||
3 | * Platform setup for the Freescale mpc885ads board | ||
4 | * | ||
5 | * Vitaly Bordug <vbordug@ru.mvista.com> | ||
6 | * | ||
7 | * Copyright 2005 MontaVista Software Inc. | ||
8 | * | ||
9 | * This file is licensed under the terms of the GNU General Public License | ||
10 | * version 2. This program is licensed "as is" without any warranty of any | ||
11 | * kind, whether express or implied. | ||
12 | */ | ||
13 | |||
14 | #include <linux/init.h> | ||
15 | #include <linux/module.h> | ||
16 | #include <linux/param.h> | ||
17 | #include <linux/string.h> | ||
18 | #include <linux/ioport.h> | ||
19 | #include <linux/device.h> | ||
20 | |||
21 | #include <linux/fs_enet_pd.h> | ||
22 | #include <linux/fs_uart_pd.h> | ||
23 | #include <linux/mii.h> | ||
24 | |||
25 | #include <asm/delay.h> | ||
26 | #include <asm/io.h> | ||
27 | #include <asm/machdep.h> | ||
28 | #include <asm/page.h> | ||
29 | #include <asm/processor.h> | ||
30 | #include <asm/system.h> | ||
31 | #include <asm/time.h> | ||
32 | #include <asm/ppcboot.h> | ||
33 | #include <asm/8xx_immap.h> | ||
34 | #include <asm/cpm1.h> | ||
35 | #include <asm/ppc_sys.h> | ||
36 | |||
37 | extern unsigned char __res[]; | ||
38 | static void setup_smc1_ioports(struct fs_uart_platform_info*); | ||
39 | static void setup_smc2_ioports(struct fs_uart_platform_info*); | ||
40 | |||
41 | static struct fs_mii_fec_platform_info mpc8xx_mdio_fec_pdata; | ||
42 | static void setup_fec1_ioports(struct fs_platform_info*); | ||
43 | static void setup_fec2_ioports(struct fs_platform_info*); | ||
44 | static void setup_scc3_ioports(struct fs_platform_info*); | ||
45 | |||
46 | static struct fs_uart_platform_info mpc885_uart_pdata[] = { | ||
47 | [fsid_smc1_uart] = { | ||
48 | .brg = 1, | ||
49 | .fs_no = fsid_smc1_uart, | ||
50 | .init_ioports = setup_smc1_ioports, | ||
51 | .tx_num_fifo = 4, | ||
52 | .tx_buf_size = 32, | ||
53 | .rx_num_fifo = 4, | ||
54 | .rx_buf_size = 32, | ||
55 | }, | ||
56 | [fsid_smc2_uart] = { | ||
57 | .brg = 2, | ||
58 | .fs_no = fsid_smc2_uart, | ||
59 | .init_ioports = setup_smc2_ioports, | ||
60 | .tx_num_fifo = 4, | ||
61 | .tx_buf_size = 32, | ||
62 | .rx_num_fifo = 4, | ||
63 | .rx_buf_size = 32, | ||
64 | }, | ||
65 | }; | ||
66 | |||
67 | static struct fs_platform_info mpc8xx_enet_pdata[] = { | ||
68 | [fsid_fec1] = { | ||
69 | .rx_ring = 128, | ||
70 | .tx_ring = 16, | ||
71 | .rx_copybreak = 240, | ||
72 | |||
73 | .use_napi = 1, | ||
74 | .napi_weight = 17, | ||
75 | |||
76 | .init_ioports = setup_fec1_ioports, | ||
77 | |||
78 | .bus_id = "0:00", | ||
79 | .has_phy = 1, | ||
80 | }, | ||
81 | [fsid_fec2] = { | ||
82 | .rx_ring = 128, | ||
83 | .tx_ring = 16, | ||
84 | .rx_copybreak = 240, | ||
85 | |||
86 | .use_napi = 1, | ||
87 | .napi_weight = 17, | ||
88 | |||
89 | .init_ioports = setup_fec2_ioports, | ||
90 | |||
91 | .bus_id = "0:01", | ||
92 | .has_phy = 1, | ||
93 | }, | ||
94 | [fsid_scc3] = { | ||
95 | .rx_ring = 64, | ||
96 | .tx_ring = 8, | ||
97 | .rx_copybreak = 240, | ||
98 | |||
99 | .use_napi = 1, | ||
100 | .napi_weight = 17, | ||
101 | |||
102 | .init_ioports = setup_scc3_ioports, | ||
103 | #ifdef CONFIG_FIXED_MII_10_FDX | ||
104 | .bus_id = "fixed@100:1", | ||
105 | #else | ||
106 | .bus_id = "0:02", | ||
107 | #endif | ||
108 | }, | ||
109 | }; | ||
110 | |||
111 | void __init board_init(void) | ||
112 | { | ||
113 | cpm8xx_t *cp = cpmp; | ||
114 | unsigned int *bcsr_io; | ||
115 | |||
116 | #ifdef CONFIG_FS_ENET | ||
117 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
118 | #endif | ||
119 | bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); | ||
120 | |||
121 | if (bcsr_io == NULL) { | ||
122 | printk(KERN_CRIT "Could not remap BCSR\n"); | ||
123 | return; | ||
124 | } | ||
125 | #ifdef CONFIG_SERIAL_CPM_SMC1 | ||
126 | cp->cp_simode &= ~(0xe0000000 >> 17); /* brg1 */ | ||
127 | clrbits32(bcsr_io, BCSR1_RS232EN_1); | ||
128 | cp->cp_smc[0].smc_smcm |= (SMCM_RX | SMCM_TX); | ||
129 | cp->cp_smc[0].smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | ||
130 | #else | ||
131 | setbits32(bcsr_io,BCSR1_RS232EN_1); | ||
132 | cp->cp_smc[0].smc_smcmr = 0; | ||
133 | cp->cp_smc[0].smc_smce = 0; | ||
134 | #endif | ||
135 | |||
136 | #ifdef CONFIG_SERIAL_CPM_SMC2 | ||
137 | cp->cp_simode &= ~(0xe0000000 >> 1); | ||
138 | cp->cp_simode |= (0x20000000 >> 1); /* brg2 */ | ||
139 | clrbits32(bcsr_io,BCSR1_RS232EN_2); | ||
140 | cp->cp_smc[1].smc_smcm |= (SMCM_RX | SMCM_TX); | ||
141 | cp->cp_smc[1].smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | ||
142 | #else | ||
143 | setbits32(bcsr_io,BCSR1_RS232EN_2); | ||
144 | cp->cp_smc[1].smc_smcmr = 0; | ||
145 | cp->cp_smc[1].smc_smce = 0; | ||
146 | #endif | ||
147 | iounmap(bcsr_io); | ||
148 | |||
149 | #ifdef CONFIG_FS_ENET | ||
150 | /* use MDC for MII (common) */ | ||
151 | setbits16(&immap->im_ioport.iop_pdpar, 0x0080); | ||
152 | clrbits16(&immap->im_ioport.iop_pddir, 0x0080); | ||
153 | bcsr_io = ioremap(BCSR5, sizeof(unsigned long)); | ||
154 | clrbits32(bcsr_io,BCSR5_MII1_EN); | ||
155 | clrbits32(bcsr_io,BCSR5_MII1_RST); | ||
156 | #ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2 | ||
157 | clrbits32(bcsr_io,BCSR5_MII2_EN); | ||
158 | clrbits32(bcsr_io,BCSR5_MII2_RST); | ||
159 | #endif | ||
160 | iounmap(bcsr_io); | ||
161 | #endif | ||
162 | } | ||
163 | |||
164 | static void setup_fec1_ioports(struct fs_platform_info* pdata) | ||
165 | { | ||
166 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
167 | |||
168 | /* configure FEC1 pins */ | ||
169 | setbits16(&immap->im_ioport.iop_papar, 0xf830); | ||
170 | setbits16(&immap->im_ioport.iop_padir, 0x0830); | ||
171 | clrbits16(&immap->im_ioport.iop_padir, 0xf000); | ||
172 | setbits32(&immap->im_cpm.cp_pbpar, 0x00001001); | ||
173 | |||
174 | clrbits32(&immap->im_cpm.cp_pbdir, 0x00001001); | ||
175 | setbits16(&immap->im_ioport.iop_pcpar, 0x000c); | ||
176 | clrbits16(&immap->im_ioport.iop_pcdir, 0x000c); | ||
177 | setbits32(&immap->im_cpm.cp_pepar, 0x00000003); | ||
178 | |||
179 | setbits32(&immap->im_cpm.cp_pedir, 0x00000003); | ||
180 | clrbits32(&immap->im_cpm.cp_peso, 0x00000003); | ||
181 | clrbits32(&immap->im_cpm.cp_cptr, 0x00000100); | ||
182 | } | ||
183 | |||
184 | static void setup_fec2_ioports(struct fs_platform_info* pdata) | ||
185 | { | ||
186 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
187 | |||
188 | /* configure FEC2 pins */ | ||
189 | setbits32(&immap->im_cpm.cp_pepar, 0x0003fffc); | ||
190 | setbits32(&immap->im_cpm.cp_pedir, 0x0003fffc); | ||
191 | clrbits32(&immap->im_cpm.cp_peso, 0x000087fc); | ||
192 | setbits32(&immap->im_cpm.cp_peso, 0x00037800); | ||
193 | clrbits32(&immap->im_cpm.cp_cptr, 0x00000080); | ||
194 | } | ||
195 | |||
196 | static void setup_scc3_ioports(struct fs_platform_info* pdata) | ||
197 | { | ||
198 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
199 | unsigned *bcsr_io; | ||
200 | |||
201 | bcsr_io = ioremap(BCSR_ADDR, BCSR_SIZE); | ||
202 | |||
203 | if (bcsr_io == NULL) { | ||
204 | printk(KERN_CRIT "Could not remap BCSR\n"); | ||
205 | return; | ||
206 | } | ||
207 | |||
208 | /* Enable the PHY. | ||
209 | */ | ||
210 | clrbits32(bcsr_io+4, BCSR4_ETH10_RST); | ||
211 | udelay(1000); | ||
212 | setbits32(bcsr_io+4, BCSR4_ETH10_RST); | ||
213 | /* Configure port A pins for Txd and Rxd. | ||
214 | */ | ||
215 | setbits16(&immap->im_ioport.iop_papar, PA_ENET_RXD | PA_ENET_TXD); | ||
216 | clrbits16(&immap->im_ioport.iop_padir, PA_ENET_RXD | PA_ENET_TXD); | ||
217 | |||
218 | /* Configure port C pins to enable CLSN and RENA. | ||
219 | */ | ||
220 | clrbits16(&immap->im_ioport.iop_pcpar, PC_ENET_CLSN | PC_ENET_RENA); | ||
221 | clrbits16(&immap->im_ioport.iop_pcdir, PC_ENET_CLSN | PC_ENET_RENA); | ||
222 | setbits16(&immap->im_ioport.iop_pcso, PC_ENET_CLSN | PC_ENET_RENA); | ||
223 | |||
224 | /* Configure port E for TCLK and RCLK. | ||
225 | */ | ||
226 | setbits32(&immap->im_cpm.cp_pepar, PE_ENET_TCLK | PE_ENET_RCLK); | ||
227 | clrbits32(&immap->im_cpm.cp_pepar, PE_ENET_TENA); | ||
228 | clrbits32(&immap->im_cpm.cp_pedir, | ||
229 | PE_ENET_TCLK | PE_ENET_RCLK | PE_ENET_TENA); | ||
230 | clrbits32(&immap->im_cpm.cp_peso, PE_ENET_TCLK | PE_ENET_RCLK); | ||
231 | setbits32(&immap->im_cpm.cp_peso, PE_ENET_TENA); | ||
232 | |||
233 | /* Configure Serial Interface clock routing. | ||
234 | * First, clear all SCC bits to zero, then set the ones we want. | ||
235 | */ | ||
236 | clrbits32(&immap->im_cpm.cp_sicr, SICR_ENET_MASK); | ||
237 | setbits32(&immap->im_cpm.cp_sicr, SICR_ENET_CLKRT); | ||
238 | |||
239 | /* Disable Rx and Tx. SMC1 sshould be stopped if SCC3 eternet are used. | ||
240 | */ | ||
241 | immap->im_cpm.cp_smc[0].smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN); | ||
242 | /* On the MPC885ADS SCC ethernet PHY is initialized in the full duplex mode | ||
243 | * by H/W setting after reset. SCC ethernet controller support only half duplex. | ||
244 | * This discrepancy of modes causes a lot of carrier lost errors. | ||
245 | */ | ||
246 | |||
247 | /* In the original SCC enet driver the following code is placed at | ||
248 | the end of the initialization */ | ||
249 | setbits32(&immap->im_cpm.cp_pepar, PE_ENET_TENA); | ||
250 | clrbits32(&immap->im_cpm.cp_pedir, PE_ENET_TENA); | ||
251 | setbits32(&immap->im_cpm.cp_peso, PE_ENET_TENA); | ||
252 | |||
253 | setbits32(bcsr_io+4, BCSR1_ETHEN); | ||
254 | iounmap(bcsr_io); | ||
255 | } | ||
256 | |||
257 | static int mac_count = 0; | ||
258 | |||
259 | static void mpc885ads_fixup_enet_pdata(struct platform_device *pdev, int fs_no) | ||
260 | { | ||
261 | struct fs_platform_info *fpi; | ||
262 | bd_t *bd = (bd_t *) __res; | ||
263 | char *e; | ||
264 | int i; | ||
265 | |||
266 | if(fs_no >= ARRAY_SIZE(mpc8xx_enet_pdata)) { | ||
267 | printk(KERN_ERR"No network-suitable #%d device on bus", fs_no); | ||
268 | return; | ||
269 | } | ||
270 | |||
271 | fpi = &mpc8xx_enet_pdata[fs_no]; | ||
272 | |||
273 | switch (fs_no) { | ||
274 | case fsid_fec1: | ||
275 | fpi->init_ioports = &setup_fec1_ioports; | ||
276 | break; | ||
277 | case fsid_fec2: | ||
278 | fpi->init_ioports = &setup_fec2_ioports; | ||
279 | break; | ||
280 | case fsid_scc3: | ||
281 | fpi->init_ioports = &setup_scc3_ioports; | ||
282 | break; | ||
283 | default: | ||
284 | printk(KERN_WARNING "Device %s is not supported!\n", pdev->name); | ||
285 | return; | ||
286 | } | ||
287 | |||
288 | pdev->dev.platform_data = fpi; | ||
289 | fpi->fs_no = fs_no; | ||
290 | |||
291 | e = (unsigned char *)&bd->bi_enetaddr; | ||
292 | for (i = 0; i < 6; i++) | ||
293 | fpi->macaddr[i] = *e++; | ||
294 | |||
295 | fpi->macaddr[5] += mac_count++; | ||
296 | |||
297 | } | ||
298 | |||
299 | static void mpc885ads_fixup_fec_enet_pdata(struct platform_device *pdev, | ||
300 | int idx) | ||
301 | { | ||
302 | /* This is for FEC devices only */ | ||
303 | if (!pdev || !pdev->name || (!strstr(pdev->name, "fsl-cpm-fec"))) | ||
304 | return; | ||
305 | mpc885ads_fixup_enet_pdata(pdev, fsid_fec1 + pdev->id - 1); | ||
306 | } | ||
307 | |||
308 | static void __init mpc885ads_fixup_scc_enet_pdata(struct platform_device *pdev, | ||
309 | int idx) | ||
310 | { | ||
311 | /* This is for SCC devices only */ | ||
312 | if (!pdev || !pdev->name || (!strstr(pdev->name, "fsl-cpm-scc"))) | ||
313 | return; | ||
314 | |||
315 | mpc885ads_fixup_enet_pdata(pdev, fsid_scc1 + pdev->id - 1); | ||
316 | } | ||
317 | |||
318 | static void setup_smc1_ioports(struct fs_uart_platform_info* pdata) | ||
319 | { | ||
320 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
321 | unsigned *bcsr_io; | ||
322 | unsigned int iobits = 0x000000c0; | ||
323 | |||
324 | bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); | ||
325 | |||
326 | if (bcsr_io == NULL) { | ||
327 | printk(KERN_CRIT "Could not remap BCSR1\n"); | ||
328 | return; | ||
329 | } | ||
330 | clrbits32(bcsr_io,BCSR1_RS232EN_1); | ||
331 | iounmap(bcsr_io); | ||
332 | |||
333 | setbits32(&immap->im_cpm.cp_pbpar, iobits); | ||
334 | clrbits32(&immap->im_cpm.cp_pbdir, iobits); | ||
335 | clrbits16(&immap->im_cpm.cp_pbodr, iobits); | ||
336 | } | ||
337 | |||
338 | static void setup_smc2_ioports(struct fs_uart_platform_info* pdata) | ||
339 | { | ||
340 | immap_t *immap = (immap_t *) IMAP_ADDR; | ||
341 | unsigned *bcsr_io; | ||
342 | unsigned int iobits = 0x00000c00; | ||
343 | |||
344 | bcsr_io = ioremap(BCSR1, sizeof(unsigned long)); | ||
345 | |||
346 | if (bcsr_io == NULL) { | ||
347 | printk(KERN_CRIT "Could not remap BCSR1\n"); | ||
348 | return; | ||
349 | } | ||
350 | clrbits32(bcsr_io,BCSR1_RS232EN_2); | ||
351 | iounmap(bcsr_io); | ||
352 | |||
353 | #ifndef CONFIG_SERIAL_CPM_ALT_SMC2 | ||
354 | setbits32(&immap->im_cpm.cp_pbpar, iobits); | ||
355 | clrbits32(&immap->im_cpm.cp_pbdir, iobits); | ||
356 | clrbits16(&immap->im_cpm.cp_pbodr, iobits); | ||
357 | #else | ||
358 | setbits16(&immap->im_ioport.iop_papar, iobits); | ||
359 | clrbits16(&immap->im_ioport.iop_padir, iobits); | ||
360 | clrbits16(&immap->im_ioport.iop_paodr, iobits); | ||
361 | #endif | ||
362 | } | ||
363 | |||
364 | static void __init mpc885ads_fixup_uart_pdata(struct platform_device *pdev, | ||
365 | int idx) | ||
366 | { | ||
367 | bd_t *bd = (bd_t *) __res; | ||
368 | struct fs_uart_platform_info *pinfo; | ||
369 | int num = ARRAY_SIZE(mpc885_uart_pdata); | ||
370 | |||
371 | int id = fs_uart_id_smc2fsid(idx); | ||
372 | |||
373 | /* no need to alter anything if console */ | ||
374 | if ((id < num) && (!pdev->dev.platform_data)) { | ||
375 | pinfo = &mpc885_uart_pdata[id]; | ||
376 | pinfo->uart_clk = bd->bi_intfreq; | ||
377 | pdev->dev.platform_data = pinfo; | ||
378 | } | ||
379 | } | ||
380 | |||
381 | |||
382 | static int mpc885ads_platform_notify(struct device *dev) | ||
383 | { | ||
384 | |||
385 | static const struct platform_notify_dev_map dev_map[] = { | ||
386 | { | ||
387 | .bus_id = "fsl-cpm-fec", | ||
388 | .rtn = mpc885ads_fixup_fec_enet_pdata, | ||
389 | }, | ||
390 | { | ||
391 | .bus_id = "fsl-cpm-scc", | ||
392 | .rtn = mpc885ads_fixup_scc_enet_pdata, | ||
393 | }, | ||
394 | { | ||
395 | .bus_id = "fsl-cpm-smc:uart", | ||
396 | .rtn = mpc885ads_fixup_uart_pdata | ||
397 | }, | ||
398 | { | ||
399 | .bus_id = NULL | ||
400 | } | ||
401 | }; | ||
402 | |||
403 | platform_notify_map(dev_map,dev); | ||
404 | |||
405 | return 0; | ||
406 | } | ||
407 | |||
408 | int __init mpc885ads_init(void) | ||
409 | { | ||
410 | struct fs_mii_fec_platform_info* fmpi; | ||
411 | bd_t *bd = (bd_t *) __res; | ||
412 | |||
413 | printk(KERN_NOTICE "mpc885ads: Init\n"); | ||
414 | |||
415 | platform_notify = mpc885ads_platform_notify; | ||
416 | |||
417 | ppc_sys_device_initfunc(); | ||
418 | ppc_sys_device_disable_all(); | ||
419 | |||
420 | ppc_sys_device_enable(MPC8xx_CPM_FEC1); | ||
421 | |||
422 | ppc_sys_device_enable(MPC8xx_MDIO_FEC); | ||
423 | fmpi = ppc_sys_platform_devices[MPC8xx_MDIO_FEC].dev.platform_data = | ||
424 | &mpc8xx_mdio_fec_pdata; | ||
425 | |||
426 | fmpi->mii_speed = ((((bd->bi_intfreq + 4999999) / 2500000) / 2) & 0x3F) << 1; | ||
427 | |||
428 | /* No PHY interrupt line here */ | ||
429 | fmpi->irq[0xf] = SIU_IRQ7; | ||
430 | |||
431 | #ifdef CONFIG_MPC8xx_SECOND_ETH_SCC3 | ||
432 | ppc_sys_device_enable(MPC8xx_CPM_SCC3); | ||
433 | |||
434 | #endif | ||
435 | #ifdef CONFIG_MPC8xx_SECOND_ETH_FEC2 | ||
436 | ppc_sys_device_enable(MPC8xx_CPM_FEC2); | ||
437 | #endif | ||
438 | |||
439 | #ifdef CONFIG_SERIAL_CPM_SMC1 | ||
440 | ppc_sys_device_enable(MPC8xx_CPM_SMC1); | ||
441 | ppc_sys_device_setfunc(MPC8xx_CPM_SMC1, PPC_SYS_FUNC_UART); | ||
442 | #endif | ||
443 | |||
444 | #ifdef CONFIG_SERIAL_CPM_SMC2 | ||
445 | ppc_sys_device_enable(MPC8xx_CPM_SMC2); | ||
446 | ppc_sys_device_setfunc(MPC8xx_CPM_SMC2, PPC_SYS_FUNC_UART); | ||
447 | #endif | ||
448 | return 0; | ||
449 | } | ||
450 | |||
451 | arch_initcall(mpc885ads_init); | ||
452 | |||
453 | /* | ||
454 | To prevent confusion, console selection is gross: | ||
455 | by 0 assumed SMC1 and by 1 assumed SMC2 | ||
456 | */ | ||
457 | struct platform_device* early_uart_get_pdev(int index) | ||
458 | { | ||
459 | bd_t *bd = (bd_t *) __res; | ||
460 | struct fs_uart_platform_info *pinfo; | ||
461 | |||
462 | struct platform_device* pdev = NULL; | ||
463 | if(index) { /*assume SMC2 here*/ | ||
464 | pdev = &ppc_sys_platform_devices[MPC8xx_CPM_SMC2]; | ||
465 | pinfo = &mpc885_uart_pdata[1]; | ||
466 | } else { /*over SMC1*/ | ||
467 | pdev = &ppc_sys_platform_devices[MPC8xx_CPM_SMC1]; | ||
468 | pinfo = &mpc885_uart_pdata[0]; | ||
469 | } | ||
470 | |||
471 | pinfo->uart_clk = bd->bi_intfreq; | ||
472 | pdev->dev.platform_data = pinfo; | ||
473 | ppc_sys_fixup_mem_resource(pdev, IMAP_ADDR); | ||
474 | return NULL; | ||
475 | } | ||
476 | |||
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c index 9caf850c9b3..dcd08d4a7f1 100644 --- a/arch/ppc/syslib/m8xx_setup.c +++ b/arch/ppc/syslib/m8xx_setup.c | |||
@@ -143,16 +143,6 @@ m8xx_setup_arch(void) | |||
143 | #endif | 143 | #endif |
144 | #endif | 144 | #endif |
145 | 145 | ||
146 | #if defined (CONFIG_MPC86XADS) || defined (CONFIG_MPC885ADS) | ||
147 | #if defined(CONFIG_MTD_PHYSMAP) | ||
148 | physmap_configure(binfo->bi_flashstart, binfo->bi_flashsize, | ||
149 | MPC8xxADS_BANK_WIDTH, NULL); | ||
150 | #ifdef CONFIG_MTD_PARTITIONS | ||
151 | physmap_set_partitions(mpc8xxads_partitions, mpc8xxads_part_num); | ||
152 | #endif /* CONFIG_MTD_PARTITIONS */ | ||
153 | #endif /* CONFIG_MTD_PHYSMAP */ | ||
154 | #endif | ||
155 | |||
156 | board_init(); | 146 | board_init(); |
157 | } | 147 | } |
158 | 148 | ||