diff options
author | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:20 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:20 -0400 |
commit | 36a23fc8aa0c72ecafe7aaee0a823b03b301e1df (patch) | |
tree | 364aa8cf248b477d822d0344d7bba3c80f86cf9c /arch/ppc | |
parent | 23386fe572028ca0f9249fb3c71ed31b54cf1665 (diff) | |
parent | fc215fe7e6f0420afee0e0987fcc311929ee662f (diff) |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/ppc')
-rw-r--r-- | arch/ppc/8260_io/fcc_enet.c | 19 | ||||
-rw-r--r-- | arch/ppc/8xx_io/enet.c | 23 | ||||
-rw-r--r-- | arch/ppc/Kconfig | 82 | ||||
-rw-r--r-- | arch/ppc/configs/ads8272_defconfig | 930 | ||||
-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 | 4 | ||||
-rw-r--r-- | arch/ppc/platforms/fads.h | 25 | ||||
-rw-r--r-- | arch/ppc/platforms/mpc8272ads_setup.c | 367 | ||||
-rw-r--r-- | arch/ppc/platforms/mpc885ads.h | 93 | ||||
-rw-r--r-- | arch/ppc/platforms/mpc885ads_setup.c | 476 | ||||
-rw-r--r-- | arch/ppc/platforms/pq2ads.c | 53 | ||||
-rw-r--r-- | arch/ppc/platforms/pq2ads.h | 94 | ||||
-rw-r--r-- | arch/ppc/platforms/pq2ads_pd.h | 32 | ||||
-rw-r--r-- | arch/ppc/syslib/m8260_setup.c | 6 | ||||
-rw-r--r-- | arch/ppc/syslib/m82xx_pci.c | 38 | ||||
-rw-r--r-- | arch/ppc/syslib/m8xx_setup.c | 10 |
17 files changed, 2 insertions, 3505 deletions
diff --git a/arch/ppc/8260_io/fcc_enet.c b/arch/ppc/8260_io/fcc_enet.c index bcc3aa9d04f..d38b57e24ce 100644 --- a/arch/ppc/8260_io/fcc_enet.c +++ b/arch/ppc/8260_io/fcc_enet.c | |||
@@ -165,9 +165,6 @@ static int fcc_enet_set_mac_address(struct net_device *dev, void *addr); | |||
165 | #ifdef CONFIG_SBC82xx | 165 | #ifdef CONFIG_SBC82xx |
166 | #define F1_RXCLK 9 | 166 | #define F1_RXCLK 9 |
167 | #define F1_TXCLK 10 | 167 | #define F1_TXCLK 10 |
168 | #elif defined(CONFIG_ADS8272) | ||
169 | #define F1_RXCLK 11 | ||
170 | #define F1_TXCLK 10 | ||
171 | #else | 168 | #else |
172 | #define F1_RXCLK 12 | 169 | #define F1_RXCLK 12 |
173 | #define F1_TXCLK 11 | 170 | #define F1_TXCLK 11 |
@@ -175,13 +172,8 @@ static int fcc_enet_set_mac_address(struct net_device *dev, void *addr); | |||
175 | 172 | ||
176 | /* FCC2 Clock Source Configuration. There are board specific. | 173 | /* FCC2 Clock Source Configuration. There are board specific. |
177 | Can only choose from CLK13-16 */ | 174 | Can only choose from CLK13-16 */ |
178 | #ifdef CONFIG_ADS8272 | ||
179 | #define F2_RXCLK 15 | ||
180 | #define F2_TXCLK 16 | ||
181 | #else | ||
182 | #define F2_RXCLK 13 | 175 | #define F2_RXCLK 13 |
183 | #define F2_TXCLK 14 | 176 | #define F2_TXCLK 14 |
184 | #endif | ||
185 | 177 | ||
186 | /* FCC3 Clock Source Configuration. There are board specific. | 178 | /* FCC3 Clock Source Configuration. There are board specific. |
187 | Can only choose from CLK13-16 */ | 179 | Can only choose from CLK13-16 */ |
@@ -289,10 +281,7 @@ static int fcc_enet_set_mac_address(struct net_device *dev, void *addr); | |||
289 | /* TQM8260 has MDIO and MDCK on PC30 and PC31 respectively */ | 281 | /* TQM8260 has MDIO and MDCK on PC30 and PC31 respectively */ |
290 | #define PC_MDIO ((uint)0x00000002) | 282 | #define PC_MDIO ((uint)0x00000002) |
291 | #define PC_MDCK ((uint)0x00000001) | 283 | #define PC_MDCK ((uint)0x00000001) |
292 | #elif defined(CONFIG_ADS8272) | 284 | #elif defined(CONFIG_EST8260) || defined(CONFIG_ADS8260) |
293 | #define PC_MDIO ((uint)0x00002000) | ||
294 | #define PC_MDCK ((uint)0x00001000) | ||
295 | #elif defined(CONFIG_EST8260) || defined(CONFIG_ADS8260) || defined(CONFIG_PQ2FADS) | ||
296 | #define PC_MDIO ((uint)0x00400000) | 285 | #define PC_MDIO ((uint)0x00400000) |
297 | #define PC_MDCK ((uint)0x00200000) | 286 | #define PC_MDCK ((uint)0x00200000) |
298 | #else | 287 | #else |
@@ -2118,11 +2107,6 @@ init_fcc_startup(fcc_info_t *fip, struct net_device *dev) | |||
2118 | printk("Can't get FCC IRQ %d\n", fip->fc_interrupt); | 2107 | printk("Can't get FCC IRQ %d\n", fip->fc_interrupt); |
2119 | 2108 | ||
2120 | #ifdef PHY_INTERRUPT | 2109 | #ifdef PHY_INTERRUPT |
2121 | #ifdef CONFIG_ADS8272 | ||
2122 | if (request_irq(PHY_INTERRUPT, mii_link_interrupt, IRQF_SHARED, | ||
2123 | "mii", dev) < 0) | ||
2124 | printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT); | ||
2125 | #else | ||
2126 | /* Make IRQn edge triggered. This does not work if PHY_INTERRUPT is | 2110 | /* Make IRQn edge triggered. This does not work if PHY_INTERRUPT is |
2127 | * on Port C. | 2111 | * on Port C. |
2128 | */ | 2112 | */ |
@@ -2132,7 +2116,6 @@ init_fcc_startup(fcc_info_t *fip, struct net_device *dev) | |||
2132 | if (request_irq(PHY_INTERRUPT, mii_link_interrupt, 0, | 2116 | if (request_irq(PHY_INTERRUPT, mii_link_interrupt, 0, |
2133 | "mii", dev) < 0) | 2117 | "mii", dev) < 0) |
2134 | printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT); | 2118 | printk(KERN_CRIT "Can't get MII IRQ %d\n", PHY_INTERRUPT); |
2135 | #endif | ||
2136 | #endif /* PHY_INTERRUPT */ | 2119 | #endif /* PHY_INTERRUPT */ |
2137 | 2120 | ||
2138 | /* Set GFMR to enable Ethernet operating mode. | 2121 | /* Set GFMR to enable Ethernet operating mode. |
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 abc877faf12..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 |
@@ -666,9 +603,6 @@ config TQM8260 | |||
666 | End of Life: not yet :-) | 603 | End of Life: not yet :-) |
667 | URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf> | 604 | URL: <http://www.denx.de/PDF/TQM82xx_SPEC_Rev005.pdf> |
668 | 605 | ||
669 | config ADS8272 | ||
670 | bool "ADS8272" | ||
671 | |||
672 | config PQ2FADS | 606 | config PQ2FADS |
673 | bool "Freescale-PQ2FADS" | 607 | bool "Freescale-PQ2FADS" |
674 | help | 608 | help |
@@ -698,11 +632,6 @@ config EV64360 | |||
698 | platform. | 632 | platform. |
699 | endchoice | 633 | endchoice |
700 | 634 | ||
701 | config PQ2ADS | ||
702 | bool | ||
703 | depends on ADS8272 | ||
704 | default y | ||
705 | |||
706 | config TQM8xxL | 635 | config TQM8xxL |
707 | bool | 636 | bool |
708 | depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L) | 637 | depends on 8xx && (TQM823L || TQM850L || FPS850L || TQM855L || TQM860L) |
@@ -725,15 +654,6 @@ config 8260 | |||
725 | this option means that you wish to build a kernel for a machine with | 654 | this option means that you wish to build a kernel for a machine with |
726 | an 8260 class CPU. | 655 | an 8260 class CPU. |
727 | 656 | ||
728 | config 8272 | ||
729 | bool | ||
730 | depends on 6xx | ||
731 | default y if ADS8272 | ||
732 | select 8260 | ||
733 | help | ||
734 | The MPC8272 CPM has a different internal dpram setup than other CPM2 | ||
735 | devices | ||
736 | |||
737 | config CPM1 | 657 | config CPM1 |
738 | bool | 658 | bool |
739 | depends on 8xx | 659 | depends on 8xx |
@@ -1069,7 +989,7 @@ config PCI_8260 | |||
1069 | 989 | ||
1070 | config 8260_PCI9 | 990 | config 8260_PCI9 |
1071 | bool "Enable workaround for MPC826x erratum PCI 9" | 991 | bool "Enable workaround for MPC826x erratum PCI 9" |
1072 | depends on PCI_8260 && !ADS8272 | 992 | depends on PCI_8260 |
1073 | default y | 993 | default y |
1074 | 994 | ||
1075 | choice | 995 | choice |
diff --git a/arch/ppc/configs/ads8272_defconfig b/arch/ppc/configs/ads8272_defconfig deleted file mode 100644 index 6619f9118b0..00000000000 --- a/arch/ppc/configs/ads8272_defconfig +++ /dev/null | |||
@@ -1,930 +0,0 @@ | |||
1 | # | ||
2 | # Automatically generated make config: don't edit | ||
3 | # Linux kernel version: 2.6.21-rc5 | ||
4 | # Wed Apr 4 20:55:16 2007 | ||
5 | # | ||
6 | CONFIG_MMU=y | ||
7 | CONFIG_GENERIC_HARDIRQS=y | ||
8 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | ||
9 | CONFIG_ARCH_HAS_ILOG2_U32=y | ||
10 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
11 | CONFIG_GENERIC_HWEIGHT=y | ||
12 | CONFIG_GENERIC_CALIBRATE_DELAY=y | ||
13 | CONFIG_PPC=y | ||
14 | CONFIG_PPC32=y | ||
15 | CONFIG_GENERIC_NVRAM=y | ||
16 | CONFIG_GENERIC_FIND_NEXT_BIT=y | ||
17 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | ||
18 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | ||
19 | CONFIG_GENERIC_BUG=y | ||
20 | CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" | ||
21 | |||
22 | # | ||
23 | # Code maturity level options | ||
24 | # | ||
25 | CONFIG_EXPERIMENTAL=y | ||
26 | CONFIG_BROKEN_ON_SMP=y | ||
27 | CONFIG_INIT_ENV_ARG_LIMIT=32 | ||
28 | |||
29 | # | ||
30 | # General setup | ||
31 | # | ||
32 | CONFIG_LOCALVERSION="" | ||
33 | CONFIG_LOCALVERSION_AUTO=y | ||
34 | CONFIG_SWAP=y | ||
35 | CONFIG_SYSVIPC=y | ||
36 | # CONFIG_IPC_NS is not set | ||
37 | CONFIG_SYSVIPC_SYSCTL=y | ||
38 | # CONFIG_POSIX_MQUEUE is not set | ||
39 | # CONFIG_BSD_PROCESS_ACCT is not set | ||
40 | # CONFIG_TASKSTATS is not set | ||
41 | # CONFIG_UTS_NS is not set | ||
42 | # CONFIG_AUDIT is not set | ||
43 | # CONFIG_IKCONFIG is not set | ||
44 | CONFIG_SYSFS_DEPRECATED=y | ||
45 | # CONFIG_RELAY is not set | ||
46 | CONFIG_BLK_DEV_INITRD=y | ||
47 | CONFIG_INITRAMFS_SOURCE="" | ||
48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | ||
49 | CONFIG_SYSCTL=y | ||
50 | CONFIG_EMBEDDED=y | ||
51 | CONFIG_SYSCTL_SYSCALL=y | ||
52 | # CONFIG_KALLSYMS is not set | ||
53 | # CONFIG_HOTPLUG is not set | ||
54 | CONFIG_PRINTK=y | ||
55 | CONFIG_BUG=y | ||
56 | CONFIG_ELF_CORE=y | ||
57 | CONFIG_BASE_FULL=y | ||
58 | CONFIG_FUTEX=y | ||
59 | # CONFIG_EPOLL is not set | ||
60 | CONFIG_SHMEM=y | ||
61 | CONFIG_SLAB=y | ||
62 | CONFIG_VM_EVENT_COUNTERS=y | ||
63 | CONFIG_RT_MUTEXES=y | ||
64 | # CONFIG_TINY_SHMEM is not set | ||
65 | CONFIG_BASE_SMALL=0 | ||
66 | # CONFIG_SLOB is not set | ||
67 | |||
68 | # | ||
69 | # Loadable module support | ||
70 | # | ||
71 | # CONFIG_MODULES is not set | ||
72 | |||
73 | # | ||
74 | # Block layer | ||
75 | # | ||
76 | CONFIG_BLOCK=y | ||
77 | # CONFIG_LBD is not set | ||
78 | # CONFIG_BLK_DEV_IO_TRACE is not set | ||
79 | # CONFIG_LSF is not set | ||
80 | |||
81 | # | ||
82 | # IO Schedulers | ||
83 | # | ||
84 | CONFIG_IOSCHED_NOOP=y | ||
85 | CONFIG_IOSCHED_AS=y | ||
86 | CONFIG_IOSCHED_DEADLINE=y | ||
87 | CONFIG_IOSCHED_CFQ=y | ||
88 | # CONFIG_DEFAULT_AS is not set | ||
89 | # CONFIG_DEFAULT_DEADLINE is not set | ||
90 | CONFIG_DEFAULT_CFQ=y | ||
91 | # CONFIG_DEFAULT_NOOP is not set | ||
92 | CONFIG_DEFAULT_IOSCHED="cfq" | ||
93 | |||
94 | # | ||
95 | # Processor | ||
96 | # | ||
97 | CONFIG_6xx=y | ||
98 | # CONFIG_40x is not set | ||
99 | # CONFIG_44x is not set | ||
100 | # CONFIG_8xx is not set | ||
101 | # CONFIG_E200 is not set | ||
102 | # CONFIG_E500 is not set | ||
103 | CONFIG_PPC_FPU=y | ||
104 | # CONFIG_PPC_DCR_NATIVE is not set | ||
105 | # CONFIG_KEXEC is not set | ||
106 | # CONFIG_CPU_FREQ is not set | ||
107 | # CONFIG_WANT_EARLY_SERIAL is not set | ||
108 | CONFIG_EMBEDDEDBOOT=y | ||
109 | CONFIG_PPC_STD_MMU=y | ||
110 | |||
111 | # | ||
112 | # Platform options | ||
113 | # | ||
114 | |||
115 | # | ||
116 | # Freescale Ethernet driver platform-specific options | ||
117 | # | ||
118 | # CONFIG_PPC_PREP is not set | ||
119 | # CONFIG_APUS is not set | ||
120 | # CONFIG_KATANA is not set | ||
121 | # CONFIG_WILLOW is not set | ||
122 | # CONFIG_CPCI690 is not set | ||
123 | # CONFIG_POWERPMC250 is not set | ||
124 | # CONFIG_CHESTNUT is not set | ||
125 | # CONFIG_SPRUCE is not set | ||
126 | # CONFIG_HDPU is not set | ||
127 | # CONFIG_EV64260 is not set | ||
128 | # CONFIG_LOPEC is not set | ||
129 | # CONFIG_MVME5100 is not set | ||
130 | # CONFIG_PPLUS is not set | ||
131 | # CONFIG_PRPMC750 is not set | ||
132 | # CONFIG_PRPMC800 is not set | ||
133 | # CONFIG_SANDPOINT is not set | ||
134 | # CONFIG_RADSTONE_PPC7D is not set | ||
135 | # CONFIG_PAL4 is not set | ||
136 | # CONFIG_EST8260 is not set | ||
137 | # CONFIG_SBC82xx is not set | ||
138 | # CONFIG_SBS8260 is not set | ||
139 | # CONFIG_RPX8260 is not set | ||
140 | # CONFIG_TQM8260 is not set | ||
141 | CONFIG_ADS8272=y | ||
142 | # CONFIG_PQ2FADS is not set | ||
143 | # CONFIG_LITE5200 is not set | ||
144 | # CONFIG_MPC834x_SYS is not set | ||
145 | # CONFIG_EV64360 is not set | ||
146 | CONFIG_PQ2ADS=y | ||
147 | CONFIG_8260=y | ||
148 | CONFIG_8272=y | ||
149 | CONFIG_CPM2=y | ||
150 | # CONFIG_PC_KEYBOARD is not set | ||
151 | # CONFIG_SMP is not set | ||
152 | # CONFIG_HIGHMEM is not set | ||
153 | CONFIG_ARCH_POPULATES_NODE_MAP=y | ||
154 | # CONFIG_HZ_100 is not set | ||
155 | CONFIG_HZ_250=y | ||
156 | # CONFIG_HZ_300 is not set | ||
157 | # CONFIG_HZ_1000 is not set | ||
158 | CONFIG_HZ=250 | ||
159 | CONFIG_PREEMPT_NONE=y | ||
160 | # CONFIG_PREEMPT_VOLUNTARY is not set | ||
161 | # CONFIG_PREEMPT is not set | ||
162 | CONFIG_SELECT_MEMORY_MODEL=y | ||
163 | CONFIG_FLATMEM_MANUAL=y | ||
164 | # CONFIG_DISCONTIGMEM_MANUAL is not set | ||
165 | # CONFIG_SPARSEMEM_MANUAL is not set | ||
166 | CONFIG_FLATMEM=y | ||
167 | CONFIG_FLAT_NODE_MEM_MAP=y | ||
168 | # CONFIG_SPARSEMEM_STATIC is not set | ||
169 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
170 | # CONFIG_RESOURCES_64BIT is not set | ||
171 | CONFIG_ZONE_DMA_FLAG=1 | ||
172 | CONFIG_BINFMT_ELF=y | ||
173 | # CONFIG_BINFMT_MISC is not set | ||
174 | # CONFIG_CMDLINE_BOOL is not set | ||
175 | # CONFIG_PM is not set | ||
176 | CONFIG_SECCOMP=y | ||
177 | CONFIG_ISA_DMA_API=y | ||
178 | |||
179 | # | ||
180 | # Bus options | ||
181 | # | ||
182 | CONFIG_ZONE_DMA=y | ||
183 | # CONFIG_PPC_I8259 is not set | ||
184 | CONFIG_PPC_INDIRECT_PCI=y | ||
185 | CONFIG_PCI=y | ||
186 | CONFIG_PCI_DOMAINS=y | ||
187 | CONFIG_PCI_8260=y | ||
188 | |||
189 | # | ||
190 | # PCCARD (PCMCIA/CardBus) support | ||
191 | # | ||
192 | |||
193 | # | ||
194 | # Advanced setup | ||
195 | # | ||
196 | # CONFIG_ADVANCED_OPTIONS is not set | ||
197 | |||
198 | # | ||
199 | # Default settings for advanced configuration options are used | ||
200 | # | ||
201 | CONFIG_HIGHMEM_START=0xfe000000 | ||
202 | CONFIG_LOWMEM_SIZE=0x30000000 | ||
203 | CONFIG_KERNEL_START=0xc0000000 | ||
204 | CONFIG_TASK_SIZE=0x80000000 | ||
205 | CONFIG_BOOT_LOAD=0x00400000 | ||
206 | |||
207 | # | ||
208 | # Networking | ||
209 | # | ||
210 | CONFIG_NET=y | ||
211 | |||
212 | # | ||
213 | # Networking options | ||
214 | # | ||
215 | # CONFIG_NETDEBUG is not set | ||
216 | CONFIG_PACKET=y | ||
217 | # CONFIG_PACKET_MMAP is not set | ||
218 | CONFIG_UNIX=y | ||
219 | CONFIG_XFRM=y | ||
220 | # CONFIG_XFRM_USER is not set | ||
221 | # CONFIG_XFRM_SUB_POLICY is not set | ||
222 | # CONFIG_XFRM_MIGRATE is not set | ||
223 | # CONFIG_NET_KEY is not set | ||
224 | CONFIG_INET=y | ||
225 | CONFIG_IP_MULTICAST=y | ||
226 | # CONFIG_IP_ADVANCED_ROUTER is not set | ||
227 | CONFIG_IP_FIB_HASH=y | ||
228 | CONFIG_IP_PNP=y | ||
229 | CONFIG_IP_PNP_DHCP=y | ||
230 | CONFIG_IP_PNP_BOOTP=y | ||
231 | # CONFIG_IP_PNP_RARP is not set | ||
232 | # CONFIG_NET_IPIP is not set | ||
233 | # CONFIG_NET_IPGRE is not set | ||
234 | # CONFIG_IP_MROUTE is not set | ||
235 | # CONFIG_ARPD is not set | ||
236 | CONFIG_SYN_COOKIES=y | ||
237 | # CONFIG_INET_AH is not set | ||
238 | # CONFIG_INET_ESP is not set | ||
239 | # CONFIG_INET_IPCOMP is not set | ||
240 | # CONFIG_INET_XFRM_TUNNEL is not set | ||
241 | # CONFIG_INET_TUNNEL is not set | ||
242 | CONFIG_INET_XFRM_MODE_TRANSPORT=y | ||
243 | CONFIG_INET_XFRM_MODE_TUNNEL=y | ||
244 | CONFIG_INET_XFRM_MODE_BEET=y | ||
245 | CONFIG_INET_DIAG=y | ||
246 | CONFIG_INET_TCP_DIAG=y | ||
247 | # CONFIG_TCP_CONG_ADVANCED is not set | ||
248 | CONFIG_TCP_CONG_CUBIC=y | ||
249 | CONFIG_DEFAULT_TCP_CONG="cubic" | ||
250 | # CONFIG_TCP_MD5SIG is not set | ||
251 | # CONFIG_IPV6 is not set | ||
252 | # CONFIG_INET6_XFRM_TUNNEL is not set | ||
253 | # CONFIG_INET6_TUNNEL is not set | ||
254 | # CONFIG_NETWORK_SECMARK is not set | ||
255 | # CONFIG_NETFILTER is not set | ||
256 | |||
257 | # | ||
258 | # DCCP Configuration (EXPERIMENTAL) | ||
259 | # | ||
260 | # CONFIG_IP_DCCP is not set | ||
261 | |||
262 | # | ||
263 | # SCTP Configuration (EXPERIMENTAL) | ||
264 | # | ||
265 | # CONFIG_IP_SCTP is not set | ||
266 | |||
267 | # | ||
268 | # TIPC Configuration (EXPERIMENTAL) | ||
269 | # | ||
270 | # CONFIG_TIPC is not set | ||
271 | # CONFIG_ATM is not set | ||
272 | # CONFIG_BRIDGE is not set | ||
273 | # CONFIG_VLAN_8021Q is not set | ||
274 | # CONFIG_DECNET is not set | ||
275 | # CONFIG_LLC2 is not set | ||
276 | # CONFIG_IPX is not set | ||
277 | # CONFIG_ATALK is not set | ||
278 | # CONFIG_X25 is not set | ||
279 | # CONFIG_LAPB is not set | ||
280 | # CONFIG_ECONET is not set | ||
281 | # CONFIG_WAN_ROUTER is not set | ||
282 | |||
283 | # | ||
284 | # QoS and/or fair queueing | ||
285 | # | ||
286 | # CONFIG_NET_SCHED is not set | ||
287 | |||
288 | # | ||
289 | # Network testing | ||
290 | # | ||
291 | # CONFIG_NET_PKTGEN is not set | ||
292 | # CONFIG_HAMRADIO is not set | ||
293 | # CONFIG_IRDA is not set | ||
294 | # CONFIG_BT is not set | ||
295 | # CONFIG_IEEE80211 is not set | ||
296 | |||
297 | # | ||
298 | # Device Drivers | ||
299 | # | ||
300 | |||
301 | # | ||
302 | # Generic Driver Options | ||
303 | # | ||
304 | CONFIG_STANDALONE=y | ||
305 | CONFIG_PREVENT_FIRMWARE_BUILD=y | ||
306 | # CONFIG_SYS_HYPERVISOR is not set | ||
307 | |||
308 | # | ||
309 | # Connector - unified userspace <-> kernelspace linker | ||
310 | # | ||
311 | # CONFIG_CONNECTOR is not set | ||
312 | |||
313 | # | ||
314 | # Memory Technology Devices (MTD) | ||
315 | # | ||
316 | # CONFIG_MTD is not set | ||
317 | |||
318 | # | ||
319 | # Parallel port support | ||
320 | # | ||
321 | # CONFIG_PARPORT is not set | ||
322 | |||
323 | # | ||
324 | # Plug and Play support | ||
325 | # | ||
326 | # CONFIG_PNPACPI is not set | ||
327 | |||
328 | # | ||
329 | # Block devices | ||
330 | # | ||
331 | # CONFIG_BLK_DEV_FD is not set | ||
332 | # CONFIG_BLK_CPQ_DA is not set | ||
333 | # CONFIG_BLK_CPQ_CISS_DA is not set | ||
334 | # CONFIG_BLK_DEV_DAC960 is not set | ||
335 | # CONFIG_BLK_DEV_UMEM is not set | ||
336 | # CONFIG_BLK_DEV_COW_COMMON is not set | ||
337 | CONFIG_BLK_DEV_LOOP=y | ||
338 | # CONFIG_BLK_DEV_CRYPTOLOOP is not set | ||
339 | # CONFIG_BLK_DEV_NBD is not set | ||
340 | # CONFIG_BLK_DEV_SX8 is not set | ||
341 | CONFIG_BLK_DEV_RAM=y | ||
342 | CONFIG_BLK_DEV_RAM_COUNT=16 | ||
343 | CONFIG_BLK_DEV_RAM_SIZE=32768 | ||
344 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
345 | # CONFIG_CDROM_PKTCDVD is not set | ||
346 | # CONFIG_ATA_OVER_ETH is not set | ||
347 | |||
348 | # | ||
349 | # Misc devices | ||
350 | # | ||
351 | # CONFIG_SGI_IOC4 is not set | ||
352 | # CONFIG_TIFM_CORE is not set | ||
353 | |||
354 | # | ||
355 | # ATA/ATAPI/MFM/RLL support | ||
356 | # | ||
357 | # CONFIG_IDE is not set | ||
358 | |||
359 | # | ||
360 | # SCSI device support | ||
361 | # | ||
362 | # CONFIG_RAID_ATTRS is not set | ||
363 | # CONFIG_SCSI is not set | ||
364 | # CONFIG_SCSI_NETLINK is not set | ||
365 | |||
366 | # | ||
367 | # Serial ATA (prod) and Parallel ATA (experimental) drivers | ||
368 | # | ||
369 | # CONFIG_ATA is not set | ||
370 | |||
371 | # | ||
372 | # Multi-device support (RAID and LVM) | ||
373 | # | ||
374 | # CONFIG_MD is not set | ||
375 | |||
376 | # | ||
377 | # Fusion MPT device support | ||
378 | # | ||
379 | # CONFIG_FUSION is not set | ||
380 | |||
381 | # | ||
382 | # IEEE 1394 (FireWire) support | ||
383 | # | ||
384 | # CONFIG_IEEE1394 is not set | ||
385 | |||
386 | # | ||
387 | # I2O device support | ||
388 | # | ||
389 | # CONFIG_I2O is not set | ||
390 | |||
391 | # | ||
392 | # Macintosh device drivers | ||
393 | # | ||
394 | # CONFIG_MAC_EMUMOUSEBTN is not set | ||
395 | # CONFIG_WINDFARM is not set | ||
396 | |||
397 | # | ||
398 | # Network device support | ||
399 | # | ||
400 | CONFIG_NETDEVICES=y | ||
401 | # CONFIG_DUMMY is not set | ||
402 | # CONFIG_BONDING is not set | ||
403 | # CONFIG_EQUALIZER is not set | ||
404 | # CONFIG_TUN is not set | ||
405 | |||
406 | # | ||
407 | # ARCnet devices | ||
408 | # | ||
409 | # CONFIG_ARCNET is not set | ||
410 | |||
411 | # | ||
412 | # PHY device support | ||
413 | # | ||
414 | CONFIG_PHYLIB=y | ||
415 | |||
416 | # | ||
417 | # MII PHY device drivers | ||
418 | # | ||
419 | # CONFIG_MARVELL_PHY is not set | ||
420 | CONFIG_DAVICOM_PHY=y | ||
421 | # CONFIG_QSEMI_PHY is not set | ||
422 | # CONFIG_LXT_PHY is not set | ||
423 | # CONFIG_CICADA_PHY is not set | ||
424 | # CONFIG_VITESSE_PHY is not set | ||
425 | # CONFIG_SMSC_PHY is not set | ||
426 | # CONFIG_BROADCOM_PHY is not set | ||
427 | # CONFIG_FIXED_PHY is not set | ||
428 | |||
429 | # | ||
430 | # Ethernet (10 or 100Mbit) | ||
431 | # | ||
432 | CONFIG_NET_ETHERNET=y | ||
433 | CONFIG_MII=y | ||
434 | # CONFIG_HAPPYMEAL is not set | ||
435 | # CONFIG_SUNGEM is not set | ||
436 | # CONFIG_CASSINI is not set | ||
437 | # CONFIG_NET_VENDOR_3COM is not set | ||
438 | |||
439 | # | ||
440 | # Tulip family network device support | ||
441 | # | ||
442 | # CONFIG_NET_TULIP is not set | ||
443 | # CONFIG_HP100 is not set | ||
444 | # CONFIG_NET_PCI is not set | ||
445 | CONFIG_FS_ENET=y | ||
446 | # CONFIG_FS_ENET_HAS_SCC is not set | ||
447 | CONFIG_FS_ENET_HAS_FCC=y | ||
448 | |||
449 | # | ||
450 | # Ethernet (1000 Mbit) | ||
451 | # | ||
452 | # CONFIG_ACENIC is not set | ||
453 | # CONFIG_DL2K is not set | ||
454 | # CONFIG_E1000 is not set | ||
455 | # CONFIG_NS83820 is not set | ||
456 | # CONFIG_HAMACHI is not set | ||
457 | # CONFIG_YELLOWFIN is not set | ||
458 | # CONFIG_R8169 is not set | ||
459 | # CONFIG_SIS190 is not set | ||
460 | # CONFIG_SKGE is not set | ||
461 | # CONFIG_SKY2 is not set | ||
462 | # CONFIG_SK98LIN is not set | ||
463 | # CONFIG_TIGON3 is not set | ||
464 | # CONFIG_BNX2 is not set | ||
465 | # CONFIG_QLA3XXX is not set | ||
466 | # CONFIG_ATL1 is not set | ||
467 | |||
468 | # | ||
469 | # Ethernet (10000 Mbit) | ||
470 | # | ||
471 | # CONFIG_CHELSIO_T1 is not set | ||
472 | # CONFIG_CHELSIO_T3 is not set | ||
473 | # CONFIG_IXGB is not set | ||
474 | # CONFIG_S2IO is not set | ||
475 | # CONFIG_MYRI10GE is not set | ||
476 | # CONFIG_NETXEN_NIC is not set | ||
477 | |||
478 | # | ||
479 | # Token Ring devices | ||
480 | # | ||
481 | # CONFIG_TR is not set | ||
482 | |||
483 | # | ||
484 | # Wireless LAN (non-hamradio) | ||
485 | # | ||
486 | # CONFIG_NET_RADIO is not set | ||
487 | |||
488 | # | ||
489 | # Wan interfaces | ||
490 | # | ||
491 | # CONFIG_WAN is not set | ||
492 | # CONFIG_FDDI is not set | ||
493 | # CONFIG_HIPPI is not set | ||
494 | # CONFIG_PPP is not set | ||
495 | # CONFIG_SLIP is not set | ||
496 | # CONFIG_SHAPER is not set | ||
497 | # CONFIG_NETCONSOLE is not set | ||
498 | # CONFIG_NETPOLL is not set | ||
499 | # CONFIG_NET_POLL_CONTROLLER is not set | ||
500 | |||
501 | # | ||
502 | # ISDN subsystem | ||
503 | # | ||
504 | # CONFIG_ISDN is not set | ||
505 | |||
506 | # | ||
507 | # Telephony Support | ||
508 | # | ||
509 | # CONFIG_PHONE is not set | ||
510 | |||
511 | # | ||
512 | # Input device support | ||
513 | # | ||
514 | CONFIG_INPUT=y | ||
515 | # CONFIG_INPUT_FF_MEMLESS is not set | ||
516 | |||
517 | # | ||
518 | # Userland interfaces | ||
519 | # | ||
520 | # CONFIG_INPUT_MOUSEDEV is not set | ||
521 | # CONFIG_INPUT_JOYDEV is not set | ||
522 | # CONFIG_INPUT_TSDEV is not set | ||
523 | # CONFIG_INPUT_EVDEV is not set | ||
524 | # CONFIG_INPUT_EVBUG is not set | ||
525 | |||
526 | # | ||
527 | # Input Device Drivers | ||
528 | # | ||
529 | # CONFIG_INPUT_KEYBOARD is not set | ||
530 | # CONFIG_INPUT_MOUSE is not set | ||
531 | # CONFIG_INPUT_JOYSTICK is not set | ||
532 | # CONFIG_INPUT_TOUCHSCREEN is not set | ||
533 | # CONFIG_INPUT_MISC is not set | ||
534 | |||
535 | # | ||
536 | # Hardware I/O ports | ||
537 | # | ||
538 | # CONFIG_SERIO is not set | ||
539 | # CONFIG_GAMEPORT is not set | ||
540 | |||
541 | # | ||
542 | # Character devices | ||
543 | # | ||
544 | # CONFIG_VT is not set | ||
545 | # CONFIG_SERIAL_NONSTANDARD is not set | ||
546 | |||
547 | # | ||
548 | # Serial drivers | ||
549 | # | ||
550 | # CONFIG_SERIAL_8250 is not set | ||
551 | |||
552 | # | ||
553 | # Non-8250 serial port support | ||
554 | # | ||
555 | # CONFIG_SERIAL_UARTLITE is not set | ||
556 | CONFIG_SERIAL_CORE=y | ||
557 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
558 | CONFIG_SERIAL_CPM=y | ||
559 | CONFIG_SERIAL_CPM_CONSOLE=y | ||
560 | CONFIG_SERIAL_CPM_SCC1=y | ||
561 | # CONFIG_SERIAL_CPM_SCC2 is not set | ||
562 | # CONFIG_SERIAL_CPM_SCC3 is not set | ||
563 | CONFIG_SERIAL_CPM_SCC4=y | ||
564 | # CONFIG_SERIAL_CPM_SMC1 is not set | ||
565 | # CONFIG_SERIAL_CPM_SMC2 is not set | ||
566 | # CONFIG_SERIAL_JSM is not set | ||
567 | CONFIG_UNIX98_PTYS=y | ||
568 | CONFIG_LEGACY_PTYS=y | ||
569 | CONFIG_LEGACY_PTY_COUNT=256 | ||
570 | |||
571 | # | ||
572 | # IPMI | ||
573 | # | ||
574 | # CONFIG_IPMI_HANDLER is not set | ||
575 | |||
576 | # | ||
577 | # Watchdog Cards | ||
578 | # | ||
579 | # CONFIG_WATCHDOG is not set | ||
580 | CONFIG_HW_RANDOM=y | ||
581 | # CONFIG_NVRAM is not set | ||
582 | CONFIG_GEN_RTC=y | ||
583 | # CONFIG_GEN_RTC_X is not set | ||
584 | # CONFIG_DTLK is not set | ||
585 | # CONFIG_R3964 is not set | ||
586 | # CONFIG_APPLICOM is not set | ||
587 | # CONFIG_AGP is not set | ||
588 | # CONFIG_DRM is not set | ||
589 | # CONFIG_RAW_DRIVER is not set | ||
590 | |||
591 | # | ||
592 | # TPM devices | ||
593 | # | ||
594 | # CONFIG_TCG_TPM is not set | ||
595 | |||
596 | # | ||
597 | # I2C support | ||
598 | # | ||
599 | # CONFIG_I2C is not set | ||
600 | |||
601 | # | ||
602 | # SPI support | ||
603 | # | ||
604 | # CONFIG_SPI is not set | ||
605 | # CONFIG_SPI_MASTER is not set | ||
606 | |||
607 | # | ||
608 | # Dallas's 1-wire bus | ||
609 | # | ||
610 | # CONFIG_W1 is not set | ||
611 | |||
612 | # | ||
613 | # Hardware Monitoring support | ||
614 | # | ||
615 | CONFIG_HWMON=y | ||
616 | # CONFIG_HWMON_VID is not set | ||
617 | # CONFIG_SENSORS_ABITUGURU is not set | ||
618 | # CONFIG_SENSORS_F71805F is not set | ||
619 | # CONFIG_SENSORS_PC87427 is not set | ||
620 | # CONFIG_SENSORS_VT1211 is not set | ||
621 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
622 | |||
623 | # | ||
624 | # Multifunction device drivers | ||
625 | # | ||
626 | # CONFIG_MFD_SM501 is not set | ||
627 | |||
628 | # | ||
629 | # Multimedia devices | ||
630 | # | ||
631 | # CONFIG_VIDEO_DEV is not set | ||
632 | |||
633 | # | ||
634 | # Digital Video Broadcasting Devices | ||
635 | # | ||
636 | # CONFIG_DVB is not set | ||
637 | |||
638 | # | ||
639 | # Graphics support | ||
640 | # | ||
641 | # CONFIG_BACKLIGHT_LCD_SUPPORT is not set | ||
642 | # CONFIG_FB is not set | ||
643 | # CONFIG_FB_IBM_GXT4500 is not set | ||
644 | |||
645 | # | ||
646 | # Sound | ||
647 | # | ||
648 | # CONFIG_SOUND is not set | ||
649 | |||
650 | # | ||
651 | # HID Devices | ||
652 | # | ||
653 | CONFIG_HID=y | ||
654 | # CONFIG_HID_DEBUG is not set | ||
655 | |||
656 | # | ||
657 | # USB support | ||
658 | # | ||
659 | CONFIG_USB_ARCH_HAS_HCD=y | ||
660 | CONFIG_USB_ARCH_HAS_OHCI=y | ||
661 | CONFIG_USB_ARCH_HAS_EHCI=y | ||
662 | # CONFIG_USB is not set | ||
663 | |||
664 | # | ||
665 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | ||
666 | # | ||
667 | |||
668 | # | ||
669 | # USB Gadget Support | ||
670 | # | ||
671 | # CONFIG_USB_GADGET is not set | ||
672 | |||
673 | # | ||
674 | # MMC/SD Card support | ||
675 | # | ||
676 | # CONFIG_MMC is not set | ||
677 | |||
678 | # | ||
679 | # LED devices | ||
680 | # | ||
681 | # CONFIG_NEW_LEDS is not set | ||
682 | |||
683 | # | ||
684 | # LED drivers | ||
685 | # | ||
686 | |||
687 | # | ||
688 | # LED Triggers | ||
689 | # | ||
690 | |||
691 | # | ||
692 | # InfiniBand support | ||
693 | # | ||
694 | # CONFIG_INFINIBAND is not set | ||
695 | |||
696 | # | ||
697 | # EDAC - error detection and reporting (RAS) (EXPERIMENTAL) | ||
698 | # | ||
699 | |||
700 | # | ||
701 | # Real Time Clock | ||
702 | # | ||
703 | # CONFIG_RTC_CLASS is not set | ||
704 | |||
705 | # | ||
706 | # DMA Engine support | ||
707 | # | ||
708 | # CONFIG_DMA_ENGINE is not set | ||
709 | |||
710 | # | ||
711 | # DMA Clients | ||
712 | # | ||
713 | |||
714 | # | ||
715 | # DMA Devices | ||
716 | # | ||
717 | |||
718 | # | ||
719 | # Auxiliary Display support | ||
720 | # | ||
721 | |||
722 | # | ||
723 | # Virtualization | ||
724 | # | ||
725 | |||
726 | # | ||
727 | # File systems | ||
728 | # | ||
729 | CONFIG_EXT2_FS=y | ||
730 | # CONFIG_EXT2_FS_XATTR is not set | ||
731 | # CONFIG_EXT2_FS_XIP is not set | ||
732 | CONFIG_EXT3_FS=y | ||
733 | CONFIG_EXT3_FS_XATTR=y | ||
734 | # CONFIG_EXT3_FS_POSIX_ACL is not set | ||
735 | # CONFIG_EXT3_FS_SECURITY is not set | ||
736 | # CONFIG_EXT4DEV_FS is not set | ||
737 | CONFIG_JBD=y | ||
738 | # CONFIG_JBD_DEBUG is not set | ||
739 | CONFIG_FS_MBCACHE=y | ||
740 | # CONFIG_REISERFS_FS is not set | ||
741 | # CONFIG_JFS_FS is not set | ||
742 | CONFIG_FS_POSIX_ACL=y | ||
743 | # CONFIG_XFS_FS is not set | ||
744 | # CONFIG_GFS2_FS is not set | ||
745 | # CONFIG_OCFS2_FS is not set | ||
746 | # CONFIG_MINIX_FS is not set | ||
747 | # CONFIG_ROMFS_FS is not set | ||
748 | CONFIG_INOTIFY=y | ||
749 | CONFIG_INOTIFY_USER=y | ||
750 | # CONFIG_QUOTA is not set | ||
751 | CONFIG_DNOTIFY=y | ||
752 | # CONFIG_AUTOFS_FS is not set | ||
753 | # CONFIG_AUTOFS4_FS is not set | ||
754 | # CONFIG_FUSE_FS is not set | ||
755 | |||
756 | # | ||
757 | # CD-ROM/DVD Filesystems | ||
758 | # | ||
759 | # CONFIG_ISO9660_FS is not set | ||
760 | # CONFIG_UDF_FS is not set | ||
761 | |||
762 | # | ||
763 | # DOS/FAT/NT Filesystems | ||
764 | # | ||
765 | # CONFIG_MSDOS_FS is not set | ||
766 | # CONFIG_VFAT_FS is not set | ||
767 | # CONFIG_NTFS_FS is not set | ||
768 | |||
769 | # | ||
770 | # Pseudo filesystems | ||
771 | # | ||
772 | CONFIG_PROC_FS=y | ||
773 | CONFIG_PROC_KCORE=y | ||
774 | CONFIG_PROC_SYSCTL=y | ||
775 | CONFIG_SYSFS=y | ||
776 | CONFIG_TMPFS=y | ||
777 | # CONFIG_TMPFS_POSIX_ACL is not set | ||
778 | # CONFIG_HUGETLB_PAGE is not set | ||
779 | CONFIG_RAMFS=y | ||
780 | # CONFIG_CONFIGFS_FS is not set | ||
781 | |||
782 | # | ||
783 | # Miscellaneous filesystems | ||
784 | # | ||
785 | # CONFIG_ADFS_FS is not set | ||
786 | # CONFIG_AFFS_FS is not set | ||
787 | # CONFIG_HFS_FS is not set | ||
788 | # CONFIG_HFSPLUS_FS is not set | ||
789 | # CONFIG_BEFS_FS is not set | ||
790 | # CONFIG_BFS_FS is not set | ||
791 | # CONFIG_EFS_FS is not set | ||
792 | # CONFIG_CRAMFS is not set | ||
793 | # CONFIG_VXFS_FS is not set | ||
794 | # CONFIG_HPFS_FS is not set | ||
795 | # CONFIG_QNX4FS_FS is not set | ||
796 | # CONFIG_SYSV_FS is not set | ||
797 | # CONFIG_UFS_FS is not set | ||
798 | |||
799 | # | ||
800 | # Network File Systems | ||
801 | # | ||
802 | CONFIG_NFS_FS=y | ||
803 | CONFIG_NFS_V3=y | ||
804 | CONFIG_NFS_V3_ACL=y | ||
805 | CONFIG_NFS_V4=y | ||
806 | # CONFIG_NFS_DIRECTIO is not set | ||
807 | # CONFIG_NFSD is not set | ||
808 | CONFIG_ROOT_NFS=y | ||
809 | CONFIG_LOCKD=y | ||
810 | CONFIG_LOCKD_V4=y | ||
811 | CONFIG_NFS_ACL_SUPPORT=y | ||
812 | CONFIG_NFS_COMMON=y | ||
813 | CONFIG_SUNRPC=y | ||
814 | CONFIG_SUNRPC_GSS=y | ||
815 | CONFIG_RPCSEC_GSS_KRB5=y | ||
816 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | ||
817 | # CONFIG_SMB_FS is not set | ||
818 | # CONFIG_CIFS is not set | ||
819 | # CONFIG_NCP_FS is not set | ||
820 | # CONFIG_CODA_FS is not set | ||
821 | # CONFIG_AFS_FS is not set | ||
822 | # CONFIG_9P_FS is not set | ||
823 | |||
824 | # | ||
825 | # Partition Types | ||
826 | # | ||
827 | CONFIG_PARTITION_ADVANCED=y | ||
828 | # CONFIG_ACORN_PARTITION is not set | ||
829 | # CONFIG_OSF_PARTITION is not set | ||
830 | # CONFIG_AMIGA_PARTITION is not set | ||
831 | # CONFIG_ATARI_PARTITION is not set | ||
832 | # CONFIG_MAC_PARTITION is not set | ||
833 | # CONFIG_MSDOS_PARTITION is not set | ||
834 | # CONFIG_LDM_PARTITION is not set | ||
835 | # CONFIG_SGI_PARTITION is not set | ||
836 | # CONFIG_ULTRIX_PARTITION is not set | ||
837 | # CONFIG_SUN_PARTITION is not set | ||
838 | # CONFIG_KARMA_PARTITION is not set | ||
839 | # CONFIG_EFI_PARTITION is not set | ||
840 | |||
841 | # | ||
842 | # Native Language Support | ||
843 | # | ||
844 | # CONFIG_NLS is not set | ||
845 | |||
846 | # | ||
847 | # Distributed Lock Manager | ||
848 | # | ||
849 | # CONFIG_DLM is not set | ||
850 | # CONFIG_SCC_ENET is not set | ||
851 | # CONFIG_FEC_ENET is not set | ||
852 | |||
853 | # | ||
854 | # CPM2 Options | ||
855 | # | ||
856 | |||
857 | # | ||
858 | # Library routines | ||
859 | # | ||
860 | # CONFIG_CRC_CCITT is not set | ||
861 | # CONFIG_CRC16 is not set | ||
862 | # CONFIG_CRC32 is not set | ||
863 | # CONFIG_LIBCRC32C is not set | ||
864 | CONFIG_PLIST=y | ||
865 | CONFIG_HAS_IOMEM=y | ||
866 | CONFIG_HAS_IOPORT=y | ||
867 | # CONFIG_PROFILING is not set | ||
868 | |||
869 | # | ||
870 | # Kernel hacking | ||
871 | # | ||
872 | # CONFIG_PRINTK_TIME is not set | ||
873 | CONFIG_ENABLE_MUST_CHECK=y | ||
874 | # CONFIG_MAGIC_SYSRQ is not set | ||
875 | # CONFIG_UNUSED_SYMBOLS is not set | ||
876 | # CONFIG_DEBUG_FS is not set | ||
877 | # CONFIG_HEADERS_CHECK is not set | ||
878 | # CONFIG_DEBUG_KERNEL is not set | ||
879 | CONFIG_LOG_BUF_SHIFT=14 | ||
880 | # CONFIG_DEBUG_BUGVERBOSE is not set | ||
881 | # CONFIG_KGDB_CONSOLE is not set | ||
882 | |||
883 | # | ||
884 | # Security options | ||
885 | # | ||
886 | # CONFIG_KEYS is not set | ||
887 | # CONFIG_SECURITY is not set | ||
888 | |||
889 | # | ||
890 | # Cryptographic options | ||
891 | # | ||
892 | CONFIG_CRYPTO=y | ||
893 | CONFIG_CRYPTO_ALGAPI=y | ||
894 | CONFIG_CRYPTO_BLKCIPHER=y | ||
895 | CONFIG_CRYPTO_MANAGER=y | ||
896 | # CONFIG_CRYPTO_HMAC is not set | ||
897 | # CONFIG_CRYPTO_XCBC is not set | ||
898 | # CONFIG_CRYPTO_NULL is not set | ||
899 | # CONFIG_CRYPTO_MD4 is not set | ||
900 | CONFIG_CRYPTO_MD5=y | ||
901 | # CONFIG_CRYPTO_SHA1 is not set | ||
902 | # CONFIG_CRYPTO_SHA256 is not set | ||
903 | # CONFIG_CRYPTO_SHA512 is not set | ||
904 | # CONFIG_CRYPTO_WP512 is not set | ||
905 | # CONFIG_CRYPTO_TGR192 is not set | ||
906 | # CONFIG_CRYPTO_GF128MUL is not set | ||
907 | CONFIG_CRYPTO_ECB=y | ||
908 | CONFIG_CRYPTO_CBC=y | ||
909 | CONFIG_CRYPTO_PCBC=y | ||
910 | # CONFIG_CRYPTO_LRW is not set | ||
911 | CONFIG_CRYPTO_DES=y | ||
912 | # CONFIG_CRYPTO_FCRYPT is not set | ||
913 | # CONFIG_CRYPTO_BLOWFISH is not set | ||
914 | # CONFIG_CRYPTO_TWOFISH is not set | ||
915 | # CONFIG_CRYPTO_SERPENT is not set | ||
916 | # CONFIG_CRYPTO_AES is not set | ||
917 | # CONFIG_CRYPTO_CAST5 is not set | ||
918 | # CONFIG_CRYPTO_CAST6 is not set | ||
919 | # CONFIG_CRYPTO_TEA is not set | ||
920 | # CONFIG_CRYPTO_ARC4 is not set | ||
921 | # CONFIG_CRYPTO_KHAZAD is not set | ||
922 | # CONFIG_CRYPTO_ANUBIS is not set | ||
923 | # CONFIG_CRYPTO_DEFLATE is not set | ||
924 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | ||
925 | # CONFIG_CRYPTO_CRC32C is not set | ||
926 | # CONFIG_CRYPTO_CAMELLIA is not set | ||
927 | |||
928 | # | ||
929 | # Hardware crypto devices | ||
930 | # | ||
diff --git a/arch/ppc/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 40f53fbe6d3..6260231987c 100644 --- a/arch/ppc/platforms/Makefile +++ b/arch/ppc/platforms/Makefile | |||
@@ -4,7 +4,6 @@ | |||
4 | 4 | ||
5 | obj-$(CONFIG_PPC_PREP) += prep_pci.o prep_setup.o | 5 | obj-$(CONFIG_PPC_PREP) += prep_pci.o prep_setup.o |
6 | obj-$(CONFIG_PREP_RESIDUAL) += residual.o | 6 | obj-$(CONFIG_PREP_RESIDUAL) += residual.o |
7 | obj-$(CONFIG_PQ2ADS) += pq2ads.o | ||
8 | obj-$(CONFIG_TQM8260) += tqm8260_setup.o | 7 | obj-$(CONFIG_TQM8260) += tqm8260_setup.o |
9 | obj-$(CONFIG_CPCI690) += cpci690.o | 8 | obj-$(CONFIG_CPCI690) += cpci690.o |
10 | obj-$(CONFIG_EV64260) += ev64260.o | 9 | obj-$(CONFIG_EV64260) += ev64260.o |
@@ -24,6 +23,3 @@ obj-$(CONFIG_SBC82xx) += sbc82xx.o | |||
24 | obj-$(CONFIG_SPRUCE) += spruce.o | 23 | obj-$(CONFIG_SPRUCE) += spruce.o |
25 | obj-$(CONFIG_LITE5200) += lite5200.o | 24 | obj-$(CONFIG_LITE5200) += lite5200.o |
26 | obj-$(CONFIG_EV64360) += ev64360.o | 25 | obj-$(CONFIG_EV64360) += ev64360.o |
27 | obj-$(CONFIG_MPC86XADS) += mpc866ads_setup.o | ||
28 | obj-$(CONFIG_MPC885ADS) += mpc885ads_setup.o | ||
29 | obj-$(CONFIG_ADS8272) += mpc8272ads_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/mpc8272ads_setup.c b/arch/ppc/platforms/mpc8272ads_setup.c deleted file mode 100644 index 47f4b38edb5..00000000000 --- a/arch/ppc/platforms/mpc8272ads_setup.c +++ /dev/null | |||
@@ -1,367 +0,0 @@ | |||
1 | /* | ||
2 | * arch/ppc/platforms/mpc8272ads_setup.c | ||
3 | * | ||
4 | * MPC82xx Board-specific PlatformDevice descriptions | ||
5 | * | ||
6 | * 2005 (c) MontaVista Software, Inc. | ||
7 | * Vitaly Bordug <vbordug@ru.mvista.com> | ||
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 | |||
15 | #include <linux/init.h> | ||
16 | #include <linux/module.h> | ||
17 | #include <linux/device.h> | ||
18 | #include <linux/ioport.h> | ||
19 | #include <linux/fs_enet_pd.h> | ||
20 | #include <linux/platform_device.h> | ||
21 | #include <linux/phy.h> | ||
22 | |||
23 | #include <asm/io.h> | ||
24 | #include <asm/mpc8260.h> | ||
25 | #include <asm/cpm2.h> | ||
26 | #include <asm/immap_cpm2.h> | ||
27 | #include <asm/irq.h> | ||
28 | #include <asm/ppc_sys.h> | ||
29 | #include <asm/ppcboot.h> | ||
30 | #include <linux/fs_uart_pd.h> | ||
31 | |||
32 | #include "pq2ads_pd.h" | ||
33 | |||
34 | static void init_fcc1_ioports(struct fs_platform_info*); | ||
35 | static void init_fcc2_ioports(struct fs_platform_info*); | ||
36 | static void init_scc1_uart_ioports(struct fs_uart_platform_info*); | ||
37 | static void init_scc4_uart_ioports(struct fs_uart_platform_info*); | ||
38 | |||
39 | static struct fs_uart_platform_info mpc8272_uart_pdata[] = { | ||
40 | [fsid_scc1_uart] = { | ||
41 | .init_ioports = init_scc1_uart_ioports, | ||
42 | .fs_no = fsid_scc1_uart, | ||
43 | .brg = 1, | ||
44 | .tx_num_fifo = 4, | ||
45 | .tx_buf_size = 32, | ||
46 | .rx_num_fifo = 4, | ||
47 | .rx_buf_size = 32, | ||
48 | }, | ||
49 | [fsid_scc4_uart] = { | ||
50 | .init_ioports = init_scc4_uart_ioports, | ||
51 | .fs_no = fsid_scc4_uart, | ||
52 | .brg = 4, | ||
53 | .tx_num_fifo = 4, | ||
54 | .tx_buf_size = 32, | ||
55 | .rx_num_fifo = 4, | ||
56 | .rx_buf_size = 32, | ||
57 | }, | ||
58 | }; | ||
59 | |||
60 | static struct fs_mii_bb_platform_info m82xx_mii_bb_pdata = { | ||
61 | .mdio_dat.bit = 18, | ||
62 | .mdio_dir.bit = 18, | ||
63 | .mdc_dat.bit = 19, | ||
64 | .delay = 1, | ||
65 | }; | ||
66 | |||
67 | static struct fs_platform_info mpc82xx_enet_pdata[] = { | ||
68 | [fsid_fcc1] = { | ||
69 | .fs_no = fsid_fcc1, | ||
70 | .cp_page = CPM_CR_FCC1_PAGE, | ||
71 | .cp_block = CPM_CR_FCC1_SBLOCK, | ||
72 | |||
73 | .clk_trx = (PC_F1RXCLK | PC_F1TXCLK), | ||
74 | .clk_route = CMX1_CLK_ROUTE, | ||
75 | .clk_mask = CMX1_CLK_MASK, | ||
76 | .init_ioports = init_fcc1_ioports, | ||
77 | |||
78 | .mem_offset = FCC1_MEM_OFFSET, | ||
79 | |||
80 | .rx_ring = 32, | ||
81 | .tx_ring = 32, | ||
82 | .rx_copybreak = 240, | ||
83 | .use_napi = 0, | ||
84 | .napi_weight = 17, | ||
85 | .bus_id = "0:00", | ||
86 | }, | ||
87 | [fsid_fcc2] = { | ||
88 | .fs_no = fsid_fcc2, | ||
89 | .cp_page = CPM_CR_FCC2_PAGE, | ||
90 | .cp_block = CPM_CR_FCC2_SBLOCK, | ||
91 | .clk_trx = (PC_F2RXCLK | PC_F2TXCLK), | ||
92 | .clk_route = CMX2_CLK_ROUTE, | ||
93 | .clk_mask = CMX2_CLK_MASK, | ||
94 | .init_ioports = init_fcc2_ioports, | ||
95 | |||
96 | .mem_offset = FCC2_MEM_OFFSET, | ||
97 | |||
98 | .rx_ring = 32, | ||
99 | .tx_ring = 32, | ||
100 | .rx_copybreak = 240, | ||
101 | .use_napi = 0, | ||
102 | .napi_weight = 17, | ||
103 | .bus_id = "0:03", | ||
104 | }, | ||
105 | }; | ||
106 | |||
107 | static void init_fcc1_ioports(struct fs_platform_info* pdata) | ||
108 | { | ||
109 | struct io_port *io; | ||
110 | u32 tempval; | ||
111 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | ||
112 | u32 *bcsr = ioremap(BCSR_ADDR+4, sizeof(u32)); | ||
113 | |||
114 | io = &immap->im_ioport; | ||
115 | |||
116 | /* Enable the PHY */ | ||
117 | clrbits32(bcsr, BCSR1_FETHIEN); | ||
118 | setbits32(bcsr, BCSR1_FETH_RST); | ||
119 | |||
120 | /* FCC1 pins are on port A/C. */ | ||
121 | /* Configure port A and C pins for FCC1 Ethernet. */ | ||
122 | |||
123 | tempval = in_be32(&io->iop_pdira); | ||
124 | tempval &= ~PA1_DIRA0; | ||
125 | tempval |= PA1_DIRA1; | ||
126 | out_be32(&io->iop_pdira, tempval); | ||
127 | |||
128 | tempval = in_be32(&io->iop_psora); | ||
129 | tempval &= ~PA1_PSORA0; | ||
130 | tempval |= PA1_PSORA1; | ||
131 | out_be32(&io->iop_psora, tempval); | ||
132 | |||
133 | setbits32(&io->iop_ppara,PA1_DIRA0 | PA1_DIRA1); | ||
134 | |||
135 | /* Alter clocks */ | ||
136 | tempval = PC_F1TXCLK|PC_F1RXCLK; | ||
137 | |||
138 | clrbits32(&io->iop_psorc, tempval); | ||
139 | clrbits32(&io->iop_pdirc, tempval); | ||
140 | setbits32(&io->iop_pparc, tempval); | ||
141 | |||
142 | clrbits32(&immap->im_cpmux.cmx_fcr, CMX1_CLK_MASK); | ||
143 | setbits32(&immap->im_cpmux.cmx_fcr, CMX1_CLK_ROUTE); | ||
144 | iounmap(bcsr); | ||
145 | iounmap(immap); | ||
146 | } | ||
147 | |||
148 | static void init_fcc2_ioports(struct fs_platform_info* pdata) | ||
149 | { | ||
150 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | ||
151 | u32 *bcsr = ioremap(BCSR_ADDR+12, sizeof(u32)); | ||
152 | |||
153 | struct io_port *io; | ||
154 | u32 tempval; | ||
155 | |||
156 | immap = cpm2_immr; | ||
157 | |||
158 | io = &immap->im_ioport; | ||
159 | |||
160 | /* Enable the PHY */ | ||
161 | clrbits32(bcsr, BCSR3_FETHIEN2); | ||
162 | setbits32(bcsr, BCSR3_FETH2_RST); | ||
163 | |||
164 | /* FCC2 are port B/C. */ | ||
165 | /* Configure port A and C pins for FCC2 Ethernet. */ | ||
166 | |||
167 | tempval = in_be32(&io->iop_pdirb); | ||
168 | tempval &= ~PB2_DIRB0; | ||
169 | tempval |= PB2_DIRB1; | ||
170 | out_be32(&io->iop_pdirb, tempval); | ||
171 | |||
172 | tempval = in_be32(&io->iop_psorb); | ||
173 | tempval &= ~PB2_PSORB0; | ||
174 | tempval |= PB2_PSORB1; | ||
175 | out_be32(&io->iop_psorb, tempval); | ||
176 | |||
177 | setbits32(&io->iop_pparb,PB2_DIRB0 | PB2_DIRB1); | ||
178 | |||
179 | tempval = PC_F2RXCLK|PC_F2TXCLK; | ||
180 | |||
181 | /* Alter clocks */ | ||
182 | clrbits32(&io->iop_psorc,tempval); | ||
183 | clrbits32(&io->iop_pdirc,tempval); | ||
184 | setbits32(&io->iop_pparc,tempval); | ||
185 | |||
186 | clrbits32(&immap->im_cpmux.cmx_fcr, CMX2_CLK_MASK); | ||
187 | setbits32(&immap->im_cpmux.cmx_fcr, CMX2_CLK_ROUTE); | ||
188 | |||
189 | iounmap(bcsr); | ||
190 | iounmap(immap); | ||
191 | } | ||
192 | |||
193 | |||
194 | static void __init mpc8272ads_fixup_enet_pdata(struct platform_device *pdev, | ||
195 | int idx) | ||
196 | { | ||
197 | bd_t* bi = (void*)__res; | ||
198 | int fs_no = fsid_fcc1+pdev->id-1; | ||
199 | |||
200 | if(fs_no >= ARRAY_SIZE(mpc82xx_enet_pdata)) { | ||
201 | return; | ||
202 | } | ||
203 | |||
204 | mpc82xx_enet_pdata[fs_no].dpram_offset= | ||
205 | (u32)cpm2_immr->im_dprambase; | ||
206 | mpc82xx_enet_pdata[fs_no].fcc_regs_c = | ||
207 | (u32)cpm2_immr->im_fcc_c; | ||
208 | memcpy(&mpc82xx_enet_pdata[fs_no].macaddr,bi->bi_enetaddr,6); | ||
209 | |||
210 | /* prevent dup mac */ | ||
211 | if(fs_no == fsid_fcc2) | ||
212 | mpc82xx_enet_pdata[fs_no].macaddr[5] ^= 1; | ||
213 | |||
214 | pdev->dev.platform_data = &mpc82xx_enet_pdata[fs_no]; | ||
215 | } | ||
216 | |||
217 | static void mpc8272ads_fixup_uart_pdata(struct platform_device *pdev, | ||
218 | int idx) | ||
219 | { | ||
220 | bd_t *bd = (bd_t *) __res; | ||
221 | struct fs_uart_platform_info *pinfo; | ||
222 | int num = ARRAY_SIZE(mpc8272_uart_pdata); | ||
223 | int id = fs_uart_id_scc2fsid(idx); | ||
224 | |||
225 | /* no need to alter anything if console */ | ||
226 | if ((id < num) && (!pdev->dev.platform_data)) { | ||
227 | pinfo = &mpc8272_uart_pdata[id]; | ||
228 | pinfo->uart_clk = bd->bi_intfreq; | ||
229 | pdev->dev.platform_data = pinfo; | ||
230 | } | ||
231 | } | ||
232 | |||
233 | static void init_scc1_uart_ioports(struct fs_uart_platform_info* pdata) | ||
234 | { | ||
235 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | ||
236 | |||
237 | /* SCC1 is only on port D */ | ||
238 | setbits32(&immap->im_ioport.iop_ppard,0x00000003); | ||
239 | clrbits32(&immap->im_ioport.iop_psord,0x00000001); | ||
240 | setbits32(&immap->im_ioport.iop_psord,0x00000002); | ||
241 | clrbits32(&immap->im_ioport.iop_pdird,0x00000001); | ||
242 | setbits32(&immap->im_ioport.iop_pdird,0x00000002); | ||
243 | |||
244 | /* Wire BRG1 to SCC1 */ | ||
245 | clrbits32(&immap->im_cpmux.cmx_scr,0x00ffffff); | ||
246 | |||
247 | iounmap(immap); | ||
248 | } | ||
249 | |||
250 | static void init_scc4_uart_ioports(struct fs_uart_platform_info* pdata) | ||
251 | { | ||
252 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | ||
253 | |||
254 | setbits32(&immap->im_ioport.iop_ppard,0x00000600); | ||
255 | clrbits32(&immap->im_ioport.iop_psord,0x00000600); | ||
256 | clrbits32(&immap->im_ioport.iop_pdird,0x00000200); | ||
257 | setbits32(&immap->im_ioport.iop_pdird,0x00000400); | ||
258 | |||
259 | /* Wire BRG4 to SCC4 */ | ||
260 | clrbits32(&immap->im_cpmux.cmx_scr,0x000000ff); | ||
261 | setbits32(&immap->im_cpmux.cmx_scr,0x0000001b); | ||
262 | |||
263 | iounmap(immap); | ||
264 | } | ||
265 | |||
266 | static void __init mpc8272ads_fixup_mdio_pdata(struct platform_device *pdev, | ||
267 | int idx) | ||
268 | { | ||
269 | m82xx_mii_bb_pdata.irq[0] = PHY_INTERRUPT; | ||
270 | m82xx_mii_bb_pdata.irq[1] = PHY_POLL; | ||
271 | m82xx_mii_bb_pdata.irq[2] = PHY_POLL; | ||
272 | m82xx_mii_bb_pdata.irq[3] = PHY_INTERRUPT; | ||
273 | m82xx_mii_bb_pdata.irq[31] = PHY_POLL; | ||
274 | |||
275 | |||
276 | m82xx_mii_bb_pdata.mdio_dat.offset = | ||
277 | (u32)&cpm2_immr->im_ioport.iop_pdatc; | ||
278 | |||
279 | m82xx_mii_bb_pdata.mdio_dir.offset = | ||
280 | (u32)&cpm2_immr->im_ioport.iop_pdirc; | ||
281 | |||
282 | m82xx_mii_bb_pdata.mdc_dat.offset = | ||
283 | (u32)&cpm2_immr->im_ioport.iop_pdatc; | ||
284 | |||
285 | |||
286 | pdev->dev.platform_data = &m82xx_mii_bb_pdata; | ||
287 | } | ||
288 | |||
289 | static int mpc8272ads_platform_notify(struct device *dev) | ||
290 | { | ||
291 | static const struct platform_notify_dev_map dev_map[] = { | ||
292 | { | ||
293 | .bus_id = "fsl-cpm-fcc", | ||
294 | .rtn = mpc8272ads_fixup_enet_pdata, | ||
295 | }, | ||
296 | { | ||
297 | .bus_id = "fsl-cpm-scc:uart", | ||
298 | .rtn = mpc8272ads_fixup_uart_pdata, | ||
299 | }, | ||
300 | { | ||
301 | .bus_id = "fsl-bb-mdio", | ||
302 | .rtn = mpc8272ads_fixup_mdio_pdata, | ||
303 | }, | ||
304 | { | ||
305 | .bus_id = NULL | ||
306 | } | ||
307 | }; | ||
308 | platform_notify_map(dev_map,dev); | ||
309 | |||
310 | return 0; | ||
311 | |||
312 | } | ||
313 | |||
314 | int __init mpc8272ads_init(void) | ||
315 | { | ||
316 | printk(KERN_NOTICE "mpc8272ads: Init\n"); | ||
317 | |||
318 | platform_notify = mpc8272ads_platform_notify; | ||
319 | |||
320 | ppc_sys_device_initfunc(); | ||
321 | |||
322 | ppc_sys_device_disable_all(); | ||
323 | ppc_sys_device_enable(MPC82xx_CPM_FCC1); | ||
324 | ppc_sys_device_enable(MPC82xx_CPM_FCC2); | ||
325 | |||
326 | /* to be ready for console, let's attach pdata here */ | ||
327 | #ifdef CONFIG_SERIAL_CPM_SCC1 | ||
328 | ppc_sys_device_setfunc(MPC82xx_CPM_SCC1, PPC_SYS_FUNC_UART); | ||
329 | ppc_sys_device_enable(MPC82xx_CPM_SCC1); | ||
330 | |||
331 | #endif | ||
332 | |||
333 | #ifdef CONFIG_SERIAL_CPM_SCC4 | ||
334 | ppc_sys_device_setfunc(MPC82xx_CPM_SCC4, PPC_SYS_FUNC_UART); | ||
335 | ppc_sys_device_enable(MPC82xx_CPM_SCC4); | ||
336 | #endif | ||
337 | |||
338 | ppc_sys_device_enable(MPC82xx_MDIO_BB); | ||
339 | |||
340 | return 0; | ||
341 | } | ||
342 | |||
343 | /* | ||
344 | To prevent confusion, console selection is gross: | ||
345 | by 0 assumed SCC1 and by 1 assumed SCC4 | ||
346 | */ | ||
347 | struct platform_device* early_uart_get_pdev(int index) | ||
348 | { | ||
349 | bd_t *bd = (bd_t *) __res; | ||
350 | struct fs_uart_platform_info *pinfo; | ||
351 | |||
352 | struct platform_device* pdev = NULL; | ||
353 | if(index) { /*assume SCC4 here*/ | ||
354 | pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC4]; | ||
355 | pinfo = &mpc8272_uart_pdata[fsid_scc4_uart]; | ||
356 | } else { /*over SCC1*/ | ||
357 | pdev = &ppc_sys_platform_devices[MPC82xx_CPM_SCC1]; | ||
358 | pinfo = &mpc8272_uart_pdata[fsid_scc1_uart]; | ||
359 | } | ||
360 | |||
361 | pinfo->uart_clk = bd->bi_intfreq; | ||
362 | pdev->dev.platform_data = pinfo; | ||
363 | ppc_sys_fixup_mem_resource(pdev, CPM_MAP_ADDR); | ||
364 | return NULL; | ||
365 | } | ||
366 | |||
367 | arch_initcall(mpc8272ads_init); | ||
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/platforms/pq2ads.c b/arch/ppc/platforms/pq2ads.c deleted file mode 100644 index 7fc2e02f524..00000000000 --- a/arch/ppc/platforms/pq2ads.c +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | /* | ||
2 | * PQ2ADS platform support | ||
3 | * | ||
4 | * Author: Kumar Gala <galak@kernel.crashing.org> | ||
5 | * Derived from: est8260_setup.c by Allen Curtis | ||
6 | * | ||
7 | * Copyright 2004 Freescale Semiconductor, Inc. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of the GNU General Public License as published by the | ||
11 | * Free Software Foundation; either version 2 of the License, or (at your | ||
12 | * option) any later version. | ||
13 | */ | ||
14 | |||
15 | #include <linux/init.h> | ||
16 | |||
17 | #include <asm/io.h> | ||
18 | #include <asm/mpc8260.h> | ||
19 | #include <asm/cpm2.h> | ||
20 | #include <asm/immap_cpm2.h> | ||
21 | |||
22 | void __init | ||
23 | m82xx_board_setup(void) | ||
24 | { | ||
25 | cpm2_map_t* immap = ioremap(CPM_MAP_ADDR, sizeof(cpm2_map_t)); | ||
26 | u32 *bcsr = ioremap(BCSR_ADDR+4, sizeof(u32)); | ||
27 | |||
28 | /* Enable the 2nd UART port */ | ||
29 | clrbits32(bcsr, BCSR1_RS232_EN2); | ||
30 | |||
31 | #ifdef CONFIG_SERIAL_CPM_SCC1 | ||
32 | clrbits32((u32*)&immap->im_scc[0].scc_sccm, UART_SCCM_TX | UART_SCCM_RX); | ||
33 | clrbits32((u32*)&immap->im_scc[0].scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | ||
34 | #endif | ||
35 | |||
36 | #ifdef CONFIG_SERIAL_CPM_SCC2 | ||
37 | clrbits32((u32*)&immap->im_scc[1].scc_sccm, UART_SCCM_TX | UART_SCCM_RX); | ||
38 | clrbits32((u32*)&immap->im_scc[1].scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | ||
39 | #endif | ||
40 | |||
41 | #ifdef CONFIG_SERIAL_CPM_SCC3 | ||
42 | clrbits32((u32*)&immap->im_scc[2].scc_sccm, UART_SCCM_TX | UART_SCCM_RX); | ||
43 | clrbits32((u32*)&immap->im_scc[2].scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | ||
44 | #endif | ||
45 | |||
46 | #ifdef CONFIG_SERIAL_CPM_SCC4 | ||
47 | clrbits32((u32*)&immap->im_scc[3].scc_sccm, UART_SCCM_TX | UART_SCCM_RX); | ||
48 | clrbits32((u32*)&immap->im_scc[3].scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT); | ||
49 | #endif | ||
50 | |||
51 | iounmap(bcsr); | ||
52 | iounmap(immap); | ||
53 | } | ||
diff --git a/arch/ppc/platforms/pq2ads.h b/arch/ppc/platforms/pq2ads.h deleted file mode 100644 index 2b287f4e0ca..00000000000 --- a/arch/ppc/platforms/pq2ads.h +++ /dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | /* | ||
2 | * A collection of structures, addresses, and values associated with | ||
3 | * the Motorola MPC8260ADS/MPC8266ADS-PCI boards. | ||
4 | * Copied from the RPX-Classic and SBS8260 stuff. | ||
5 | * | ||
6 | * Copyright (c) 2001 Dan Malek (dan@mvista.com) | ||
7 | */ | ||
8 | #ifdef __KERNEL__ | ||
9 | #ifndef __MACH_ADS8260_DEFS | ||
10 | #define __MACH_ADS8260_DEFS | ||
11 | |||
12 | |||
13 | #include <asm/ppcboot.h> | ||
14 | |||
15 | #if defined(CONFIG_ADS8272) | ||
16 | #define BOARD_CHIP_NAME "8272" | ||
17 | #endif | ||
18 | |||
19 | /* Memory map is configured by the PROM startup. | ||
20 | * We just map a few things we need. The CSR is actually 4 byte-wide | ||
21 | * registers that can be accessed as 8-, 16-, or 32-bit values. | ||
22 | */ | ||
23 | #define CPM_MAP_ADDR ((uint)0xf0000000) | ||
24 | #define BCSR_ADDR ((uint)0xf4500000) | ||
25 | #define BCSR_SIZE ((uint)(32 * 1024)) | ||
26 | |||
27 | #define BOOTROM_RESTART_ADDR ((uint)0xff000104) | ||
28 | |||
29 | /* For our show_cpuinfo hooks. */ | ||
30 | #define CPUINFO_VENDOR "Motorola" | ||
31 | #define CPUINFO_MACHINE "PQ2 ADS PowerPC" | ||
32 | |||
33 | /* The ADS8260 has 16, 32-bit wide control/status registers, accessed | ||
34 | * only on word boundaries. | ||
35 | * Not all are used (yet), or are interesting to us (yet). | ||
36 | */ | ||
37 | |||
38 | /* Things of interest in the CSR. | ||
39 | */ | ||
40 | #define BCSR0_LED0 ((uint)0x02000000) /* 0 == on */ | ||
41 | #define BCSR0_LED1 ((uint)0x01000000) /* 0 == on */ | ||
42 | #define BCSR1_FETHIEN ((uint)0x08000000) /* 0 == enable */ | ||
43 | #define BCSR1_FETH_RST ((uint)0x04000000) /* 0 == reset */ | ||
44 | #define BCSR1_RS232_EN1 ((uint)0x02000000) /* 0 == enable */ | ||
45 | #define BCSR1_RS232_EN2 ((uint)0x01000000) /* 0 == enable */ | ||
46 | #define BCSR3_FETHIEN2 ((uint)0x10000000) /* 0 == enable */ | ||
47 | #define BCSR3_FETH2_RST ((uint)0x80000000) /* 0 == reset */ | ||
48 | |||
49 | #define PHY_INTERRUPT SIU_INT_IRQ7 | ||
50 | |||
51 | #ifdef CONFIG_PCI | ||
52 | /* PCI interrupt controller */ | ||
53 | #define PCI_INT_STAT_REG 0xF8200000 | ||
54 | #define PCI_INT_MASK_REG 0xF8200004 | ||
55 | #define PIRQA (NR_CPM_INTS + 0) | ||
56 | #define PIRQB (NR_CPM_INTS + 1) | ||
57 | #define PIRQC (NR_CPM_INTS + 2) | ||
58 | #define PIRQD (NR_CPM_INTS + 3) | ||
59 | |||
60 | /* | ||
61 | * PCI memory map definitions for MPC8266ADS-PCI. | ||
62 | * | ||
63 | * processor view | ||
64 | * local address PCI address target | ||
65 | * 0x80000000-0x9FFFFFFF 0x80000000-0x9FFFFFFF PCI mem with prefetch | ||
66 | * 0xA0000000-0xBFFFFFFF 0xA0000000-0xBFFFFFFF PCI mem w/o prefetch | ||
67 | * 0xF4000000-0xF7FFFFFF 0x00000000-0x03FFFFFF PCI IO | ||
68 | * | ||
69 | * PCI master view | ||
70 | * local address PCI address target | ||
71 | * 0x00000000-0x1FFFFFFF 0x00000000-0x1FFFFFFF MPC8266 local memory | ||
72 | */ | ||
73 | |||
74 | /* All the other PCI memory map definitions reside at syslib/m82xx_pci.h | ||
75 | Here we should redefine what is unique for this board */ | ||
76 | #define M82xx_PCI_SLAVE_MEM_LOCAL 0x00000000 /* Local base */ | ||
77 | #define M82xx_PCI_SLAVE_MEM_BUS 0x00000000 /* PCI base */ | ||
78 | #define M82xx_PCI_SLAVE_MEM_SIZE 0x10000000 /* 256 Mb */ | ||
79 | |||
80 | #define M82xx_PCI_SLAVE_SEC_WND_SIZE ~(0x40000000 - 1U) /* 2 x 512Mb */ | ||
81 | #define M82xx_PCI_SLAVE_SEC_WND_BASE 0x80000000 /* PCI Memory base */ | ||
82 | |||
83 | #if defined(CONFIG_ADS8272) | ||
84 | #define PCI_INT_TO_SIU SIU_INT_IRQ2 | ||
85 | #elif defined(CONFIG_PQ2FADS) | ||
86 | #define PCI_INT_TO_SIU SIU_INT_IRQ6 | ||
87 | #else | ||
88 | #warning PCI Bridge will be without interrupts support | ||
89 | #endif | ||
90 | |||
91 | #endif /* CONFIG_PCI */ | ||
92 | |||
93 | #endif /* __MACH_ADS8260_DEFS */ | ||
94 | #endif /* __KERNEL__ */ | ||
diff --git a/arch/ppc/platforms/pq2ads_pd.h b/arch/ppc/platforms/pq2ads_pd.h deleted file mode 100644 index 672483df807..00000000000 --- a/arch/ppc/platforms/pq2ads_pd.h +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | #ifndef __PQ2ADS_PD_H | ||
2 | #define __PQ2ADS_PD_H | ||
3 | /* | ||
4 | * arch/ppc/platforms/82xx/pq2ads_pd.h | ||
5 | * | ||
6 | * Some defines for MPC82xx board-specific PlatformDevice descriptions | ||
7 | * | ||
8 | * 2005 (c) MontaVista Software, Inc. | ||
9 | * Vitaly Bordug <vbordug@ru.mvista.com> | ||
10 | * | ||
11 | * This file is licensed under the terms of the GNU General Public License | ||
12 | * version 2. This program is licensed "as is" without any warranty of any | ||
13 | * kind, whether express or implied. | ||
14 | */ | ||
15 | |||
16 | /* FCC1 Clock Source Configuration. These can be redefined in the board specific file. | ||
17 | Can only choose from CLK9-12 */ | ||
18 | |||
19 | #define F1_RXCLK 11 | ||
20 | #define F1_TXCLK 10 | ||
21 | |||
22 | /* FCC2 Clock Source Configuration. These can be redefined in the board specific file. | ||
23 | Can only choose from CLK13-16 */ | ||
24 | #define F2_RXCLK 15 | ||
25 | #define F2_TXCLK 16 | ||
26 | |||
27 | /* FCC3 Clock Source Configuration. These can be redefined in the board specific file. | ||
28 | Can only choose from CLK13-16 */ | ||
29 | #define F3_RXCLK 13 | ||
30 | #define F3_TXCLK 14 | ||
31 | |||
32 | #endif | ||
diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c index 46588fa9438..b40583724de 100644 --- a/arch/ppc/syslib/m8260_setup.c +++ b/arch/ppc/syslib/m8260_setup.c | |||
@@ -175,12 +175,6 @@ m8260_init_IRQ(void) | |||
175 | * in case the boot rom changed something on us. | 175 | * in case the boot rom changed something on us. |
176 | */ | 176 | */ |
177 | cpm2_immr->im_intctl.ic_siprr = 0x05309770; | 177 | cpm2_immr->im_intctl.ic_siprr = 0x05309770; |
178 | |||
179 | #if defined(CONFIG_PCI) && (defined(CONFIG_ADS8272) || defined(CONFIG_PQ2FADS)) | ||
180 | /* Initialize stuff for the 82xx CPLD IC and install demux */ | ||
181 | pq2pci_init_irq(); | ||
182 | #endif | ||
183 | |||
184 | } | 178 | } |
185 | 179 | ||
186 | /* | 180 | /* |
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c index fe860d52e2e..657a1c25a2a 100644 --- a/arch/ppc/syslib/m82xx_pci.c +++ b/arch/ppc/syslib/m82xx_pci.c | |||
@@ -150,14 +150,6 @@ pq2pci_init_irq(void) | |||
150 | { | 150 | { |
151 | int irq; | 151 | int irq; |
152 | volatile cpm2_map_t *immap = cpm2_immr; | 152 | volatile cpm2_map_t *immap = cpm2_immr; |
153 | #if defined CONFIG_ADS8272 | ||
154 | /* configure chip select for PCI interrupt controller */ | ||
155 | immap->im_memctl.memc_br3 = PCI_INT_STAT_REG | 0x00001801; | ||
156 | immap->im_memctl.memc_or3 = 0xffff8010; | ||
157 | #elif defined CONFIG_PQ2FADS | ||
158 | immap->im_memctl.memc_br8 = PCI_INT_STAT_REG | 0x00001801; | ||
159 | immap->im_memctl.memc_or8 = 0xffff8010; | ||
160 | #endif | ||
161 | for (irq = NR_CPM_INTS; irq < NR_CPM_INTS + 4; irq++) | 153 | for (irq = NR_CPM_INTS; irq < NR_CPM_INTS + 4; irq++) |
162 | irq_desc[irq].chip = &pq2pci_ic; | 154 | irq_desc[irq].chip = &pq2pci_ic; |
163 | 155 | ||
@@ -222,26 +214,6 @@ pq2ads_setup_pci(struct pci_controller *hose) | |||
222 | immap->im_memctl.memc_pcibr1 = M82xx_PCI_SEC_WND_BASE | PCIBR_ENABLE; | 214 | immap->im_memctl.memc_pcibr1 = M82xx_PCI_SEC_WND_BASE | PCIBR_ENABLE; |
223 | #endif | 215 | #endif |
224 | 216 | ||
225 | #if defined CONFIG_ADS8272 | ||
226 | immap->im_siu_conf.siu_82xx.sc_siumcr = | ||
227 | (immap->im_siu_conf.siu_82xx.sc_siumcr & | ||
228 | ~(SIUMCR_BBD | SIUMCR_ESE | SIUMCR_PBSE | | ||
229 | SIUMCR_CDIS | SIUMCR_DPPC11 | SIUMCR_L2CPC11 | | ||
230 | SIUMCR_LBPC11 | SIUMCR_APPC11 | | ||
231 | SIUMCR_CS10PC11 | SIUMCR_BCTLC11 | SIUMCR_MMR11)) | | ||
232 | SIUMCR_DPPC11 | SIUMCR_L2CPC01 | SIUMCR_LBPC00 | | ||
233 | SIUMCR_APPC10 | SIUMCR_CS10PC00 | | ||
234 | SIUMCR_BCTLC00 | SIUMCR_MMR11 ; | ||
235 | |||
236 | #elif defined CONFIG_PQ2FADS | ||
237 | /* | ||
238 | * Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]), | ||
239 | * and local bus for PCI (SIUMCR [LBPC]). | ||
240 | */ | ||
241 | immap->im_siu_conf.siu_82xx.sc_siumcr = (immap->im_siu_conf.siu_82xx.sc_siumcr & | ||
242 | ~(SIUMCR_L2CPC11 | SIUMCR_LBPC11 | SIUMCR_CS10PC11 | SIUMCR_APPC11) | | ||
243 | SIUMCR_BBD | SIUMCR_LBPC01 | SIUMCR_DPPC11 | SIUMCR_APPC10); | ||
244 | #endif | ||
245 | /* Enable PCI */ | 217 | /* Enable PCI */ |
246 | immap->im_pci.pci_gcr = cpu_to_le32(PCIGCR_PCI_BUS_EN); | 218 | immap->im_pci.pci_gcr = cpu_to_le32(PCIGCR_PCI_BUS_EN); |
247 | 219 | ||
@@ -284,12 +256,6 @@ pq2ads_setup_pci(struct pci_controller *hose) | |||
284 | immap->im_pci.pci_pibar0 = cpu_to_le32(M82xx_PCI_SLAVE_MEM_BUS >> PITA_ADDR_SHIFT); | 256 | immap->im_pci.pci_pibar0 = cpu_to_le32(M82xx_PCI_SLAVE_MEM_BUS >> PITA_ADDR_SHIFT); |
285 | immap->im_pci.pci_pitar0 = cpu_to_le32(M82xx_PCI_SLAVE_MEM_LOCAL>> PITA_ADDR_SHIFT); | 257 | immap->im_pci.pci_pitar0 = cpu_to_le32(M82xx_PCI_SLAVE_MEM_LOCAL>> PITA_ADDR_SHIFT); |
286 | 258 | ||
287 | #if defined CONFIG_ADS8272 | ||
288 | /* PCI int highest prio */ | ||
289 | immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x01236745; | ||
290 | #elif defined CONFIG_PQ2FADS | ||
291 | immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x03124567; | ||
292 | #endif | ||
293 | /* park bus on PCI */ | 259 | /* park bus on PCI */ |
294 | immap->im_siu_conf.siu_82xx.sc_ppc_acr = PPC_ACR_BUS_PARK_PCI; | 260 | immap->im_siu_conf.siu_82xx.sc_ppc_acr = PPC_ACR_BUS_PARK_PCI; |
295 | 261 | ||
@@ -320,10 +286,6 @@ void __init pq2_find_bridges(void) | |||
320 | hose->bus_offset = 0; | 286 | hose->bus_offset = 0; |
321 | hose->last_busno = 0xff; | 287 | hose->last_busno = 0xff; |
322 | 288 | ||
323 | #ifdef CONFIG_ADS8272 | ||
324 | hose->set_cfg_type = 1; | ||
325 | #endif | ||
326 | |||
327 | setup_m8260_indirect_pci(hose, | 289 | setup_m8260_indirect_pci(hose, |
328 | (unsigned long)&cpm2_immr->im_pci.pci_cfg_addr, | 290 | (unsigned long)&cpm2_immr->im_pci.pci_cfg_addr, |
329 | (unsigned long)&cpm2_immr->im_pci.pci_cfg_data); | 291 | (unsigned long)&cpm2_immr->im_pci.pci_cfg_data); |
diff --git a/arch/ppc/syslib/m8xx_setup.c b/arch/ppc/syslib/m8xx_setup.c index 19749e9bcf9..18da720fc1b 100644 --- a/arch/ppc/syslib/m8xx_setup.c +++ b/arch/ppc/syslib/m8xx_setup.c | |||
@@ -141,16 +141,6 @@ m8xx_setup_arch(void) | |||
141 | #endif | 141 | #endif |
142 | #endif | 142 | #endif |
143 | 143 | ||
144 | #if defined (CONFIG_MPC86XADS) || defined (CONFIG_MPC885ADS) | ||
145 | #if defined(CONFIG_MTD_PHYSMAP) | ||
146 | physmap_configure(binfo->bi_flashstart, binfo->bi_flashsize, | ||
147 | MPC8xxADS_BANK_WIDTH, NULL); | ||
148 | #ifdef CONFIG_MTD_PARTITIONS | ||
149 | physmap_set_partitions(mpc8xxads_partitions, mpc8xxads_part_num); | ||
150 | #endif /* CONFIG_MTD_PARTITIONS */ | ||
151 | #endif /* CONFIG_MTD_PHYSMAP */ | ||
152 | #endif | ||
153 | |||
154 | board_init(); | 144 | board_init(); |
155 | } | 145 | } |
156 | 146 | ||