diff options
author | Kumar Gala <galak@freescale.com> | 2005-09-03 18:55:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:05:55 -0400 |
commit | 617bf9a47f017b7e91dab9ef9bdaaeaee24163a7 (patch) | |
tree | fb60e409527908cf5fae83d256f5a60a09e8ae89 | |
parent | f4ad35a34bdc27ae18f97d684ca0e693bbffd5f5 (diff) |
[PATCH] ppc32: Remove board support for PCORE
Support for the PCORE 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/Kconfig | 9 | ||||
-rw-r--r-- | arch/ppc/boot/simple/Makefile | 7 | ||||
-rw-r--r-- | arch/ppc/configs/pcore_defconfig | 716 | ||||
-rw-r--r-- | arch/ppc/platforms/Makefile | 1 | ||||
-rw-r--r-- | arch/ppc/platforms/pcore.c | 352 | ||||
-rw-r--r-- | arch/ppc/platforms/pcore.h | 39 | ||||
-rw-r--r-- | arch/ppc/syslib/Makefile | 1 |
7 files changed, 3 insertions, 1122 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 770d8f23f655..f88032c65f91 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -548,9 +548,6 @@ config CPCI690 | |||
548 | help | 548 | help |
549 | Select CPCI690 if configuring a Force CPCI690 cPCI board. | 549 | Select CPCI690 if configuring a Force CPCI690 cPCI board. |
550 | 550 | ||
551 | config PCORE | ||
552 | bool "Force-PowerCore" | ||
553 | |||
554 | config POWERPMC250 | 551 | config POWERPMC250 |
555 | bool "Force-PowerPMC250" | 552 | bool "Force-PowerPMC250" |
556 | 553 | ||
@@ -757,7 +754,7 @@ config PPC_OF | |||
757 | 754 | ||
758 | config PPC_GEN550 | 755 | config PPC_GEN550 |
759 | bool | 756 | bool |
760 | depends on SANDPOINT || SPRUCE || PPLUS || PCORE || \ | 757 | depends on SANDPOINT || SPRUCE || PPLUS || \ |
761 | PRPMC750 || PRPMC800 || LOPEC || \ | 758 | PRPMC750 || PRPMC800 || LOPEC || \ |
762 | (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \ | 759 | (EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \ |
763 | 83xx | 760 | 83xx |
@@ -765,7 +762,7 @@ config PPC_GEN550 | |||
765 | 762 | ||
766 | config FORCE | 763 | config FORCE |
767 | bool | 764 | bool |
768 | depends on 6xx && (PCORE || POWERPMC250) | 765 | depends on 6xx && POWERPMC250 |
769 | default y | 766 | default y |
770 | 767 | ||
771 | config GT64260 | 768 | config GT64260 |
@@ -828,7 +825,7 @@ config EPIC_SERIAL_MODE | |||
828 | 825 | ||
829 | config MPC10X_BRIDGE | 826 | config MPC10X_BRIDGE |
830 | bool | 827 | bool |
831 | depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT | 828 | depends on POWERPMC250 || LOPEC || SANDPOINT |
832 | default y | 829 | default y |
833 | 830 | ||
834 | config MPC10X_OPENPIC | 831 | config MPC10X_OPENPIC |
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile index 7e975aa98404..a5bd9f3f40d8 100644 --- a/arch/ppc/boot/simple/Makefile +++ b/arch/ppc/boot/simple/Makefile | |||
@@ -109,7 +109,6 @@ zimageinitrd-$(CONFIG_GEMINI) := zImage.initrd-STRIPELF | |||
109 | motorola := $(CONFIG_MVME5100)$(CONFIG_PRPMC750) \ | 109 | motorola := $(CONFIG_MVME5100)$(CONFIG_PRPMC750) \ |
110 | $(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS) | 110 | $(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS) |
111 | motorola := $(strip $(motorola)) | 111 | motorola := $(strip $(motorola)) |
112 | pcore := $(CONFIG_PCORE)$(CONFIG_POWERPMC250) | ||
113 | 112 | ||
114 | zimage-$(motorola) := zImage-PPLUS | 113 | zimage-$(motorola) := zImage-PPLUS |
115 | zimageinitrd-$(motorola) := zImage.initrd-PPLUS | 114 | zimageinitrd-$(motorola) := zImage.initrd-PPLUS |
@@ -119,12 +118,6 @@ zimageinitrd-$(motorola) := zImage.initrd-PPLUS | |||
119 | extra.o-$(CONFIG_PPLUS) := prepmap.o | 118 | extra.o-$(CONFIG_PPLUS) := prepmap.o |
120 | extra.o-$(CONFIG_LOPEC) := mpc10x_memory.o | 119 | extra.o-$(CONFIG_LOPEC) := mpc10x_memory.o |
121 | 120 | ||
122 | zimage-$(pcore) := zImage-STRIPELF | ||
123 | zimageinitrd-$(pcore) := zImage.initrd-STRIPELF | ||
124 | extra.o-$(pcore) := chrpmap.o | ||
125 | end-$(pcore) := pcore | ||
126 | cacheflag-$(pcore) := -include $(clear_L2_L3) | ||
127 | |||
128 | # Really only valid if CONFIG_6xx=y | 121 | # Really only valid if CONFIG_6xx=y |
129 | zimage-$(CONFIG_PPC_PREP) := zImage-PPLUS | 122 | zimage-$(CONFIG_PPC_PREP) := zImage-PPLUS |
130 | zimageinitrd-$(CONFIG_PPC_PREP) := zImage.initrd-PPLUS | 123 | zimageinitrd-$(CONFIG_PPC_PREP) := zImage.initrd-PPLUS |
diff --git a/arch/ppc/configs/pcore_defconfig b/arch/ppc/configs/pcore_defconfig deleted file mode 100644 index ed34405a7574..000000000000 --- a/arch/ppc/configs/pcore_defconfig +++ /dev/null | |||
@@ -1,716 +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 | CONFIG_PPC=y | ||
8 | CONFIG_PPC32=y | ||
9 | CONFIG_GENERIC_NVRAM=y | ||
10 | |||
11 | # | ||
12 | # Code maturity level options | ||
13 | # | ||
14 | CONFIG_EXPERIMENTAL=y | ||
15 | CONFIG_CLEAN_COMPILE=y | ||
16 | CONFIG_STANDALONE=y | ||
17 | CONFIG_BROKEN_ON_SMP=y | ||
18 | |||
19 | # | ||
20 | # General setup | ||
21 | # | ||
22 | CONFIG_SWAP=y | ||
23 | CONFIG_SYSVIPC=y | ||
24 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
25 | CONFIG_SYSCTL=y | ||
26 | CONFIG_LOG_BUF_SHIFT=14 | ||
27 | # CONFIG_HOTPLUG is not set | ||
28 | # CONFIG_IKCONFIG is not set | ||
29 | CONFIG_EMBEDDED=y | ||
30 | CONFIG_KALLSYMS=y | ||
31 | CONFIG_FUTEX=y | ||
32 | CONFIG_EPOLL=y | ||
33 | CONFIG_IOSCHED_NOOP=y | ||
34 | CONFIG_IOSCHED_AS=y | ||
35 | CONFIG_IOSCHED_DEADLINE=y | ||
36 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
37 | |||
38 | # | ||
39 | # Loadable module support | ||
40 | # | ||
41 | CONFIG_MODULES=y | ||
42 | CONFIG_MODULE_UNLOAD=y | ||
43 | # CONFIG_MODULE_FORCE_UNLOAD is not set | ||
44 | CONFIG_OBSOLETE_MODPARM=y | ||
45 | # CONFIG_MODVERSIONS is not set | ||
46 | CONFIG_KMOD=y | ||
47 | |||
48 | # | ||
49 | # Processor | ||
50 | # | ||
51 | CONFIG_6xx=y | ||
52 | # CONFIG_40x is not set | ||
53 | # CONFIG_44x is not set | ||
54 | # CONFIG_POWER3 is not set | ||
55 | # CONFIG_POWER4 is not set | ||
56 | # CONFIG_8xx is not set | ||
57 | CONFIG_ALTIVEC=y | ||
58 | # CONFIG_TAU is not set | ||
59 | # CONFIG_CPU_FREQ is not set | ||
60 | CONFIG_PPC_STD_MMU=y | ||
61 | |||
62 | # | ||
63 | # Platform options | ||
64 | # | ||
65 | # CONFIG_PPC_MULTIPLATFORM is not set | ||
66 | # CONFIG_APUS is not set | ||
67 | # CONFIG_WILLOW is not set | ||
68 | CONFIG_PCORE=y | ||
69 | # CONFIG_POWERPMC250 is not set | ||
70 | # CONFIG_EV64260 is not set | ||
71 | # CONFIG_SPRUCE is not set | ||
72 | # CONFIG_LOPEC is not set | ||
73 | # CONFIG_MCPN765 is not set | ||
74 | # CONFIG_MVME5100 is not set | ||
75 | # CONFIG_PPLUS is not set | ||
76 | # CONFIG_PRPMC750 is not set | ||
77 | # CONFIG_PRPMC800 is not set | ||
78 | # CONFIG_SANDPOINT is not set | ||
79 | # CONFIG_ADIR is not set | ||
80 | # CONFIG_K2 is not set | ||
81 | # CONFIG_PAL4 is not set | ||
82 | # CONFIG_GEMINI is not set | ||
83 | # CONFIG_EST8260 is not set | ||
84 | # CONFIG_SBS8260 is not set | ||
85 | # CONFIG_RPX6 is not set | ||
86 | # CONFIG_TQM8260 is not set | ||
87 | CONFIG_PPC_GEN550=y | ||
88 | CONFIG_FORCE=y | ||
89 | # CONFIG_MPC10X_STORE_GATHERING is not set | ||
90 | # CONFIG_SMP is not set | ||
91 | # CONFIG_PREEMPT is not set | ||
92 | # CONFIG_HIGHMEM is not set | ||
93 | CONFIG_KERNEL_ELF=y | ||
94 | CONFIG_BINFMT_ELF=y | ||
95 | # CONFIG_BINFMT_MISC is not set | ||
96 | CONFIG_CMDLINE_BOOL=y | ||
97 | CONFIG_CMDLINE="ip=on" | ||
98 | |||
99 | # | ||
100 | # Bus options | ||
101 | # | ||
102 | CONFIG_GENERIC_ISA_DMA=y | ||
103 | CONFIG_PCI=y | ||
104 | CONFIG_PCI_DOMAINS=y | ||
105 | # CONFIG_PCI_LEGACY_PROC is not set | ||
106 | # CONFIG_PCI_NAMES is not set | ||
107 | |||
108 | # | ||
109 | # Advanced setup | ||
110 | # | ||
111 | # CONFIG_ADVANCED_OPTIONS is not set | ||
112 | |||
113 | # | ||
114 | # Default settings for advanced configuration options are used | ||
115 | # | ||
116 | CONFIG_HIGHMEM_START=0xfe000000 | ||
117 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
118 | CONFIG_KERNEL_START=0xc0000000 | ||
119 | CONFIG_TASK_SIZE=0x80000000 | ||
120 | CONFIG_BOOT_LOAD=0x00800000 | ||
121 | |||
122 | # | ||
123 | # Device Drivers | ||
124 | # | ||
125 | |||
126 | # | ||
127 | # Generic Driver Options | ||
128 | # | ||
129 | |||
130 | # | ||
131 | # Memory Technology Devices (MTD) | ||
132 | # | ||
133 | # CONFIG_MTD is not set | ||
134 | |||
135 | # | ||
136 | # Parallel port support | ||
137 | # | ||
138 | # CONFIG_PARPORT is not set | ||
139 | |||
140 | # | ||
141 | # Plug and Play support | ||
142 | # | ||
143 | |||
144 | # | ||
145 | # Block devices | ||
146 | # | ||
147 | # CONFIG_BLK_DEV_FD is not set | ||
148 | # CONFIG_BLK_CPQ_DA is not set | ||
149 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
150 | # CONFIG_BLK_DEV_DAC960 is not set | ||
151 | # CONFIG_BLK_DEV_UMEM is not set | ||
152 | # CONFIG_BLK_DEV_LOOP is not set | ||
153 | # CONFIG_BLK_DEV_NBD is not set | ||
154 | # CONFIG_BLK_DEV_CARMEL is not set | ||
155 | CONFIG_BLK_DEV_RAM=y | ||
156 | CONFIG_BLK_DEV_RAM_SIZE=4096 | ||
157 | CONFIG_BLK_DEV_INITRD=y | ||
158 | # CONFIG_LBD is not set | ||
159 | |||
160 | # | ||
161 | # ATA/ATAPI/MFM/RLL support | ||
162 | # | ||
163 | # CONFIG_IDE is not set | ||
164 | |||
165 | # | ||
166 | # SCSI device support | ||
167 | # | ||
168 | CONFIG_SCSI=y | ||
169 | CONFIG_SCSI_PROC_FS=y | ||
170 | |||
171 | # | ||
172 | # SCSI support type (disk, tape, CD-ROM) | ||
173 | # | ||
174 | CONFIG_BLK_DEV_SD=y | ||
175 | # CONFIG_CHR_DEV_ST is not set | ||
176 | # CONFIG_CHR_DEV_OSST is not set | ||
177 | CONFIG_BLK_DEV_SR=y | ||
178 | # CONFIG_BLK_DEV_SR_VENDOR is not set | ||
179 | # CONFIG_CHR_DEV_SG is not set | ||
180 | |||
181 | # | ||
182 | # Some SCSI devices (e.g. CD jukebox) support multiple LUNs | ||
183 | # | ||
184 | # CONFIG_SCSI_MULTI_LUN is not set | ||
185 | # CONFIG_SCSI_REPORT_LUNS is not set | ||
186 | # CONFIG_SCSI_CONSTANTS is not set | ||
187 | # CONFIG_SCSI_LOGGING is not set | ||
188 | |||
189 | # | ||
190 | # SCSI Transport Attributes | ||
191 | # | ||
192 | # CONFIG_SCSI_SPI_ATTRS is not set | ||
193 | # CONFIG_SCSI_FC_ATTRS is not set | ||
194 | |||
195 | # | ||
196 | # SCSI low-level drivers | ||
197 | # | ||
198 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | ||
199 | # CONFIG_SCSI_ACARD is not set | ||
200 | # CONFIG_SCSI_AACRAID is not set | ||
201 | # CONFIG_SCSI_AIC7XXX is not set | ||
202 | # CONFIG_SCSI_AIC7XXX_OLD is not set | ||
203 | # CONFIG_SCSI_AIC79XX is not set | ||
204 | # CONFIG_SCSI_ADVANSYS is not set | ||
205 | # CONFIG_SCSI_MEGARAID is not set | ||
206 | # CONFIG_SCSI_SATA is not set | ||
207 | # CONFIG_SCSI_BUSLOGIC is not set | ||
208 | # CONFIG_SCSI_CPQFCTS is not set | ||
209 | # CONFIG_SCSI_DMX3191D is not set | ||
210 | # CONFIG_SCSI_EATA is not set | ||
211 | # CONFIG_SCSI_EATA_PIO is not set | ||
212 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | ||
213 | # CONFIG_SCSI_GDTH is not set | ||
214 | # CONFIG_SCSI_IPS is not set | ||
215 | # CONFIG_SCSI_INIA100 is not set | ||
216 | CONFIG_SCSI_SYM53C8XX_2=y | ||
217 | CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 | ||
218 | CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 | ||
219 | CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | ||
220 | # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set | ||
221 | # CONFIG_SCSI_QLOGIC_ISP is not set | ||
222 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
223 | # CONFIG_SCSI_QLOGIC_1280 is not set | ||
224 | CONFIG_SCSI_QLA2XXX=y | ||
225 | # CONFIG_SCSI_QLA21XX is not set | ||
226 | # CONFIG_SCSI_QLA22XX is not set | ||
227 | # CONFIG_SCSI_QLA2300 is not set | ||
228 | # CONFIG_SCSI_QLA2322 is not set | ||
229 | # CONFIG_SCSI_QLA6312 is not set | ||
230 | # CONFIG_SCSI_QLA6322 is not set | ||
231 | # CONFIG_SCSI_DC395x is not set | ||
232 | # CONFIG_SCSI_DC390T is not set | ||
233 | # CONFIG_SCSI_NSP32 is not set | ||
234 | # CONFIG_SCSI_DEBUG is not set | ||
235 | |||
236 | # | ||
237 | # Multi-device support (RAID and LVM) | ||
238 | # | ||
239 | # CONFIG_MD is not set | ||
240 | |||
241 | # | ||
242 | # Fusion MPT device support | ||
243 | # | ||
244 | # CONFIG_FUSION is not set | ||
245 | |||
246 | # | ||
247 | # IEEE 1394 (FireWire) support | ||
248 | # | ||
249 | # CONFIG_IEEE1394 is not set | ||
250 | |||
251 | # | ||
252 | # I2O device support | ||
253 | # | ||
254 | # CONFIG_I2O is not set | ||
255 | |||
256 | # | ||
257 | # Macintosh device drivers | ||
258 | # | ||
259 | |||
260 | # | ||
261 | # Networking support | ||
262 | # | ||
263 | CONFIG_NET=y | ||
264 | |||
265 | # | ||
266 | # Networking options | ||
267 | # | ||
268 | CONFIG_PACKET=y | ||
269 | # CONFIG_PACKET_MMAP is not set | ||
270 | # CONFIG_NETLINK_DEV is not set | ||
271 | CONFIG_UNIX=y | ||
272 | # CONFIG_NET_KEY is not set | ||
273 | CONFIG_INET=y | ||
274 | CONFIG_IP_MULTICAST=y | ||
275 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
276 | CONFIG_IP_PNP=y | ||
277 | CONFIG_IP_PNP_DHCP=y | ||
278 | # CONFIG_IP_PNP_BOOTP is not set | ||
279 | # CONFIG_IP_PNP_RARP is not set | ||
280 | # CONFIG_NET_IPIP is not set | ||
281 | # CONFIG_NET_IPGRE is not set | ||
282 | # CONFIG_IP_MROUTE is not set | ||
283 | # CONFIG_ARPD is not set | ||
284 | # CONFIG_SYN_COOKIES is not set | ||
285 | # CONFIG_INET_AH is not set | ||
286 | # CONFIG_INET_ESP is not set | ||
287 | # CONFIG_INET_IPCOMP is not set | ||
288 | |||
289 | # | ||
290 | # IP: Virtual Server Configuration | ||
291 | # | ||
292 | # CONFIG_IP_VS is not set | ||
293 | # CONFIG_IPV6 is not set | ||
294 | # CONFIG_DECNET is not set | ||
295 | # CONFIG_BRIDGE is not set | ||
296 | CONFIG_NETFILTER=y | ||
297 | # CONFIG_NETFILTER_DEBUG is not set | ||
298 | |||
299 | # | ||
300 | # IP: Netfilter Configuration | ||
301 | # | ||
302 | CONFIG_IP_NF_CONNTRACK=m | ||
303 | CONFIG_IP_NF_FTP=m | ||
304 | CONFIG_IP_NF_IRC=m | ||
305 | # CONFIG_IP_NF_TFTP is not set | ||
306 | # CONFIG_IP_NF_AMANDA is not set | ||
307 | # CONFIG_IP_NF_QUEUE is not set | ||
308 | CONFIG_IP_NF_IPTABLES=m | ||
309 | CONFIG_IP_NF_MATCH_LIMIT=m | ||
310 | # CONFIG_IP_NF_MATCH_IPRANGE is not set | ||
311 | CONFIG_IP_NF_MATCH_MAC=m | ||
312 | CONFIG_IP_NF_MATCH_PKTTYPE=m | ||
313 | CONFIG_IP_NF_MATCH_MARK=m | ||
314 | CONFIG_IP_NF_MATCH_MULTIPORT=m | ||
315 | CONFIG_IP_NF_MATCH_TOS=m | ||
316 | # CONFIG_IP_NF_MATCH_RECENT is not set | ||
317 | CONFIG_IP_NF_MATCH_ECN=m | ||
318 | CONFIG_IP_NF_MATCH_DSCP=m | ||
319 | CONFIG_IP_NF_MATCH_AH_ESP=m | ||
320 | CONFIG_IP_NF_MATCH_LENGTH=m | ||
321 | CONFIG_IP_NF_MATCH_TTL=m | ||
322 | CONFIG_IP_NF_MATCH_TCPMSS=m | ||
323 | CONFIG_IP_NF_MATCH_HELPER=m | ||
324 | CONFIG_IP_NF_MATCH_STATE=m | ||
325 | CONFIG_IP_NF_MATCH_CONNTRACK=m | ||
326 | CONFIG_IP_NF_MATCH_OWNER=m | ||
327 | CONFIG_IP_NF_FILTER=m | ||
328 | CONFIG_IP_NF_TARGET_REJECT=m | ||
329 | CONFIG_IP_NF_NAT=m | ||
330 | CONFIG_IP_NF_NAT_NEEDED=y | ||
331 | CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
332 | CONFIG_IP_NF_TARGET_REDIRECT=m | ||
333 | # CONFIG_IP_NF_TARGET_NETMAP is not set | ||
334 | # CONFIG_IP_NF_TARGET_SAME is not set | ||
335 | # CONFIG_IP_NF_NAT_SNMP_BASIC is not set | ||
336 | CONFIG_IP_NF_NAT_IRC=m | ||
337 | CONFIG_IP_NF_NAT_FTP=m | ||
338 | # CONFIG_IP_NF_MANGLE is not set | ||
339 | # CONFIG_IP_NF_TARGET_LOG is not set | ||
340 | CONFIG_IP_NF_TARGET_ULOG=m | ||
341 | CONFIG_IP_NF_TARGET_TCPMSS=m | ||
342 | CONFIG_IP_NF_ARPTABLES=m | ||
343 | CONFIG_IP_NF_ARPFILTER=m | ||
344 | # CONFIG_IP_NF_ARP_MANGLE is not set | ||
345 | CONFIG_IP_NF_COMPAT_IPCHAINS=m | ||
346 | # CONFIG_IP_NF_COMPAT_IPFWADM is not set | ||
347 | |||
348 | # | ||
349 | # SCTP Configuration (EXPERIMENTAL) | ||
350 | # | ||
351 | # CONFIG_IP_SCTP is not set | ||
352 | # CONFIG_ATM is not set | ||
353 | # CONFIG_VLAN_8021Q is not set | ||
354 | # CONFIG_LLC2 is not set | ||
355 | # CONFIG_IPX is not set | ||
356 | # CONFIG_ATALK is not set | ||
357 | # CONFIG_X25 is not set | ||
358 | # CONFIG_LAPB is not set | ||
359 | # CONFIG_NET_DIVERT is not set | ||
360 | # CONFIG_ECONET is not set | ||
361 | # CONFIG_WAN_ROUTER is not set | ||
362 | # CONFIG_NET_HW_FLOWCONTROL is not set | ||
363 | |||
364 | # | ||
365 | # QoS and/or fair queueing | ||
366 | # | ||
367 | # CONFIG_NET_SCHED is not set | ||
368 | |||
369 | # | ||
370 | # Network testing | ||
371 | # | ||
372 | # CONFIG_NET_PKTGEN is not set | ||
373 | CONFIG_NETDEVICES=y | ||
374 | |||
375 | # | ||
376 | # ARCnet devices | ||
377 | # | ||
378 | # CONFIG_ARCNET is not set | ||
379 | # CONFIG_DUMMY is not set | ||
380 | # CONFIG_BONDING is not set | ||
381 | # CONFIG_EQUALIZER is not set | ||
382 | # CONFIG_TUN is not set | ||
383 | |||
384 | # | ||
385 | # Ethernet (10 or 100Mbit) | ||
386 | # | ||
387 | CONFIG_NET_ETHERNET=y | ||
388 | CONFIG_MII=y | ||
389 | # CONFIG_OAKNET is not set | ||
390 | # CONFIG_HAPPYMEAL is not set | ||
391 | # CONFIG_SUNGEM is not set | ||
392 | # CONFIG_NET_VENDOR_3COM is not set | ||
393 | |||
394 | # | ||
395 | # Tulip family network device support | ||
396 | # | ||
397 | CONFIG_NET_TULIP=y | ||
398 | # CONFIG_DE2104X is not set | ||
399 | CONFIG_TULIP=y | ||
400 | # CONFIG_TULIP_MWI is not set | ||
401 | # CONFIG_TULIP_MMIO is not set | ||
402 | # CONFIG_TULIP_NAPI is not set | ||
403 | # CONFIG_DE4X5 is not set | ||
404 | # CONFIG_WINBOND_840 is not set | ||
405 | # CONFIG_DM9102 is not set | ||
406 | # CONFIG_HP100 is not set | ||
407 | CONFIG_NET_PCI=y | ||
408 | # CONFIG_PCNET32 is not set | ||
409 | # CONFIG_AMD8111_ETH is not set | ||
410 | # CONFIG_ADAPTEC_STARFIRE is not set | ||
411 | # CONFIG_B44 is not set | ||
412 | # CONFIG_FORCEDETH is not set | ||
413 | # CONFIG_DGRS is not set | ||
414 | CONFIG_EEPRO100=y | ||
415 | # CONFIG_EEPRO100_PIO is not set | ||
416 | # CONFIG_E100 is not set | ||
417 | # CONFIG_FEALNX is not set | ||
418 | # CONFIG_NATSEMI is not set | ||
419 | # CONFIG_NE2K_PCI is not set | ||
420 | # CONFIG_8139CP is not set | ||
421 | # CONFIG_8139TOO is not set | ||
422 | # CONFIG_SIS900 is not set | ||
423 | # CONFIG_EPIC100 is not set | ||
424 | # CONFIG_SUNDANCE is not set | ||
425 | # CONFIG_TLAN is not set | ||
426 | # CONFIG_VIA_RHINE is not set | ||
427 | |||
428 | # | ||
429 | # Ethernet (1000 Mbit) | ||
430 | # | ||
431 | # CONFIG_ACENIC is not set | ||
432 | # CONFIG_DL2K is not set | ||
433 | # CONFIG_E1000 is not set | ||
434 | # CONFIG_NS83820 is not set | ||
435 | # CONFIG_HAMACHI is not set | ||
436 | # CONFIG_YELLOWFIN is not set | ||
437 | # CONFIG_R8169 is not set | ||
438 | # CONFIG_SIS190 is not set | ||
439 | # CONFIG_SK98LIN is not set | ||
440 | # CONFIG_TIGON3 is not set | ||
441 | |||
442 | # | ||
443 | # Ethernet (10000 Mbit) | ||
444 | # | ||
445 | # CONFIG_IXGB is not set | ||
446 | # CONFIG_FDDI is not set | ||
447 | # CONFIG_HIPPI is not set | ||
448 | # CONFIG_PPP is not set | ||
449 | # CONFIG_SLIP is not set | ||
450 | |||
451 | # | ||
452 | # Wireless LAN (non-hamradio) | ||
453 | # | ||
454 | # CONFIG_NET_RADIO is not set | ||
455 | |||
456 | # | ||
457 | # Token Ring devices | ||
458 | # | ||
459 | # CONFIG_TR is not set | ||
460 | # CONFIG_NET_FC is not set | ||
461 | # CONFIG_RCPCI is not set | ||
462 | # CONFIG_SHAPER is not set | ||
463 | # CONFIG_NETCONSOLE is not set | ||
464 | |||
465 | # | ||
466 | # Wan interfaces | ||
467 | # | ||
468 | # CONFIG_WAN is not set | ||
469 | |||
470 | # | ||
471 | # Amateur Radio support | ||
472 | # | ||
473 | # CONFIG_HAMRADIO is not set | ||
474 | |||
475 | # | ||
476 | # IrDA (infrared) support | ||
477 | # | ||
478 | # CONFIG_IRDA is not set | ||
479 | |||
480 | # | ||
481 | # Bluetooth support | ||
482 | # | ||
483 | # CONFIG_BT is not set | ||
484 | # CONFIG_NETPOLL is not set | ||
485 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
486 | |||
487 | # | ||
488 | # ISDN subsystem | ||
489 | # | ||
490 | # CONFIG_ISDN is not set | ||
491 | |||
492 | # | ||
493 | # Telephony Support | ||
494 | # | ||
495 | # CONFIG_PHONE is not set | ||
496 | |||
497 | # | ||
498 | # Input device support | ||
499 | # | ||
500 | # CONFIG_INPUT is not set | ||
501 | |||
502 | # | ||
503 | # Userland interfaces | ||
504 | # | ||
505 | |||
506 | # | ||
507 | # Input I/O drivers | ||
508 | # | ||
509 | # CONFIG_GAMEPORT is not set | ||
510 | CONFIG_SOUND_GAMEPORT=y | ||
511 | # CONFIG_SERIO is not set | ||
512 | # CONFIG_SERIO_I8042 is not set | ||
513 | |||
514 | # | ||
515 | # Input Device Drivers | ||
516 | # | ||
517 | |||
518 | # | ||
519 | # Character devices | ||
520 | # | ||
521 | # CONFIG_VT is not set | ||
522 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
523 | |||
524 | # | ||
525 | # Serial drivers | ||
526 | # | ||
527 | CONFIG_SERIAL_8250=y | ||
528 | CONFIG_SERIAL_8250_CONSOLE=y | ||
529 | CONFIG_SERIAL_8250_NR_UARTS=2 | ||
530 | # CONFIG_SERIAL_8250_EXTENDED is not set | ||
531 | |||
532 | # | ||
533 | # Non-8250 serial port support | ||
534 | # | ||
535 | CONFIG_SERIAL_CORE=y | ||
536 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
537 | CONFIG_UNIX98_PTYS=y | ||
538 | CONFIG_LEGACY_PTYS=y | ||
539 | CONFIG_LEGACY_PTY_COUNT=256 | ||
540 | # CONFIG_QIC02_TAPE is not set | ||
541 | |||
542 | # | ||
543 | # IPMI | ||
544 | # | ||
545 | # CONFIG_IPMI_HANDLER is not set | ||
546 | |||
547 | # | ||
548 | # Watchdog Cards | ||
549 | # | ||
550 | # CONFIG_WATCHDOG is not set | ||
551 | # CONFIG_NVRAM is not set | ||
552 | CONFIG_GEN_RTC=y | ||
553 | # CONFIG_GEN_RTC_X is not set | ||
554 | # CONFIG_DTLK is not set | ||
555 | # CONFIG_R3964 is not set | ||
556 | # CONFIG_APPLICOM is not set | ||
557 | |||
558 | # | ||
559 | # Ftape, the floppy tape device driver | ||
560 | # | ||
561 | # CONFIG_FTAPE is not set | ||
562 | # CONFIG_AGP is not set | ||
563 | # CONFIG_DRM is not set | ||
564 | # CONFIG_RAW_DRIVER is not set | ||
565 | |||
566 | # | ||
567 | # I2C support | ||
568 | # | ||
569 | # CONFIG_I2C is not set | ||
570 | |||
571 | # | ||
572 | # Misc devices | ||
573 | # | ||
574 | |||
575 | # | ||
576 | # Multimedia devices | ||
577 | # | ||
578 | # CONFIG_VIDEO_DEV is not set | ||
579 | |||
580 | # | ||
581 | # Digital Video Broadcasting Devices | ||
582 | # | ||
583 | # CONFIG_DVB is not set | ||
584 | |||
585 | # | ||
586 | # Graphics support | ||
587 | # | ||
588 | # CONFIG_FB is not set | ||
589 | |||
590 | # | ||
591 | # Sound | ||
592 | # | ||
593 | # CONFIG_SOUND is not set | ||
594 | |||
595 | # | ||
596 | # USB support | ||
597 | # | ||
598 | # CONFIG_USB is not set | ||
599 | |||
600 | # | ||
601 | # USB Gadget Support | ||
602 | # | ||
603 | # CONFIG_USB_GADGET is not set | ||
604 | |||
605 | # | ||
606 | # File systems | ||
607 | # | ||
608 | CONFIG_EXT2_FS=y | ||
609 | # CONFIG_EXT2_FS_XATTR is not set | ||
610 | CONFIG_EXT3_FS=y | ||
611 | CONFIG_EXT3_FS_XATTR=y | ||
612 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
613 | # CONFIG_EXT3_FS_SECURITY is not set | ||
614 | CONFIG_JBD=y | ||
615 | # CONFIG_JBD_DEBUG is not set | ||
616 | CONFIG_FS_MBCACHE=y | ||
617 | # CONFIG_REISERFS_FS is not set | ||
618 | # CONFIG_JFS_FS is not set | ||
619 | # CONFIG_XFS_FS is not set | ||
620 | # CONFIG_MINIX_FS is not set | ||
621 | # CONFIG_ROMFS_FS is not set | ||
622 | # CONFIG_QUOTA is not set | ||
623 | # CONFIG_AUTOFS_FS is not set | ||
624 | # CONFIG_AUTOFS4_FS is not set | ||
625 | |||
626 | # | ||
627 | # CD-ROM/DVD Filesystems | ||
628 | # | ||
629 | # CONFIG_ISO9660_FS is not set | ||
630 | # CONFIG_UDF_FS is not set | ||
631 | |||
632 | # | ||
633 | # DOS/FAT/NT Filesystems | ||
634 | # | ||
635 | # CONFIG_FAT_FS is not set | ||
636 | # CONFIG_NTFS_FS is not set | ||
637 | |||
638 | # | ||
639 | # Pseudo filesystems | ||
640 | # | ||
641 | CONFIG_PROC_FS=y | ||
642 | CONFIG_PROC_KCORE=y | ||
643 | # CONFIG_DEVFS_FS is not set | ||
644 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
645 | CONFIG_TMPFS=y | ||
646 | # CONFIG_HUGETLB_PAGE is not set | ||
647 | CONFIG_RAMFS=y | ||
648 | |||
649 | # | ||
650 | # Miscellaneous filesystems | ||
651 | # | ||
652 | # CONFIG_ADFS_FS is not set | ||
653 | # CONFIG_AFFS_FS is not set | ||
654 | # CONFIG_HFS_FS is not set | ||
655 | # CONFIG_HFSPLUS_FS is not set | ||
656 | # CONFIG_BEFS_FS is not set | ||
657 | # CONFIG_BFS_FS is not set | ||
658 | # CONFIG_EFS_FS is not set | ||
659 | # CONFIG_CRAMFS is not set | ||
660 | # CONFIG_VXFS_FS is not set | ||
661 | # CONFIG_HPFS_FS is not set | ||
662 | # CONFIG_QNX4FS_FS is not set | ||
663 | # CONFIG_SYSV_FS is not set | ||
664 | # CONFIG_UFS_FS is not set | ||
665 | |||
666 | # | ||
667 | # Network File Systems | ||
668 | # | ||
669 | CONFIG_NFS_FS=y | ||
670 | # CONFIG_NFS_V3 is not set | ||
671 | # CONFIG_NFS_V4 is not set | ||
672 | # CONFIG_NFS_DIRECTIO is not set | ||
673 | # CONFIG_NFSD is not set | ||
674 | CONFIG_ROOT_NFS=y | ||
675 | CONFIG_LOCKD=y | ||
676 | # CONFIG_EXPORTFS is not set | ||
677 | CONFIG_SUNRPC=y | ||
678 | # CONFIG_RPCSEC_GSS_KRB5 is not set | ||
679 | # CONFIG_SMB_FS is not set | ||
680 | # CONFIG_CIFS is not set | ||
681 | # CONFIG_NCP_FS is not set | ||
682 | # CONFIG_CODA_FS is not set | ||
683 | # CONFIG_INTERMEZZO_FS is not set | ||
684 | # CONFIG_AFS_FS is not set | ||
685 | |||
686 | # | ||
687 | # Partition Types | ||
688 | # | ||
689 | # CONFIG_PARTITION_ADVANCED is not set | ||
690 | CONFIG_MSDOS_PARTITION=y | ||
691 | |||
692 | # | ||
693 | # Native Language Support | ||
694 | # | ||
695 | # CONFIG_NLS is not set | ||
696 | |||
697 | # | ||
698 | # Library routines | ||
699 | # | ||
700 | CONFIG_CRC32=y | ||
701 | |||
702 | # | ||
703 | # Kernel hacking | ||
704 | # | ||
705 | # CONFIG_DEBUG_KERNEL is not set | ||
706 | # CONFIG_SERIAL_TEXT_DEBUG is not set | ||
707 | |||
708 | # | ||
709 | # Security options | ||
710 | # | ||
711 | # CONFIG_SECURITY is not set | ||
712 | |||
713 | # | ||
714 | # Cryptographic options | ||
715 | # | ||
716 | # CONFIG_CRYPTO is not set | ||
diff --git a/arch/ppc/platforms/Makefile b/arch/ppc/platforms/Makefile index c92e91748531..ae5a18a719e8 100644 --- a/arch/ppc/platforms/Makefile +++ b/arch/ppc/platforms/Makefile | |||
@@ -32,7 +32,6 @@ obj-$(CONFIG_KATANA) += katana.o | |||
32 | obj-$(CONFIG_HDPU) += hdpu.o | 32 | obj-$(CONFIG_HDPU) += hdpu.o |
33 | obj-$(CONFIG_MVME5100) += mvme5100.o | 33 | obj-$(CONFIG_MVME5100) += mvme5100.o |
34 | obj-$(CONFIG_PAL4) += pal4_setup.o pal4_pci.o | 34 | obj-$(CONFIG_PAL4) += pal4_setup.o pal4_pci.o |
35 | obj-$(CONFIG_PCORE) += pcore.o | ||
36 | obj-$(CONFIG_POWERPMC250) += powerpmc250.o | 35 | obj-$(CONFIG_POWERPMC250) += powerpmc250.o |
37 | obj-$(CONFIG_PPLUS) += pplus.o | 36 | obj-$(CONFIG_PPLUS) += pplus.o |
38 | obj-$(CONFIG_PRPMC750) += prpmc750.o | 37 | obj-$(CONFIG_PRPMC750) += prpmc750.o |
diff --git a/arch/ppc/platforms/pcore.c b/arch/ppc/platforms/pcore.c deleted file mode 100644 index d7191630a650..000000000000 --- a/arch/ppc/platforms/pcore.c +++ /dev/null | |||
@@ -1,352 +0,0 @@ | |||
1 | /* | ||
2 | * arch/ppc/platforms/pcore_setup.c | ||
3 | * | ||
4 | * Setup routines for Force PCORE boards | ||
5 | * | ||
6 | * Author: Matt Porter <mporter@mvista.com> | ||
7 | * | ||
8 | * 2001 (c) MontaVista, Software, Inc. This file is licensed under | ||
9 | * the terms of the GNU General Public License version 2. This program | ||
10 | * is licensed "as is" without any warranty of any kind, whether express | ||
11 | * or implied. | ||
12 | */ | ||
13 | |||
14 | #include <linux/config.h> | ||
15 | #include <linux/stddef.h> | ||
16 | #include <linux/kernel.h> | ||
17 | #include <linux/init.h> | ||
18 | #include <linux/errno.h> | ||
19 | #include <linux/reboot.h> | ||
20 | #include <linux/pci.h> | ||
21 | #include <linux/kdev_t.h> | ||
22 | #include <linux/types.h> | ||
23 | #include <linux/major.h> | ||
24 | #include <linux/initrd.h> | ||
25 | #include <linux/console.h> | ||
26 | #include <linux/irq.h> | ||
27 | #include <linux/seq_file.h> | ||
28 | #include <linux/root_dev.h> | ||
29 | |||
30 | #include <asm/io.h> | ||
31 | #include <asm/machdep.h> | ||
32 | #include <asm/time.h> | ||
33 | #include <asm/i8259.h> | ||
34 | #include <asm/mpc10x.h> | ||
35 | #include <asm/todc.h> | ||
36 | #include <asm/bootinfo.h> | ||
37 | #include <asm/kgdb.h> | ||
38 | |||
39 | #include "pcore.h" | ||
40 | |||
41 | extern unsigned long loops_per_jiffy; | ||
42 | |||
43 | static int board_type; | ||
44 | |||
45 | static inline int __init | ||
46 | pcore_6750_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin) | ||
47 | { | ||
48 | static char pci_irq_table[][4] = | ||
49 | /* | ||
50 | * PCI IDSEL/INTPIN->INTLINE | ||
51 | * A B C D | ||
52 | */ | ||
53 | { | ||
54 | {9, 10, 11, 12}, /* IDSEL 24 - DEC 21554 */ | ||
55 | {10, 0, 0, 0}, /* IDSEL 25 - DEC 21143 */ | ||
56 | {11, 12, 9, 10}, /* IDSEL 26 - PMC I */ | ||
57 | {12, 9, 10, 11}, /* IDSEL 27 - PMC II */ | ||
58 | {0, 0, 0, 0}, /* IDSEL 28 - unused */ | ||
59 | {0, 0, 9, 0}, /* IDSEL 29 - unused */ | ||
60 | {0, 0, 0, 0}, /* IDSEL 30 - Winbond */ | ||
61 | }; | ||
62 | const long min_idsel = 24, max_idsel = 30, irqs_per_slot = 4; | ||
63 | return PCI_IRQ_TABLE_LOOKUP; | ||
64 | }; | ||
65 | |||
66 | static inline int __init | ||
67 | pcore_680_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin) | ||
68 | { | ||
69 | static char pci_irq_table[][4] = | ||
70 | /* | ||
71 | * PCI IDSEL/INTPIN->INTLINE | ||
72 | * A B C D | ||
73 | */ | ||
74 | { | ||
75 | {9, 10, 11, 12}, /* IDSEL 24 - Sentinel */ | ||
76 | {10, 0, 0, 0}, /* IDSEL 25 - i82559 #1 */ | ||
77 | {11, 12, 9, 10}, /* IDSEL 26 - PMC I */ | ||
78 | {12, 9, 10, 11}, /* IDSEL 27 - PMC II */ | ||
79 | {9, 0, 0, 0}, /* IDSEL 28 - i82559 #2 */ | ||
80 | {0, 0, 0, 0}, /* IDSEL 29 - unused */ | ||
81 | {0, 0, 0, 0}, /* IDSEL 30 - Winbond */ | ||
82 | }; | ||
83 | const long min_idsel = 24, max_idsel = 30, irqs_per_slot = 4; | ||
84 | return PCI_IRQ_TABLE_LOOKUP; | ||
85 | }; | ||
86 | |||
87 | void __init | ||
88 | pcore_pcibios_fixup(void) | ||
89 | { | ||
90 | struct pci_dev *dev; | ||
91 | |||
92 | if ((dev = pci_get_device(PCI_VENDOR_ID_WINBOND, | ||
93 | PCI_DEVICE_ID_WINBOND_83C553, | ||
94 | 0))) | ||
95 | { | ||
96 | /* Reroute interrupts both IDE channels to 15 */ | ||
97 | pci_write_config_byte(dev, | ||
98 | PCORE_WINBOND_IDE_INT, | ||
99 | 0xff); | ||
100 | |||
101 | /* Route INTA-D to IRQ9-12, respectively */ | ||
102 | pci_write_config_word(dev, | ||
103 | PCORE_WINBOND_PCI_INT, | ||
104 | 0x9abc); | ||
105 | |||
106 | /* | ||
107 | * Set up 8259 edge/level triggering | ||
108 | */ | ||
109 | outb(0x00, PCORE_WINBOND_PRI_EDG_LVL); | ||
110 | outb(0x1e, PCORE_WINBOND_SEC_EDG_LVL); | ||
111 | pci_dev_put(dev); | ||
112 | } | ||
113 | } | ||
114 | |||
115 | int __init | ||
116 | pcore_find_bridges(void) | ||
117 | { | ||
118 | struct pci_controller* hose; | ||
119 | int host_bridge, board_type; | ||
120 | |||
121 | hose = pcibios_alloc_controller(); | ||
122 | if (!hose) | ||
123 | return 0; | ||
124 | |||
125 | mpc10x_bridge_init(hose, | ||
126 | MPC10X_MEM_MAP_B, | ||
127 | MPC10X_MEM_MAP_B, | ||
128 | MPC10X_MAPB_EUMB_BASE); | ||
129 | |||
130 | /* Determine board type */ | ||
131 | early_read_config_dword(hose, | ||
132 | 0, | ||
133 | PCI_DEVFN(0,0), | ||
134 | PCI_VENDOR_ID, | ||
135 | &host_bridge); | ||
136 | if (host_bridge == MPC10X_BRIDGE_106) | ||
137 | board_type = PCORE_TYPE_6750; | ||
138 | else /* MPC10X_BRIDGE_107 */ | ||
139 | board_type = PCORE_TYPE_680; | ||
140 | |||
141 | hose->last_busno = pciauto_bus_scan(hose, hose->first_busno); | ||
142 | |||
143 | ppc_md.pcibios_fixup = pcore_pcibios_fixup; | ||
144 | ppc_md.pci_swizzle = common_swizzle; | ||
145 | |||
146 | if (board_type == PCORE_TYPE_6750) | ||
147 | ppc_md.pci_map_irq = pcore_6750_map_irq; | ||
148 | else /* PCORE_TYPE_680 */ | ||
149 | ppc_md.pci_map_irq = pcore_680_map_irq; | ||
150 | |||
151 | return board_type; | ||
152 | } | ||
153 | |||
154 | /* Dummy variable to satisfy mpc10x_common.o */ | ||
155 | void *OpenPIC_Addr; | ||
156 | |||
157 | static int | ||
158 | pcore_show_cpuinfo(struct seq_file *m) | ||
159 | { | ||
160 | seq_printf(m, "vendor\t\t: Force Computers\n"); | ||
161 | |||
162 | if (board_type == PCORE_TYPE_6750) | ||
163 | seq_printf(m, "machine\t\t: PowerCore 6750\n"); | ||
164 | else /* PCORE_TYPE_680 */ | ||
165 | seq_printf(m, "machine\t\t: PowerCore 680\n"); | ||
166 | |||
167 | seq_printf(m, "L2\t\t: " ); | ||
168 | if (board_type == PCORE_TYPE_6750) | ||
169 | switch (readb(PCORE_DCCR_REG) & PCORE_DCCR_L2_MASK) | ||
170 | { | ||
171 | case PCORE_DCCR_L2_0KB: | ||
172 | seq_printf(m, "nocache"); | ||
173 | break; | ||
174 | case PCORE_DCCR_L2_256KB: | ||
175 | seq_printf(m, "256KB"); | ||
176 | break; | ||
177 | case PCORE_DCCR_L2_1MB: | ||
178 | seq_printf(m, "1MB"); | ||
179 | break; | ||
180 | case PCORE_DCCR_L2_512KB: | ||
181 | seq_printf(m, "512KB"); | ||
182 | break; | ||
183 | default: | ||
184 | seq_printf(m, "error"); | ||
185 | break; | ||
186 | } | ||
187 | else /* PCORE_TYPE_680 */ | ||
188 | switch (readb(PCORE_DCCR_REG) & PCORE_DCCR_L2_MASK) | ||
189 | { | ||
190 | case PCORE_DCCR_L2_2MB: | ||
191 | seq_printf(m, "2MB"); | ||
192 | break; | ||
193 | case PCORE_DCCR_L2_256KB: | ||
194 | seq_printf(m, "reserved"); | ||
195 | break; | ||
196 | case PCORE_DCCR_L2_1MB: | ||
197 | seq_printf(m, "1MB"); | ||
198 | break; | ||
199 | case PCORE_DCCR_L2_512KB: | ||
200 | seq_printf(m, "512KB"); | ||
201 | break; | ||
202 | default: | ||
203 | seq_printf(m, "error"); | ||
204 | break; | ||
205 | } | ||
206 | |||
207 | seq_printf(m, "\n"); | ||
208 | |||
209 | return 0; | ||
210 | } | ||
211 | |||
212 | static void __init | ||
213 | pcore_setup_arch(void) | ||
214 | { | ||
215 | /* init to some ~sane value until calibrate_delay() runs */ | ||
216 | loops_per_jiffy = 50000000/HZ; | ||
217 | |||
218 | /* Lookup PCI host bridges */ | ||
219 | board_type = pcore_find_bridges(); | ||
220 | |||
221 | #ifdef CONFIG_BLK_DEV_INITRD | ||
222 | if (initrd_start) | ||
223 | ROOT_DEV = Root_RAM0; | ||
224 | else | ||
225 | #endif | ||
226 | #ifdef CONFIG_ROOT_NFS | ||
227 | ROOT_DEV = Root_NFS; | ||
228 | #else | ||
229 | ROOT_DEV = Root_SDA2; | ||
230 | #endif | ||
231 | |||
232 | printk(KERN_INFO "Force PowerCore "); | ||
233 | if (board_type == PCORE_TYPE_6750) | ||
234 | printk("6750\n"); | ||
235 | else | ||
236 | printk("680\n"); | ||
237 | printk(KERN_INFO "Port by MontaVista Software, Inc. (source@mvista.com)\n"); | ||
238 | _set_L2CR(L2CR_L2E | _get_L2CR()); | ||
239 | |||
240 | } | ||
241 | |||
242 | static void | ||
243 | pcore_restart(char *cmd) | ||
244 | { | ||
245 | local_irq_disable(); | ||
246 | /* Hard reset */ | ||
247 | writeb(0x11, 0xfe000332); | ||
248 | while(1); | ||
249 | } | ||
250 | |||
251 | static void | ||
252 | pcore_halt(void) | ||
253 | { | ||
254 | local_irq_disable(); | ||
255 | /* Turn off user LEDs */ | ||
256 | writeb(0x00, 0xfe000300); | ||
257 | while (1); | ||
258 | } | ||
259 | |||
260 | static void | ||
261 | pcore_power_off(void) | ||
262 | { | ||
263 | pcore_halt(); | ||
264 | } | ||
265 | |||
266 | |||
267 | static void __init | ||
268 | pcore_init_IRQ(void) | ||
269 | { | ||
270 | int i; | ||
271 | |||
272 | for ( i = 0 ; i < 16 ; i++ ) | ||
273 | irq_desc[i].handler = &i8259_pic; | ||
274 | |||
275 | i8259_init(0); | ||
276 | } | ||
277 | |||
278 | /* | ||
279 | * Set BAT 3 to map 0xf0000000 to end of physical memory space. | ||
280 | */ | ||
281 | static __inline__ void | ||
282 | pcore_set_bat(void) | ||
283 | { | ||
284 | mb(); | ||
285 | mtspr(SPRN_DBAT3U, 0xf0001ffe); | ||
286 | mtspr(SPRN_DBAT3L, 0xfe80002a); | ||
287 | mb(); | ||
288 | |||
289 | } | ||
290 | |||
291 | static unsigned long __init | ||
292 | pcore_find_end_of_memory(void) | ||
293 | { | ||
294 | |||
295 | return mpc10x_get_mem_size(MPC10X_MEM_MAP_B); | ||
296 | } | ||
297 | |||
298 | static void __init | ||
299 | pcore_map_io(void) | ||
300 | { | ||
301 | io_block_mapping(0xfe000000, 0xfe000000, 0x02000000, _PAGE_IO); | ||
302 | } | ||
303 | |||
304 | TODC_ALLOC(); | ||
305 | |||
306 | void __init | ||
307 | platform_init(unsigned long r3, unsigned long r4, unsigned long r5, | ||
308 | unsigned long r6, unsigned long r7) | ||
309 | { | ||
310 | parse_bootinfo(find_bootinfo()); | ||
311 | |||
312 | /* Cover I/O space with a BAT */ | ||
313 | /* yuck, better hope your ram size is a power of 2 -- paulus */ | ||
314 | pcore_set_bat(); | ||
315 | |||
316 | isa_io_base = MPC10X_MAPB_ISA_IO_BASE; | ||
317 | isa_mem_base = MPC10X_MAPB_ISA_MEM_BASE; | ||
318 | pci_dram_offset = MPC10X_MAPB_DRAM_OFFSET; | ||
319 | |||
320 | ppc_md.setup_arch = pcore_setup_arch; | ||
321 | ppc_md.show_cpuinfo = pcore_show_cpuinfo; | ||
322 | ppc_md.init_IRQ = pcore_init_IRQ; | ||
323 | ppc_md.get_irq = i8259_irq; | ||
324 | |||
325 | ppc_md.find_end_of_memory = pcore_find_end_of_memory; | ||
326 | ppc_md.setup_io_mappings = pcore_map_io; | ||
327 | |||
328 | ppc_md.restart = pcore_restart; | ||
329 | ppc_md.power_off = pcore_power_off; | ||
330 | ppc_md.halt = pcore_halt; | ||
331 | |||
332 | TODC_INIT(TODC_TYPE_MK48T59, | ||
333 | PCORE_NVRAM_AS0, | ||
334 | PCORE_NVRAM_AS1, | ||
335 | PCORE_NVRAM_DATA, | ||
336 | 8); | ||
337 | |||
338 | ppc_md.time_init = todc_time_init; | ||
339 | ppc_md.get_rtc_time = todc_get_rtc_time; | ||
340 | ppc_md.set_rtc_time = todc_set_rtc_time; | ||
341 | ppc_md.calibrate_decr = todc_calibrate_decr; | ||
342 | |||
343 | ppc_md.nvram_read_val = todc_m48txx_read_val; | ||
344 | ppc_md.nvram_write_val = todc_m48txx_write_val; | ||
345 | |||
346 | #ifdef CONFIG_SERIAL_TEXT_DEBUG | ||
347 | ppc_md.progress = gen550_progress; | ||
348 | #endif | ||
349 | #ifdef CONFIG_KGDB | ||
350 | ppc_md.kgdb_map_scc = gen550_kgdb_map_scc; | ||
351 | #endif | ||
352 | } | ||
diff --git a/arch/ppc/platforms/pcore.h b/arch/ppc/platforms/pcore.h deleted file mode 100644 index c6a26e764926..000000000000 --- a/arch/ppc/platforms/pcore.h +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * arch/ppc/platforms/pcore.h | ||
3 | * | ||
4 | * Definitions for Force PowerCore board support | ||
5 | * | ||
6 | * Author: Matt Porter <mporter@mvista.com> | ||
7 | * | ||
8 | * 2001 (c) MontaVista, Software, Inc. This file is licensed under | ||
9 | * the terms of the GNU General Public License version 2. This program | ||
10 | * is licensed "as is" without any warranty of any kind, whether express | ||
11 | * or implied. | ||
12 | */ | ||
13 | |||
14 | #ifndef __PPC_PLATFORMS_PCORE_H | ||
15 | #define __PPC_PLATFORMS_PCORE_H | ||
16 | |||
17 | #include <asm/mpc10x.h> | ||
18 | |||
19 | #define PCORE_TYPE_6750 1 | ||
20 | #define PCORE_TYPE_680 2 | ||
21 | |||
22 | #define PCORE_NVRAM_AS0 0x73 | ||
23 | #define PCORE_NVRAM_AS1 0x75 | ||
24 | #define PCORE_NVRAM_DATA 0x77 | ||
25 | |||
26 | #define PCORE_DCCR_REG (MPC10X_MAPB_ISA_IO_BASE + 0x308) | ||
27 | #define PCORE_DCCR_L2_MASK 0xc0 | ||
28 | #define PCORE_DCCR_L2_0KB 0x00 | ||
29 | #define PCORE_DCCR_L2_256KB 0x40 | ||
30 | #define PCORE_DCCR_L2_512KB 0xc0 | ||
31 | #define PCORE_DCCR_L2_1MB 0x80 | ||
32 | #define PCORE_DCCR_L2_2MB 0x00 | ||
33 | |||
34 | #define PCORE_WINBOND_IDE_INT 0x43 | ||
35 | #define PCORE_WINBOND_PCI_INT 0x44 | ||
36 | #define PCORE_WINBOND_PRI_EDG_LVL 0x4d0 | ||
37 | #define PCORE_WINBOND_SEC_EDG_LVL 0x4d1 | ||
38 | |||
39 | #endif /* __PPC_PLATFORMS_PCORE_H */ | ||
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index daa7ef9ebc36..400a5d38a1b2 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile | |||
@@ -61,7 +61,6 @@ obj-$(CONFIG_MVME5100) += open_pic.o todc_time.o indirect_pci.o \ | |||
61 | obj-$(CONFIG_MVME5100_IPMC761_PRESENT) += i8259.o | 61 | obj-$(CONFIG_MVME5100_IPMC761_PRESENT) += i8259.o |
62 | obj-$(CONFIG_OCOTEA) += indirect_pci.o pci_auto.o todc_time.o | 62 | obj-$(CONFIG_OCOTEA) += indirect_pci.o pci_auto.o todc_time.o |
63 | obj-$(CONFIG_PAL4) += cpc700_pic.o | 63 | obj-$(CONFIG_PAL4) += cpc700_pic.o |
64 | obj-$(CONFIG_PCORE) += todc_time.o i8259.o pci_auto.o | ||
65 | obj-$(CONFIG_POWERPMC250) += pci_auto.o | 64 | obj-$(CONFIG_POWERPMC250) += pci_auto.o |
66 | obj-$(CONFIG_PPLUS) += hawk_common.o open_pic.o i8259.o \ | 65 | obj-$(CONFIG_PPLUS) += hawk_common.o open_pic.o i8259.o \ |
67 | indirect_pci.o todc_time.o pci_auto.o | 66 | indirect_pci.o todc_time.o pci_auto.o |