diff options
author | Kumar Gala <galak@freescale.com> | 2005-09-03 18:55:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:05:54 -0400 |
commit | 37330c9146767fd4f5eb147b01cb500eabf773cf (patch) | |
tree | 24c39b09fe8d1394a952672ffea09b3a43c6950d | |
parent | 6db789b6a3a9ee41b22de3980748af85f7dbe416 (diff) |
[PATCH] ppc32: Remove board support for OAK
Support for the OAK board is no longer maintained and thus being removed
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/ppc/configs/oak_defconfig | 485 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/Kconfig | 6 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/Makefile | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/oak.c | 255 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/oak.h | 96 | ||||
-rw-r--r-- | arch/ppc/platforms/4xx/oak_setup.h | 50 | ||||
-rw-r--r-- | include/asm-ppc/ibm4xx.h | 4 |
7 files changed, 1 insertions, 896 deletions
diff --git a/arch/ppc/configs/oak_defconfig b/arch/ppc/configs/oak_defconfig deleted file mode 100644 index 366cc480cea3..000000000000 --- a/arch/ppc/configs/oak_defconfig +++ /dev/null | |||
@@ -1,485 +0,0 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # | ||
4 | CONFIG_MMU=y | ||
5 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
6 | CONFIG_HAVE_DEC_LOCK=y | ||
7 | |||
8 | # | ||
9 | # Code maturity level options | ||
10 | # | ||
11 | CONFIG_EXPERIMENTAL=y | ||
12 | |||
13 | # | ||
14 | # General setup | ||
15 | # | ||
16 | CONFIG_SWAP=y | ||
17 | CONFIG_SYSVIPC=y | ||
18 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
19 | CONFIG_SYSCTL=y | ||
20 | CONFIG_LOG_BUF_SHIFT=14 | ||
21 | CONFIG_EMBEDDED=y | ||
22 | CONFIG_FUTEX=y | ||
23 | # CONFIG_EPOLL is not set | ||
24 | |||
25 | # | ||
26 | # Loadable module support | ||
27 | # | ||
28 | CONFIG_MODULES=y | ||
29 | CONFIG_MODULE_UNLOAD=y | ||
30 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
31 | CONFIG_OBSOLETE_MODPARM=y | ||
32 | # CONFIG_MODVERSIONS is not set | ||
33 | CONFIG_KMOD=y | ||
34 | |||
35 | # | ||
36 | # Platform support | ||
37 | # | ||
38 | CONFIG_PPC=y | ||
39 | CONFIG_PPC32=y | ||
40 | # CONFIG_6xx is not set | ||
41 | CONFIG_40x=y | ||
42 | # CONFIG_POWER3 is not set | ||
43 | # CONFIG_8xx is not set | ||
44 | CONFIG_4xx=y | ||
45 | |||
46 | # | ||
47 | # IBM 4xx options | ||
48 | # | ||
49 | # CONFIG_ASH is not set | ||
50 | # CONFIG_BEECH is not set | ||
51 | # CONFIG_CEDAR is not set | ||
52 | # CONFIG_CPCI405 is not set | ||
53 | # CONFIG_EP405 is not set | ||
54 | CONFIG_OAK=y | ||
55 | # CONFIG_REDWOOD_4 is not set | ||
56 | # CONFIG_REDWOOD_5 is not set | ||
57 | # CONFIG_REDWOOD_6 is not set | ||
58 | # CONFIG_SYCAMORE is not set | ||
59 | # CONFIG_TIVO is not set | ||
60 | # CONFIG_WALNUT is not set | ||
61 | CONFIG_IBM405_ERR51=y | ||
62 | CONFIG_403GCX=y | ||
63 | # CONFIG_405_DMA is not set | ||
64 | # CONFIG_PM is not set | ||
65 | CONFIG_UART0_TTYS0=y | ||
66 | # CONFIG_UART0_TTYS1 is not set | ||
67 | CONFIG_NOT_COHERENT_CACHE=y | ||
68 | # CONFIG_SMP is not set | ||
69 | # CONFIG_PREEMPT is not set | ||
70 | # CONFIG_MATH_EMULATION is not set | ||
71 | # CONFIG_CPU_FREQ is not set | ||
72 | |||
73 | # | ||
74 | # General setup | ||
75 | # | ||
76 | # CONFIG_HIGHMEM is not set | ||
77 | # CONFIG_PCI is not set | ||
78 | # CONFIG_PCI_DOMAINS is not set | ||
79 | # CONFIG_PC_KEYBOARD is not set | ||
80 | CONFIG_KCORE_ELF=y | ||
81 | CONFIG_BINFMT_ELF=y | ||
82 | CONFIG_KERNEL_ELF=y | ||
83 | # CONFIG_BINFMT_MISC is not set | ||
84 | # CONFIG_HOTPLUG is not set | ||
85 | |||
86 | # | ||
87 | # Parallel port support | ||
88 | # | ||
89 | # CONFIG_PARPORT is not set | ||
90 | # CONFIG_CMDLINE_BOOL is not set | ||
91 | |||
92 | # | ||
93 | # Advanced setup | ||
94 | # | ||
95 | # CONFIG_ADVANCED_OPTIONS is not set | ||
96 | |||
97 | # | ||
98 | # Default settings for advanced configuration options are used | ||
99 | # | ||
100 | CONFIG_HIGHMEM_START=0xfe000000 | ||
101 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
102 | CONFIG_KERNEL_START=0xc0000000 | ||
103 | CONFIG_TASK_SIZE=0x80000000 | ||
104 | CONFIG_BOOT_LOAD=0x00400000 | ||
105 | |||
106 | # | ||
107 | # Memory Technology Devices (MTD) | ||
108 | # | ||
109 | # CONFIG_MTD is not set | ||
110 | |||
111 | # | ||
112 | # Plug and Play support | ||
113 | # | ||
114 | # CONFIG_PNP is not set | ||
115 | |||
116 | # | ||
117 | # Block devices | ||
118 | # | ||
119 | # CONFIG_BLK_DEV_FD is not set | ||
120 | CONFIG_BLK_DEV_LOOP=y | ||
121 | # CONFIG_BLK_DEV_NBD is not set | ||
122 | CONFIG_BLK_DEV_RAM=y | ||
123 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
124 | CONFIG_BLK_DEV_INITRD=y | ||
125 | |||
126 | # | ||
127 | # Multi-device support (RAID and LVM) | ||
128 | # | ||
129 | # CONFIG_MD is not set | ||
130 | |||
131 | # | ||
132 | # ATA/IDE/MFM/RLL support | ||
133 | # | ||
134 | # CONFIG_IDE is not set | ||
135 | |||
136 | # | ||
137 | # SCSI support | ||
138 | # | ||
139 | # CONFIG_SCSI is not set | ||
140 | |||
141 | # | ||
142 | # Fusion MPT device support | ||
143 | # | ||
144 | |||
145 | # | ||
146 | # I2O device support | ||
147 | # | ||
148 | |||
149 | # | ||
150 | # Networking support | ||
151 | # | ||
152 | CONFIG_NET=y | ||
153 | |||
154 | # | ||
155 | # Networking options | ||
156 | # | ||
157 | # CONFIG_PACKET is not set | ||
158 | # CONFIG_NETLINK_DEV is not set | ||
159 | # CONFIG_NETFILTER is not set | ||
160 | CONFIG_UNIX=y | ||
161 | # CONFIG_NET_KEY is not set | ||
162 | CONFIG_INET=y | ||
163 | CONFIG_IP_MULTICAST=y | ||
164 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
165 | CONFIG_IP_PNP=y | ||
166 | # CONFIG_IP_PNP_DHCP is not set | ||
167 | CONFIG_IP_PNP_BOOTP=y | ||
168 | CONFIG_IP_PNP_RARP=y | ||
169 | # CONFIG_NET_IPIP is not set | ||
170 | # CONFIG_NET_IPGRE is not set | ||
171 | # CONFIG_IP_MROUTE is not set | ||
172 | # CONFIG_ARPD is not set | ||
173 | # CONFIG_INET_ECN is not set | ||
174 | CONFIG_SYN_COOKIES=y | ||
175 | # CONFIG_INET_AH is not set | ||
176 | # CONFIG_INET_ESP is not set | ||
177 | # CONFIG_INET_IPCOMP is not set | ||
178 | # CONFIG_IPV6 is not set | ||
179 | # CONFIG_XFRM_USER is not set | ||
180 | |||
181 | # | ||
182 | # SCTP Configuration (EXPERIMENTAL) | ||
183 | # | ||
184 | CONFIG_IPV6_SCTP__=y | ||
185 | # CONFIG_IP_SCTP is not set | ||
186 | # CONFIG_ATM is not set | ||
187 | # CONFIG_VLAN_8021Q is not set | ||
188 | # CONFIG_LLC is not set | ||
189 | # CONFIG_DECNET is not set | ||
190 | # CONFIG_BRIDGE is not set | ||
191 | # CONFIG_X25 is not set | ||
192 | # CONFIG_LAPB is not set | ||
193 | # CONFIG_NET_DIVERT is not set | ||
194 | # CONFIG_ECONET is not set | ||
195 | # CONFIG_WAN_ROUTER is not set | ||
196 | # CONFIG_NET_HW_FLOWCONTROL is not set | ||
197 | |||
198 | # | ||
199 | # QoS and/or fair queueing | ||
200 | # | ||
201 | # CONFIG_NET_SCHED is not set | ||
202 | |||
203 | # | ||
204 | # Network testing | ||
205 | # | ||
206 | # CONFIG_NET_PKTGEN is not set | ||
207 | CONFIG_NETDEVICES=y | ||
208 | # CONFIG_DUMMY is not set | ||
209 | # CONFIG_BONDING is not set | ||
210 | # CONFIG_EQUALIZER is not set | ||
211 | # CONFIG_TUN is not set | ||
212 | # CONFIG_ETHERTAP is not set | ||
213 | |||
214 | # | ||
215 | # Ethernet (10 or 100Mbit) | ||
216 | # | ||
217 | CONFIG_NET_ETHERNET=y | ||
218 | # CONFIG_MII is not set | ||
219 | CONFIG_OAKNET=y | ||
220 | |||
221 | # | ||
222 | # Ethernet (1000 Mbit) | ||
223 | # | ||
224 | |||
225 | # | ||
226 | # Ethernet (10000 Mbit) | ||
227 | # | ||
228 | # CONFIG_PPP is not set | ||
229 | # CONFIG_SLIP is not set | ||
230 | |||
231 | # | ||
232 | # Wireless LAN (non-hamradio) | ||
233 | # | ||
234 | # CONFIG_NET_RADIO is not set | ||
235 | |||
236 | # | ||
237 | # Token Ring devices (depends on LLC=y) | ||
238 | # | ||
239 | # CONFIG_SHAPER is not set | ||
240 | |||
241 | # | ||
242 | # Wan interfaces | ||
243 | # | ||
244 | # CONFIG_WAN is not set | ||
245 | |||
246 | # | ||
247 | # Amateur Radio support | ||
248 | # | ||
249 | # CONFIG_HAMRADIO is not set | ||
250 | |||
251 | # | ||
252 | # IrDA (infrared) support | ||
253 | # | ||
254 | # CONFIG_IRDA is not set | ||
255 | |||
256 | # | ||
257 | # ISDN subsystem | ||
258 | # | ||
259 | # CONFIG_ISDN_BOOL is not set | ||
260 | |||
261 | # | ||
262 | # Graphics support | ||
263 | # | ||
264 | # CONFIG_FB is not set | ||
265 | |||
266 | # | ||
267 | # Old CD-ROM drivers (not SCSI, not IDE) | ||
268 | # | ||
269 | # CONFIG_CD_NO_IDESCSI is not set | ||
270 | |||
271 | # | ||
272 | # Input device support | ||
273 | # | ||
274 | # CONFIG_INPUT is not set | ||
275 | |||
276 | # | ||
277 | # Userland interfaces | ||
278 | # | ||
279 | |||
280 | # | ||
281 | # Input I/O drivers | ||
282 | # | ||
283 | # CONFIG_GAMEPORT is not set | ||
284 | CONFIG_SOUND_GAMEPORT=y | ||
285 | # CONFIG_SERIO is not set | ||
286 | |||
287 | # | ||
288 | # Input Device Drivers | ||
289 | # | ||
290 | |||
291 | # | ||
292 | # Macintosh device drivers | ||
293 | # | ||
294 | |||
295 | # | ||
296 | # Character devices | ||
297 | # | ||
298 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
299 | |||
300 | # | ||
301 | # Serial drivers | ||
302 | # | ||
303 | CONFIG_SERIAL_8250=y | ||
304 | CONFIG_SERIAL_8250_CONSOLE=y | ||
305 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
306 | |||
307 | # | ||
308 | # Non-8250 serial port support | ||
309 | # | ||
310 | CONFIG_SERIAL_CORE=y | ||
311 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
312 | # CONFIG_UNIX98_PTYS is not set | ||
313 | |||
314 | # | ||
315 | # I2C support | ||
316 | # | ||
317 | # CONFIG_I2C is not set | ||
318 | |||
319 | # | ||
320 | # I2C Hardware Sensors Mainboard support | ||
321 | # | ||
322 | |||
323 | # | ||
324 | # I2C Hardware Sensors Chip support | ||
325 | # | ||
326 | # CONFIG_I2C_SENSOR is not set | ||
327 | |||
328 | # | ||
329 | # Mice | ||
330 | # | ||
331 | # CONFIG_BUSMOUSE is not set | ||
332 | # CONFIG_QIC02_TAPE is not set | ||
333 | |||
334 | # | ||
335 | # IPMI | ||
336 | # | ||
337 | # CONFIG_IPMI_HANDLER is not set | ||
338 | |||
339 | # | ||
340 | # Watchdog Cards | ||
341 | # | ||
342 | # CONFIG_WATCHDOG is not set | ||
343 | # CONFIG_NVRAM is not set | ||
344 | CONFIG_GEN_RTC=y | ||
345 | # CONFIG_GEN_RTC_X is not set | ||
346 | # CONFIG_DTLK is not set | ||
347 | # CONFIG_R3964 is not set | ||
348 | # CONFIG_APPLICOM is not set | ||
349 | |||
350 | # | ||
351 | # Ftape, the floppy tape device driver | ||
352 | # | ||
353 | # CONFIG_FTAPE is not set | ||
354 | # CONFIG_AGP is not set | ||
355 | # CONFIG_DRM is not set | ||
356 | # CONFIG_RAW_DRIVER is not set | ||
357 | # CONFIG_HANGCHECK_TIMER is not set | ||
358 | |||
359 | # | ||
360 | # Multimedia devices | ||
361 | # | ||
362 | # CONFIG_VIDEO_DEV is not set | ||
363 | |||
364 | # | ||
365 | # Digital Video Broadcasting Devices | ||
366 | # | ||
367 | # CONFIG_DVB is not set | ||
368 | |||
369 | # | ||
370 | # File systems | ||
371 | # | ||
372 | CONFIG_EXT2_FS=y | ||
373 | # CONFIG_EXT2_FS_XATTR is not set | ||
374 | # CONFIG_EXT3_FS is not set | ||
375 | # CONFIG_JBD is not set | ||
376 | # CONFIG_REISERFS_FS is not set | ||
377 | # CONFIG_JFS_FS is not set | ||
378 | # CONFIG_XFS_FS is not set | ||
379 | # CONFIG_MINIX_FS is not set | ||
380 | # CONFIG_ROMFS_FS is not set | ||
381 | # CONFIG_QUOTA is not set | ||
382 | # CONFIG_AUTOFS_FS is not set | ||
383 | # CONFIG_AUTOFS4_FS is not set | ||
384 | |||
385 | # | ||
386 | # CD-ROM/DVD Filesystems | ||
387 | # | ||
388 | # CONFIG_ISO9660_FS is not set | ||
389 | # CONFIG_UDF_FS is not set | ||
390 | |||
391 | # | ||
392 | # DOS/FAT/NT Filesystems | ||
393 | # | ||
394 | # CONFIG_FAT_FS is not set | ||
395 | # CONFIG_NTFS_FS is not set | ||
396 | |||
397 | # | ||
398 | # Pseudo filesystems | ||
399 | # | ||
400 | CONFIG_PROC_FS=y | ||
401 | # CONFIG_DEVFS_FS is not set | ||
402 | CONFIG_TMPFS=y | ||
403 | CONFIG_RAMFS=y | ||
404 | |||
405 | # | ||
406 | # Miscellaneous filesystems | ||
407 | # | ||
408 | # CONFIG_ADFS_FS is not set | ||
409 | # CONFIG_AFFS_FS is not set | ||
410 | # CONFIG_HFS_FS is not set | ||
411 | # CONFIG_BEFS_FS is not set | ||
412 | # CONFIG_BFS_FS is not set | ||
413 | # CONFIG_EFS_FS is not set | ||
414 | # CONFIG_CRAMFS is not set | ||
415 | # CONFIG_VXFS_FS is not set | ||
416 | # CONFIG_HPFS_FS is not set | ||
417 | # CONFIG_QNX4FS_FS is not set | ||
418 | # CONFIG_SYSV_FS is not set | ||
419 | # CONFIG_UFS_FS is not set | ||
420 | |||
421 | # | ||
422 | # Network File Systems | ||
423 | # | ||
424 | CONFIG_NFS_FS=y | ||
425 | # CONFIG_NFS_V3 is not set | ||
426 | # CONFIG_NFS_V4 is not set | ||
427 | # CONFIG_NFSD is not set | ||
428 | CONFIG_ROOT_NFS=y | ||
429 | CONFIG_LOCKD=y | ||
430 | # CONFIG_EXPORTFS is not set | ||
431 | CONFIG_SUNRPC=y | ||
432 | # CONFIG_SUNRPC_GSS is not set | ||
433 | # CONFIG_SMB_FS is not set | ||
434 | # CONFIG_CIFS is not set | ||
435 | # CONFIG_NCP_FS is not set | ||
436 | # CONFIG_CODA_FS is not set | ||
437 | # CONFIG_INTERMEZZO_FS is not set | ||
438 | # CONFIG_AFS_FS is not set | ||
439 | |||
440 | # | ||
441 | # Partition Types | ||
442 | # | ||
443 | # CONFIG_PARTITION_ADVANCED is not set | ||
444 | CONFIG_MSDOS_PARTITION=y | ||
445 | |||
446 | # | ||
447 | # Sound | ||
448 | # | ||
449 | # CONFIG_SOUND is not set | ||
450 | |||
451 | # | ||
452 | # IBM 40x options | ||
453 | # | ||
454 | |||
455 | # | ||
456 | # USB support | ||
457 | # | ||
458 | # CONFIG_USB_GADGET is not set | ||
459 | |||
460 | # | ||
461 | # Bluetooth support | ||
462 | # | ||
463 | # CONFIG_BT is not set | ||
464 | |||
465 | # | ||
466 | # Library routines | ||
467 | # | ||
468 | # CONFIG_CRC32 is not set | ||
469 | |||
470 | # | ||
471 | # Kernel hacking | ||
472 | # | ||
473 | # CONFIG_DEBUG_KERNEL is not set | ||
474 | # CONFIG_KALLSYMS is not set | ||
475 | # CONFIG_SERIAL_TEXT_DEBUG is not set | ||
476 | |||
477 | # | ||
478 | # Security options | ||
479 | # | ||
480 | # CONFIG_SECURITY is not set | ||
481 | |||
482 | # | ||
483 | # Cryptographic options | ||
484 | # | ||
485 | # CONFIG_CRYPTO is not set | ||
diff --git a/arch/ppc/platforms/4xx/Kconfig b/arch/ppc/platforms/4xx/Kconfig index a7eaba91dfbf..8772ae11a951 100644 --- a/arch/ppc/platforms/4xx/Kconfig +++ b/arch/ppc/platforms/4xx/Kconfig | |||
@@ -32,11 +32,6 @@ config EP405 | |||
32 | help | 32 | help |
33 | This option enables support for the EP405/EP405PC boards. | 33 | This option enables support for the EP405/EP405PC boards. |
34 | 34 | ||
35 | config OAK | ||
36 | bool "Oak" | ||
37 | help | ||
38 | This option enables support for the IBM 403GCX evaluation board. | ||
39 | |||
40 | config REDWOOD_5 | 35 | config REDWOOD_5 |
41 | bool "Redwood-5" | 36 | bool "Redwood-5" |
42 | help | 37 | help |
@@ -181,6 +176,7 @@ config BIOS_FIXUP | |||
181 | depends on BUBINGA || EP405 || SYCAMORE || WALNUT | 176 | depends on BUBINGA || EP405 || SYCAMORE || WALNUT |
182 | default y | 177 | default y |
183 | 178 | ||
179 | # OAK doesn't exist but wanted to keep this around for any future 403GCX boards | ||
184 | config 403GCX | 180 | config 403GCX |
185 | bool | 181 | bool |
186 | depends OAK | 182 | depends OAK |
diff --git a/arch/ppc/platforms/4xx/Makefile b/arch/ppc/platforms/4xx/Makefile index f00e0d02ee2c..1dd6d7fd6a9a 100644 --- a/arch/ppc/platforms/4xx/Makefile +++ b/arch/ppc/platforms/4xx/Makefile | |||
@@ -7,7 +7,6 @@ obj-$(CONFIG_EBONY) += ebony.o | |||
7 | obj-$(CONFIG_EP405) += ep405.o | 7 | obj-$(CONFIG_EP405) += ep405.o |
8 | obj-$(CONFIG_BUBINGA) += bubinga.o | 8 | obj-$(CONFIG_BUBINGA) += bubinga.o |
9 | obj-$(CONFIG_LUAN) += luan.o | 9 | obj-$(CONFIG_LUAN) += luan.o |
10 | obj-$(CONFIG_OAK) += oak.o | ||
11 | obj-$(CONFIG_OCOTEA) += ocotea.o | 10 | obj-$(CONFIG_OCOTEA) += ocotea.o |
12 | obj-$(CONFIG_REDWOOD_5) += redwood5.o | 11 | obj-$(CONFIG_REDWOOD_5) += redwood5.o |
13 | obj-$(CONFIG_REDWOOD_6) += redwood6.o | 12 | obj-$(CONFIG_REDWOOD_6) += redwood6.o |
diff --git a/arch/ppc/platforms/4xx/oak.c b/arch/ppc/platforms/4xx/oak.c deleted file mode 100644 index fa25ee1fa733..000000000000 --- a/arch/ppc/platforms/4xx/oak.c +++ /dev/null | |||
@@ -1,255 +0,0 @@ | |||
1 | /* | ||
2 | * | ||
3 | * Copyright (c) 1999-2000 Grant Erickson <grant@lcse.umn.edu> | ||
4 | * | ||
5 | * Module name: oak.c | ||
6 | * | ||
7 | * Description: | ||
8 | * Architecture- / platform-specific boot-time initialization code for | ||
9 | * the IBM PowerPC 403GCX "Oak" evaluation board. Adapted from original | ||
10 | * code by Gary Thomas, Cort Dougan <cort@fsmlabs.com>, and Dan Malek | ||
11 | * <dan@net4x.com>. | ||
12 | * | ||
13 | */ | ||
14 | |||
15 | #include <linux/config.h> | ||
16 | #include <linux/init.h> | ||
17 | #include <linux/smp.h> | ||
18 | #include <linux/threads.h> | ||
19 | #include <linux/param.h> | ||
20 | #include <linux/string.h> | ||
21 | #include <linux/initrd.h> | ||
22 | #include <linux/irq.h> | ||
23 | #include <linux/seq_file.h> | ||
24 | |||
25 | #include <asm/board.h> | ||
26 | #include <asm/machdep.h> | ||
27 | #include <asm/page.h> | ||
28 | #include <asm/bootinfo.h> | ||
29 | #include <asm/ppc4xx_pic.h> | ||
30 | #include <asm/time.h> | ||
31 | |||
32 | #include "oak.h" | ||
33 | |||
34 | /* Function Prototypes */ | ||
35 | |||
36 | extern void abort(void); | ||
37 | |||
38 | /* Global Variables */ | ||
39 | |||
40 | unsigned char __res[sizeof(bd_t)]; | ||
41 | |||
42 | |||
43 | /* | ||
44 | * void __init oak_init() | ||
45 | * | ||
46 | * Description: | ||
47 | * This routine... | ||
48 | * | ||
49 | * Input(s): | ||
50 | * r3 - Optional pointer to a board information structure. | ||
51 | * r4 - Optional pointer to the physical starting address of the init RAM | ||
52 | * disk. | ||
53 | * r5 - Optional pointer to the physical ending address of the init RAM | ||
54 | * disk. | ||
55 | * r6 - Optional pointer to the physical starting address of any kernel | ||
56 | * command-line parameters. | ||
57 | * r7 - Optional pointer to the physical ending address of any kernel | ||
58 | * command-line parameters. | ||
59 | * | ||
60 | * Output(s): | ||
61 | * N/A | ||
62 | * | ||
63 | * Returns: | ||
64 | * N/A | ||
65 | * | ||
66 | */ | ||
67 | void __init | ||
68 | platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | ||
69 | unsigned long r6, unsigned long r7) | ||
70 | { | ||
71 | parse_bootinfo(find_bootinfo()); | ||
72 | |||
73 | /* | ||
74 | * If we were passed in a board information, copy it into the | ||
75 | * residual data area. | ||
76 | */ | ||
77 | if (r3) { | ||
78 | memcpy((void *)__res, (void *)(r3 + KERNELBASE), sizeof(bd_t)); | ||
79 | } | ||
80 | |||
81 | #if defined(CONFIG_BLK_DEV_INITRD) | ||
82 | /* | ||
83 | * If the init RAM disk has been configured in, and there's a valid | ||
84 | * starting address for it, set it up. | ||
85 | */ | ||
86 | if (r4) { | ||
87 | initrd_start = r4 + KERNELBASE; | ||
88 | initrd_end = r5 + KERNELBASE; | ||
89 | } | ||
90 | #endif /* CONFIG_BLK_DEV_INITRD */ | ||
91 | |||
92 | /* Copy the kernel command line arguments to a safe place. */ | ||
93 | |||
94 | if (r6) { | ||
95 | *(char *)(r7 + KERNELBASE) = 0; | ||
96 | strcpy(cmd_line, (char *)(r6 + KERNELBASE)); | ||
97 | } | ||
98 | |||
99 | /* Initialize machine-dependency vectors */ | ||
100 | |||
101 | ppc_md.setup_arch = oak_setup_arch; | ||
102 | ppc_md.show_percpuinfo = oak_show_percpuinfo; | ||
103 | ppc_md.irq_canonicalize = NULL; | ||
104 | ppc_md.init_IRQ = ppc4xx_pic_init; | ||
105 | ppc_md.get_irq = NULL; /* Set in ppc4xx_pic_init() */ | ||
106 | ppc_md.init = NULL; | ||
107 | |||
108 | ppc_md.restart = oak_restart; | ||
109 | ppc_md.power_off = oak_power_off; | ||
110 | ppc_md.halt = oak_halt; | ||
111 | |||
112 | ppc_md.time_init = oak_time_init; | ||
113 | ppc_md.set_rtc_time = oak_set_rtc_time; | ||
114 | ppc_md.get_rtc_time = oak_get_rtc_time; | ||
115 | ppc_md.calibrate_decr = oak_calibrate_decr; | ||
116 | } | ||
117 | |||
118 | /* | ||
119 | * Document me. | ||
120 | */ | ||
121 | void __init | ||
122 | oak_setup_arch(void) | ||
123 | { | ||
124 | /* XXX - Implement me */ | ||
125 | } | ||
126 | |||
127 | /* | ||
128 | * int oak_show_percpuinfo() | ||
129 | * | ||
130 | * Description: | ||
131 | * This routine pretty-prints the platform's internal CPU and bus clock | ||
132 | * frequencies into the buffer for usage in /proc/cpuinfo. | ||
133 | * | ||
134 | * Input(s): | ||
135 | * *buffer - Buffer into which CPU and bus clock frequencies are to be | ||
136 | * printed. | ||
137 | * | ||
138 | * Output(s): | ||
139 | * *buffer - Buffer with the CPU and bus clock frequencies. | ||
140 | * | ||
141 | * Returns: | ||
142 | * The number of bytes copied into 'buffer' if OK, otherwise zero or less | ||
143 | * on error. | ||
144 | */ | ||
145 | int | ||
146 | oak_show_percpuinfo(struct seq_file *m, int i) | ||
147 | { | ||
148 | bd_t *bp = (bd_t *)__res; | ||
149 | |||
150 | seq_printf(m, "clock\t\t: %dMHz\n" | ||
151 | "bus clock\t\t: %dMHz\n", | ||
152 | bp->bi_intfreq / 1000000, | ||
153 | bp->bi_busfreq / 1000000); | ||
154 | |||
155 | return 0; | ||
156 | } | ||
157 | |||
158 | /* | ||
159 | * Document me. | ||
160 | */ | ||
161 | void | ||
162 | oak_restart(char *cmd) | ||
163 | { | ||
164 | abort(); | ||
165 | } | ||
166 | |||
167 | /* | ||
168 | * Document me. | ||
169 | */ | ||
170 | void | ||
171 | oak_power_off(void) | ||
172 | { | ||
173 | oak_restart(NULL); | ||
174 | } | ||
175 | |||
176 | /* | ||
177 | * Document me. | ||
178 | */ | ||
179 | void | ||
180 | oak_halt(void) | ||
181 | { | ||
182 | oak_restart(NULL); | ||
183 | } | ||
184 | |||
185 | /* | ||
186 | * Document me. | ||
187 | */ | ||
188 | long __init | ||
189 | oak_time_init(void) | ||
190 | { | ||
191 | /* XXX - Implement me */ | ||
192 | return 0; | ||
193 | } | ||
194 | |||
195 | /* | ||
196 | * Document me. | ||
197 | */ | ||
198 | int __init | ||
199 | oak_set_rtc_time(unsigned long time) | ||
200 | { | ||
201 | /* XXX - Implement me */ | ||
202 | |||
203 | return (0); | ||
204 | } | ||
205 | |||
206 | /* | ||
207 | * Document me. | ||
208 | */ | ||
209 | unsigned long __init | ||
210 | oak_get_rtc_time(void) | ||
211 | { | ||
212 | /* XXX - Implement me */ | ||
213 | |||
214 | return (0); | ||
215 | } | ||
216 | |||
217 | /* | ||
218 | * void __init oak_calibrate_decr() | ||
219 | * | ||
220 | * Description: | ||
221 | * This routine retrieves the internal processor frequency from the board | ||
222 | * information structure, sets up the kernel timer decrementer based on | ||
223 | * that value, enables the 403 programmable interval timer (PIT) and sets | ||
224 | * it up for auto-reload. | ||
225 | * | ||
226 | * Input(s): | ||
227 | * N/A | ||
228 | * | ||
229 | * Output(s): | ||
230 | * N/A | ||
231 | * | ||
232 | * Returns: | ||
233 | * N/A | ||
234 | * | ||
235 | */ | ||
236 | void __init | ||
237 | oak_calibrate_decr(void) | ||
238 | { | ||
239 | unsigned int freq; | ||
240 | bd_t *bip = (bd_t *)__res; | ||
241 | |||
242 | freq = bip->bi_intfreq; | ||
243 | |||
244 | decrementer_count = freq / HZ; | ||
245 | count_period_num = 1; | ||
246 | count_period_den = freq; | ||
247 | |||
248 | /* Enable the PIT and set auto-reload of its value */ | ||
249 | |||
250 | mtspr(SPRN_TCR, TCR_PIE | TCR_ARE); | ||
251 | |||
252 | /* Clear any pending timer interrupts */ | ||
253 | |||
254 | mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_PIS | TSR_FIS); | ||
255 | } | ||
diff --git a/arch/ppc/platforms/4xx/oak.h b/arch/ppc/platforms/4xx/oak.h deleted file mode 100644 index 1b86a4c66b04..000000000000 --- a/arch/ppc/platforms/4xx/oak.h +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | /* | ||
2 | * | ||
3 | * Copyright (c) 1999 Grant Erickson <grant@lcse.umn.edu> | ||
4 | * | ||
5 | * Module name: oak.h | ||
6 | * | ||
7 | * Description: | ||
8 | * Macros, definitions, and data structures specific to the IBM PowerPC | ||
9 | * 403G{A,B,C,CX} "Oak" evaluation board. Anything specific to the pro- | ||
10 | * cessor itself is defined elsewhere. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | #ifdef __KERNEL__ | ||
15 | #ifndef __ASM_OAK_H__ | ||
16 | #define __ASM_OAK_H__ | ||
17 | |||
18 | /* We have an IBM 403G{A,B,C,CX} core */ | ||
19 | #include <asm/ibm403.h> | ||
20 | |||
21 | #define _IO_BASE 0 | ||
22 | #define _ISA_MEM_BASE 0 | ||
23 | #define PCI_DRAM_OFFSET 0 | ||
24 | |||
25 | /* Memory map for the "Oak" evaluation board */ | ||
26 | |||
27 | #define PPC403SPU_IO_BASE 0x40000000 /* 403 On-chip serial port */ | ||
28 | #define PPC403SPU_IO_SIZE 0x00000008 | ||
29 | #define OAKSERIAL_IO_BASE 0x7E000000 /* NS16550DV serial port */ | ||
30 | #define OAKSERIAL_IO_SIZE 0x00000008 | ||
31 | #define OAKNET_IO_BASE 0xF4000000 /* NS83902AV Ethernet */ | ||
32 | #define OAKNET_IO_SIZE 0x00000040 | ||
33 | #define OAKPROM_IO_BASE 0xFFFE0000 /* AMD 29F010 Flash ROM */ | ||
34 | #define OAKPROM_IO_SIZE 0x00020000 | ||
35 | |||
36 | |||
37 | /* Interrupt assignments fixed by the hardware implementation */ | ||
38 | |||
39 | /* This is annoying kbuild-2.4 problem. -- Tom */ | ||
40 | |||
41 | #define PPC403SPU_RX_INT 4 /* AIC_INT4 */ | ||
42 | #define PPC403SPU_TX_INT 5 /* AIC_INT5 */ | ||
43 | #define OAKNET_INT 27 /* AIC_INT27 */ | ||
44 | #define OAKSERIAL_INT 28 /* AIC_INT28 */ | ||
45 | |||
46 | #ifndef __ASSEMBLY__ | ||
47 | /* | ||
48 | * Data structure defining board information maintained by the boot | ||
49 | * ROM on IBM's "Oak" evaluation board. An effort has been made to | ||
50 | * keep the field names consistent with the 8xx 'bd_t' board info | ||
51 | * structures. | ||
52 | */ | ||
53 | |||
54 | typedef struct board_info { | ||
55 | unsigned char bi_s_version[4]; /* Version of this structure */ | ||
56 | unsigned char bi_r_version[30]; /* Version of the IBM ROM */ | ||
57 | unsigned int bi_memsize; /* DRAM installed, in bytes */ | ||
58 | unsigned char bi_enetaddr[6]; /* Ethernet MAC address */ | ||
59 | unsigned int bi_intfreq; /* Processor speed, in Hz */ | ||
60 | unsigned int bi_busfreq; /* Bus speed, in Hz */ | ||
61 | } bd_t; | ||
62 | |||
63 | #ifdef __cplusplus | ||
64 | extern "C" { | ||
65 | #endif | ||
66 | |||
67 | extern void oak_init(unsigned long r3, | ||
68 | unsigned long ird_start, | ||
69 | unsigned long ird_end, | ||
70 | unsigned long cline_start, | ||
71 | unsigned long cline_end); | ||
72 | extern void oak_setup_arch(void); | ||
73 | extern int oak_setup_residual(char *buffer); | ||
74 | extern void oak_init_IRQ(void); | ||
75 | extern int oak_get_irq(struct pt_regs *regs); | ||
76 | extern void oak_restart(char *cmd); | ||
77 | extern void oak_power_off(void); | ||
78 | extern void oak_halt(void); | ||
79 | extern void oak_time_init(void); | ||
80 | extern int oak_set_rtc_time(unsigned long now); | ||
81 | extern unsigned long oak_get_rtc_time(void); | ||
82 | extern void oak_calibrate_decr(void); | ||
83 | |||
84 | #ifdef __cplusplus | ||
85 | } | ||
86 | #endif | ||
87 | |||
88 | /* Some 4xx parts use a different timebase frequency from the internal clock. | ||
89 | */ | ||
90 | #define bi_tbfreq bi_intfreq | ||
91 | |||
92 | #define PPC4xx_MACHINE_NAME "IBM Oak" | ||
93 | |||
94 | #endif /* !__ASSEMBLY__ */ | ||
95 | #endif /* __ASM_OAK_H__ */ | ||
96 | #endif /* __KERNEL__ */ | ||
diff --git a/arch/ppc/platforms/4xx/oak_setup.h b/arch/ppc/platforms/4xx/oak_setup.h deleted file mode 100644 index 8648bd084df8..000000000000 --- a/arch/ppc/platforms/4xx/oak_setup.h +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | /* | ||
2 | * | ||
3 | * Copyright (c) 1999-2000 Grant Erickson <grant@lcse.umn.edu> | ||
4 | * | ||
5 | * Module name: oak_setup.h | ||
6 | * | ||
7 | * Description: | ||
8 | * Architecture- / platform-specific boot-time initialization code for | ||
9 | * the IBM PowerPC 403GCX "Oak" evaluation board. Adapted from original | ||
10 | * code by Gary Thomas, Cort Dougan <cort@cs.nmt.edu>, and Dan Malek | ||
11 | * <dan@netx4.com>. | ||
12 | * | ||
13 | */ | ||
14 | |||
15 | #ifndef __OAK_SETUP_H__ | ||
16 | #define __OAK_SETUP_H__ | ||
17 | |||
18 | #include <asm/ptrace.h> | ||
19 | #include <asm/board.h> | ||
20 | |||
21 | |||
22 | #ifdef __cplusplus | ||
23 | extern "C" { | ||
24 | #endif | ||
25 | |||
26 | extern unsigned char __res[sizeof(bd_t)]; | ||
27 | |||
28 | extern void oak_init(unsigned long r3, | ||
29 | unsigned long ird_start, | ||
30 | unsigned long ird_end, | ||
31 | unsigned long cline_start, | ||
32 | unsigned long cline_end); | ||
33 | extern void oak_setup_arch(void); | ||
34 | extern int oak_setup_residual(char *buffer); | ||
35 | extern void oak_init_IRQ(void); | ||
36 | extern int oak_get_irq(struct pt_regs *regs); | ||
37 | extern void oak_restart(char *cmd); | ||
38 | extern void oak_power_off(void); | ||
39 | extern void oak_halt(void); | ||
40 | extern void oak_time_init(void); | ||
41 | extern int oak_set_rtc_time(unsigned long now); | ||
42 | extern unsigned long oak_get_rtc_time(void); | ||
43 | extern void oak_calibrate_decr(void); | ||
44 | |||
45 | |||
46 | #ifdef __cplusplus | ||
47 | } | ||
48 | #endif | ||
49 | |||
50 | #endif /* __OAK_SETUP_H__ */ | ||
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h index d6852fa9852d..7900d52d2a16 100644 --- a/include/asm-ppc/ibm4xx.h +++ b/include/asm-ppc/ibm4xx.h | |||
@@ -31,10 +31,6 @@ | |||
31 | #include <platforms/4xx/ep405.h> | 31 | #include <platforms/4xx/ep405.h> |
32 | #endif | 32 | #endif |
33 | 33 | ||
34 | #if defined(CONFIG_OAK) | ||
35 | #include <platforms/4xx/oak.h> | ||
36 | #endif | ||
37 | |||
38 | #if defined(CONFIG_REDWOOD_4) | 34 | #if defined(CONFIG_REDWOOD_4) |
39 | #include <platforms/4xx/redwood.h> | 35 | #include <platforms/4xx/redwood.h> |
40 | #endif | 36 | #endif |