diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 15:57:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-24 15:57:45 -0500 |
commit | 756fe285070feb254a770cefc5640fe005ea9c27 (patch) | |
tree | c391c039bc8ef7ec6958017413aba250210e9af6 | |
parent | eec74a410fafd32c8f832d47dc196006ade68d05 (diff) | |
parent | ed5a35acbb48d512332a53565e6341c65eecfa29 (diff) |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
VIDEO: cyberpro: pci_request_regions needs a persistent name
ARM: dma-isa: request cascade channel after registering it
ARM: footbridge: trim down old ISA rtc setup
ARM: fix PAGE_KERNEL
ARM: Fix wrong shared bit for CPU write buffer bug test
ARM: 5857/1: ARM: dmabounce: fix build
ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900
ARM: 5855/1: putc support for nuc900
ARM: 5854/1: fix compiling error for NUC900
ARM: 5849/1: ARMv7: fix Oprofile events count
ARM: add missing include to nwflash.c
ARM: Kill CONFIG_CPU_32
ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread()
ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
182 files changed, 320 insertions, 553 deletions
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index bc90364a96c7..cc32c1e54a59 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c | |||
@@ -312,7 +312,7 @@ static inline void unmap_single(struct device *dev, dma_addr_t dma_addr, | |||
312 | * we need to ensure that the data will be coherent | 312 | * we need to ensure that the data will be coherent |
313 | * with user mappings. | 313 | * with user mappings. |
314 | */ | 314 | */ |
315 | __cpuc_flush_kernel_dcache_area(ptr, size); | 315 | __cpuc_flush_dcache_area(ptr, size); |
316 | } | 316 | } |
317 | free_safe_buffer(dev->archdata.dmabounce, buf); | 317 | free_safe_buffer(dev->archdata.dmabounce, buf); |
318 | } | 318 | } |
diff --git a/arch/arm/configs/acs5k_defconfig b/arch/arm/configs/acs5k_defconfig index 1cab4e79d368..6e32a85641a7 100644 --- a/arch/arm/configs/acs5k_defconfig +++ b/arch/arm/configs/acs5k_defconfig | |||
@@ -187,7 +187,6 @@ CONFIG_MACH_ACS5K=y | |||
187 | # | 187 | # |
188 | # Processor Type | 188 | # Processor Type |
189 | # | 189 | # |
190 | CONFIG_CPU_32=y | ||
191 | CONFIG_CPU_ARM922T=y | 190 | CONFIG_CPU_ARM922T=y |
192 | CONFIG_CPU_32v4T=y | 191 | CONFIG_CPU_32v4T=y |
193 | CONFIG_CPU_ABRT_EV4T=y | 192 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/acs5k_tiny_defconfig b/arch/arm/configs/acs5k_tiny_defconfig index 8e3d084afd78..b34b1eabac3b 100644 --- a/arch/arm/configs/acs5k_tiny_defconfig +++ b/arch/arm/configs/acs5k_tiny_defconfig | |||
@@ -186,7 +186,6 @@ CONFIG_MACH_ACS5K=y | |||
186 | # | 186 | # |
187 | # Processor Type | 187 | # Processor Type |
188 | # | 188 | # |
189 | CONFIG_CPU_32=y | ||
190 | CONFIG_CPU_ARM922T=y | 189 | CONFIG_CPU_ARM922T=y |
191 | CONFIG_CPU_32v4T=y | 190 | CONFIG_CPU_32v4T=y |
192 | CONFIG_CPU_ABRT_EV4T=y | 191 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/afeb9260_defconfig b/arch/arm/configs/afeb9260_defconfig index f7a272cb3da0..64fe7f10c12a 100644 --- a/arch/arm/configs/afeb9260_defconfig +++ b/arch/arm/configs/afeb9260_defconfig | |||
@@ -227,7 +227,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
227 | # | 227 | # |
228 | # Processor Type | 228 | # Processor Type |
229 | # | 229 | # |
230 | CONFIG_CPU_32=y | ||
231 | CONFIG_CPU_ARM926T=y | 230 | CONFIG_CPU_ARM926T=y |
232 | CONFIG_CPU_32v5=y | 231 | CONFIG_CPU_32v5=y |
233 | CONFIG_CPU_ABRT_EV5TJ=y | 232 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig index 5e68420f4680..30927cac6a9a 100644 --- a/arch/arm/configs/am200epdkit_defconfig +++ b/arch/arm/configs/am200epdkit_defconfig | |||
@@ -189,7 +189,6 @@ CONFIG_PXA25x=y | |||
189 | # | 189 | # |
190 | # Processor Type | 190 | # Processor Type |
191 | # | 191 | # |
192 | CONFIG_CPU_32=y | ||
193 | CONFIG_CPU_XSCALE=y | 192 | CONFIG_CPU_XSCALE=y |
194 | CONFIG_CPU_32v5=y | 193 | CONFIG_CPU_32v5=y |
195 | CONFIG_CPU_ABRT_EV5T=y | 194 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/am3517_evm_defconfig b/arch/arm/configs/am3517_evm_defconfig index ad54e92dd436..abe9966781ce 100644 --- a/arch/arm/configs/am3517_evm_defconfig +++ b/arch/arm/configs/am3517_evm_defconfig | |||
@@ -233,7 +233,6 @@ CONFIG_MACH_OMAP3517EVM=y | |||
233 | # | 233 | # |
234 | # Processor Type | 234 | # Processor Type |
235 | # | 235 | # |
236 | CONFIG_CPU_32=y | ||
237 | CONFIG_CPU_32v6K=y | 236 | CONFIG_CPU_32v6K=y |
238 | CONFIG_CPU_V7=y | 237 | CONFIG_CPU_V7=y |
239 | CONFIG_CPU_32v7=y | 238 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/ams_delta_defconfig b/arch/arm/configs/ams_delta_defconfig index e8f7380b67d6..3b3a3775bbf4 100644 --- a/arch/arm/configs/ams_delta_defconfig +++ b/arch/arm/configs/ams_delta_defconfig | |||
@@ -210,7 +210,6 @@ CONFIG_OMAP_ARM_150MHZ=y | |||
210 | # | 210 | # |
211 | # Processor Type | 211 | # Processor Type |
212 | # | 212 | # |
213 | CONFIG_CPU_32=y | ||
214 | CONFIG_CPU_ARM925T=y | 213 | CONFIG_CPU_ARM925T=y |
215 | CONFIG_CPU_32v4T=y | 214 | CONFIG_CPU_32v4T=y |
216 | CONFIG_CPU_ABRT_EV4T=y | 215 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/assabet_defconfig b/arch/arm/configs/assabet_defconfig index c66dd399e426..daa75bc98d46 100644 --- a/arch/arm/configs/assabet_defconfig +++ b/arch/arm/configs/assabet_defconfig | |||
@@ -101,7 +101,6 @@ CONFIG_SA1100_ASSABET=y | |||
101 | # | 101 | # |
102 | # Processor Type | 102 | # Processor Type |
103 | # | 103 | # |
104 | CONFIG_CPU_32=y | ||
105 | CONFIG_CPU_SA1100=y | 104 | CONFIG_CPU_SA1100=y |
106 | CONFIG_CPU_32v4=y | 105 | CONFIG_CPU_32v4=y |
107 | CONFIG_CPU_ABRT_EV4=y | 106 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/at91cap9adk_defconfig b/arch/arm/configs/at91cap9adk_defconfig index bc6bd9f6174d..b1ab50bee461 100644 --- a/arch/arm/configs/at91cap9adk_defconfig +++ b/arch/arm/configs/at91cap9adk_defconfig | |||
@@ -181,7 +181,6 @@ CONFIG_AT91_TIMER_HZ=100 | |||
181 | # | 181 | # |
182 | # Processor Type | 182 | # Processor Type |
183 | # | 183 | # |
184 | CONFIG_CPU_32=y | ||
185 | CONFIG_CPU_ARM926T=y | 184 | CONFIG_CPU_ARM926T=y |
186 | CONFIG_CPU_32v5=y | 185 | CONFIG_CPU_32v5=y |
187 | CONFIG_CPU_ABRT_EV5TJ=y | 186 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig index c97e1022ada1..1fffec86a113 100644 --- a/arch/arm/configs/at91rm9200dk_defconfig +++ b/arch/arm/configs/at91rm9200dk_defconfig | |||
@@ -130,7 +130,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | |||
130 | # | 130 | # |
131 | # Processor Type | 131 | # Processor Type |
132 | # | 132 | # |
133 | CONFIG_CPU_32=y | ||
134 | CONFIG_CPU_ARM920T=y | 133 | CONFIG_CPU_ARM920T=y |
135 | CONFIG_CPU_32v4=y | 134 | CONFIG_CPU_32v4=y |
136 | CONFIG_CPU_ABRT_EV4T=y | 135 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index 9f7a99ace514..c846a795d1d5 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig | |||
@@ -129,7 +129,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | |||
129 | # | 129 | # |
130 | # Processor Type | 130 | # Processor Type |
131 | # | 131 | # |
132 | CONFIG_CPU_32=y | ||
133 | CONFIG_CPU_ARM920T=y | 132 | CONFIG_CPU_ARM920T=y |
134 | CONFIG_CPU_32v4=y | 133 | CONFIG_CPU_32v4=y |
135 | CONFIG_CPU_ABRT_EV4T=y | 134 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/at91sam9260ek_defconfig b/arch/arm/configs/at91sam9260ek_defconfig index 98e2f3de4bc5..472ea11eedf1 100644 --- a/arch/arm/configs/at91sam9260ek_defconfig +++ b/arch/arm/configs/at91sam9260ek_defconfig | |||
@@ -188,7 +188,6 @@ CONFIG_AT91_TIMER_HZ=100 | |||
188 | # | 188 | # |
189 | # Processor Type | 189 | # Processor Type |
190 | # | 190 | # |
191 | CONFIG_CPU_32=y | ||
192 | CONFIG_CPU_ARM926T=y | 191 | CONFIG_CPU_ARM926T=y |
193 | CONFIG_CPU_32v5=y | 192 | CONFIG_CPU_32v5=y |
194 | CONFIG_CPU_ABRT_EV5TJ=y | 193 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/at91sam9261ek_defconfig b/arch/arm/configs/at91sam9261ek_defconfig index 149456142392..4ecde429cf15 100644 --- a/arch/arm/configs/at91sam9261ek_defconfig +++ b/arch/arm/configs/at91sam9261ek_defconfig | |||
@@ -181,7 +181,6 @@ CONFIG_AT91_TIMER_HZ=100 | |||
181 | # | 181 | # |
182 | # Processor Type | 182 | # Processor Type |
183 | # | 183 | # |
184 | CONFIG_CPU_32=y | ||
185 | CONFIG_CPU_ARM926T=y | 184 | CONFIG_CPU_ARM926T=y |
186 | CONFIG_CPU_32v5=y | 185 | CONFIG_CPU_32v5=y |
187 | CONFIG_CPU_ABRT_EV5TJ=y | 186 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/at91sam9263ek_defconfig b/arch/arm/configs/at91sam9263ek_defconfig index 21599f3c6275..9b792b60c7ff 100644 --- a/arch/arm/configs/at91sam9263ek_defconfig +++ b/arch/arm/configs/at91sam9263ek_defconfig | |||
@@ -181,7 +181,6 @@ CONFIG_AT91_TIMER_HZ=100 | |||
181 | # | 181 | # |
182 | # Processor Type | 182 | # Processor Type |
183 | # | 183 | # |
184 | CONFIG_CPU_32=y | ||
185 | CONFIG_CPU_ARM926T=y | 184 | CONFIG_CPU_ARM926T=y |
186 | CONFIG_CPU_32v5=y | 185 | CONFIG_CPU_32v5=y |
187 | CONFIG_CPU_ABRT_EV5TJ=y | 186 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig index 7e018a04c31b..64ce106d53eb 100644 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ b/arch/arm/configs/at91sam9g20ek_defconfig | |||
@@ -187,7 +187,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
187 | # | 187 | # |
188 | # Processor Type | 188 | # Processor Type |
189 | # | 189 | # |
190 | CONFIG_CPU_32=y | ||
191 | CONFIG_CPU_ARM926T=y | 190 | CONFIG_CPU_ARM926T=y |
192 | CONFIG_CPU_32v5=y | 191 | CONFIG_CPU_32v5=y |
193 | CONFIG_CPU_ABRT_EV5TJ=y | 192 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/at91sam9rlek_defconfig b/arch/arm/configs/at91sam9rlek_defconfig index e2df81a3e804..90e48bfda16f 100644 --- a/arch/arm/configs/at91sam9rlek_defconfig +++ b/arch/arm/configs/at91sam9rlek_defconfig | |||
@@ -179,7 +179,6 @@ CONFIG_AT91_TIMER_HZ=100 | |||
179 | # | 179 | # |
180 | # Processor Type | 180 | # Processor Type |
181 | # | 181 | # |
182 | CONFIG_CPU_32=y | ||
183 | CONFIG_CPU_ARM926T=y | 182 | CONFIG_CPU_ARM926T=y |
184 | CONFIG_CPU_32v5=y | 183 | CONFIG_CPU_32v5=y |
185 | CONFIG_CPU_ABRT_EV5TJ=y | 184 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/ateb9200_defconfig b/arch/arm/configs/ateb9200_defconfig index a19e824cf7f8..6315534976cf 100644 --- a/arch/arm/configs/ateb9200_defconfig +++ b/arch/arm/configs/ateb9200_defconfig | |||
@@ -132,7 +132,6 @@ CONFIG_MACH_ATEB9200=y | |||
132 | # | 132 | # |
133 | # Processor Type | 133 | # Processor Type |
134 | # | 134 | # |
135 | CONFIG_CPU_32=y | ||
136 | CONFIG_CPU_ARM920T=y | 135 | CONFIG_CPU_ARM920T=y |
137 | CONFIG_CPU_32v4=y | 136 | CONFIG_CPU_32v4=y |
138 | CONFIG_CPU_ABRT_EV4T=y | 137 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/badge4_defconfig b/arch/arm/configs/badge4_defconfig index f264846218a2..b175b6b8feb4 100644 --- a/arch/arm/configs/badge4_defconfig +++ b/arch/arm/configs/badge4_defconfig | |||
@@ -103,7 +103,6 @@ CONFIG_SA1100_BADGE4=y | |||
103 | # | 103 | # |
104 | # Processor Type | 104 | # Processor Type |
105 | # | 105 | # |
106 | CONFIG_CPU_32=y | ||
107 | CONFIG_CPU_SA1100=y | 106 | CONFIG_CPU_SA1100=y |
108 | CONFIG_CPU_32v4=y | 107 | CONFIG_CPU_32v4=y |
109 | CONFIG_CPU_ABRT_EV4=y | 108 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/bcmring_defconfig b/arch/arm/configs/bcmring_defconfig index bcc0bac551a5..1e12167c89b7 100644 --- a/arch/arm/configs/bcmring_defconfig +++ b/arch/arm/configs/bcmring_defconfig | |||
@@ -181,7 +181,6 @@ CONFIG_BCM_ZRELADDR=0x8000 | |||
181 | # | 181 | # |
182 | # Processor Type | 182 | # Processor Type |
183 | # | 183 | # |
184 | CONFIG_CPU_32=y | ||
185 | CONFIG_CPU_V6=y | 184 | CONFIG_CPU_V6=y |
186 | CONFIG_CPU_32v6K=y | 185 | CONFIG_CPU_32v6K=y |
187 | CONFIG_CPU_32v6=y | 186 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/cam60_defconfig b/arch/arm/configs/cam60_defconfig index 8448108347cf..eef33de3ca12 100644 --- a/arch/arm/configs/cam60_defconfig +++ b/arch/arm/configs/cam60_defconfig | |||
@@ -196,7 +196,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
196 | # | 196 | # |
197 | # Processor Type | 197 | # Processor Type |
198 | # | 198 | # |
199 | CONFIG_CPU_32=y | ||
200 | CONFIG_CPU_ARM926T=y | 199 | CONFIG_CPU_ARM926T=y |
201 | CONFIG_CPU_32v5=y | 200 | CONFIG_CPU_32v5=y |
202 | CONFIG_CPU_ABRT_EV5TJ=y | 201 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/carmeva_defconfig b/arch/arm/configs/carmeva_defconfig index d392833b31fb..b6a706306781 100644 --- a/arch/arm/configs/carmeva_defconfig +++ b/arch/arm/configs/carmeva_defconfig | |||
@@ -97,7 +97,6 @@ CONFIG_MACH_CARMEVA=y | |||
97 | # | 97 | # |
98 | # Processor Type | 98 | # Processor Type |
99 | # | 99 | # |
100 | CONFIG_CPU_32=y | ||
101 | CONFIG_CPU_ARM920T=y | 100 | CONFIG_CPU_ARM920T=y |
102 | CONFIG_CPU_32v4=y | 101 | CONFIG_CPU_32v4=y |
103 | CONFIG_CPU_ABRT_EV4T=y | 102 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig index 2b4c0668b1b4..d662cab9cc21 100644 --- a/arch/arm/configs/cerfcube_defconfig +++ b/arch/arm/configs/cerfcube_defconfig | |||
@@ -105,7 +105,6 @@ CONFIG_SA1100_CERF_FLASH_16MB=y | |||
105 | # | 105 | # |
106 | # Processor Type | 106 | # Processor Type |
107 | # | 107 | # |
108 | CONFIG_CPU_32=y | ||
109 | CONFIG_CPU_SA1100=y | 108 | CONFIG_CPU_SA1100=y |
110 | CONFIG_CPU_32v4=y | 109 | CONFIG_CPU_32v4=y |
111 | CONFIG_CPU_ABRT_EV4=y | 110 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/cm_t35_defconfig b/arch/arm/configs/cm_t35_defconfig index e42c5c873eb2..893cd267e075 100644 --- a/arch/arm/configs/cm_t35_defconfig +++ b/arch/arm/configs/cm_t35_defconfig | |||
@@ -236,7 +236,6 @@ CONFIG_MACH_CM_T35=y | |||
236 | # | 236 | # |
237 | # Processor Type | 237 | # Processor Type |
238 | # | 238 | # |
239 | CONFIG_CPU_32=y | ||
240 | CONFIG_CPU_32v6K=y | 239 | CONFIG_CPU_32v6K=y |
241 | CONFIG_CPU_V7=y | 240 | CONFIG_CPU_V7=y |
242 | CONFIG_CPU_32v7=y | 241 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/cm_x2xx_defconfig b/arch/arm/configs/cm_x2xx_defconfig index 797b790cba78..47d22d09e70e 100644 --- a/arch/arm/configs/cm_x2xx_defconfig +++ b/arch/arm/configs/cm_x2xx_defconfig | |||
@@ -205,7 +205,6 @@ CONFIG_PXA_SSP=y | |||
205 | # | 205 | # |
206 | # Processor Type | 206 | # Processor Type |
207 | # | 207 | # |
208 | CONFIG_CPU_32=y | ||
209 | CONFIG_CPU_XSCALE=y | 208 | CONFIG_CPU_XSCALE=y |
210 | CONFIG_CPU_32v5=y | 209 | CONFIG_CPU_32v5=y |
211 | CONFIG_CPU_ABRT_EV5T=y | 210 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index a0170867130e..a334069c7904 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig | |||
@@ -247,7 +247,6 @@ CONFIG_PLAT_PXA=y | |||
247 | # | 247 | # |
248 | # Processor Type | 248 | # Processor Type |
249 | # | 249 | # |
250 | CONFIG_CPU_32=y | ||
251 | CONFIG_CPU_XSC3=y | 250 | CONFIG_CPU_XSC3=y |
252 | CONFIG_CPU_32v5=y | 251 | CONFIG_CPU_32v5=y |
253 | CONFIG_CPU_ABRT_EV5T=y | 252 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig index 4cf3bde1c522..c962870b3f85 100644 --- a/arch/arm/configs/colibri_pxa270_defconfig +++ b/arch/arm/configs/colibri_pxa270_defconfig | |||
@@ -204,7 +204,6 @@ CONFIG_PXA27x=y | |||
204 | # | 204 | # |
205 | # Processor Type | 205 | # Processor Type |
206 | # | 206 | # |
207 | CONFIG_CPU_32=y | ||
208 | CONFIG_CPU_XSCALE=y | 207 | CONFIG_CPU_XSCALE=y |
209 | CONFIG_CPU_32v5=y | 208 | CONFIG_CPU_32v5=y |
210 | CONFIG_CPU_ABRT_EV5T=y | 209 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig index 4774a36fa740..11fdb5afdec7 100644 --- a/arch/arm/configs/colibri_pxa300_defconfig +++ b/arch/arm/configs/colibri_pxa300_defconfig | |||
@@ -212,7 +212,6 @@ CONFIG_PXA3xx=y | |||
212 | # | 212 | # |
213 | # Processor Type | 213 | # Processor Type |
214 | # | 214 | # |
215 | CONFIG_CPU_32=y | ||
216 | CONFIG_CPU_XSC3=y | 215 | CONFIG_CPU_XSC3=y |
217 | CONFIG_CPU_32v5=y | 216 | CONFIG_CPU_32v5=y |
218 | CONFIG_CPU_ABRT_EV5T=y | 217 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/collie_defconfig b/arch/arm/configs/collie_defconfig index 1aa62249031b..26e458d82634 100644 --- a/arch/arm/configs/collie_defconfig +++ b/arch/arm/configs/collie_defconfig | |||
@@ -125,7 +125,6 @@ CONFIG_SA1100_COLLIE=y | |||
125 | # | 125 | # |
126 | # Processor Type | 126 | # Processor Type |
127 | # | 127 | # |
128 | CONFIG_CPU_32=y | ||
129 | CONFIG_CPU_SA1100=y | 128 | CONFIG_CPU_SA1100=y |
130 | CONFIG_CPU_32v4=y | 129 | CONFIG_CPU_32v4=y |
131 | CONFIG_CPU_ABRT_EV4=y | 130 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index d6cd165e9310..5e4069f42754 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig | |||
@@ -214,7 +214,6 @@ CONFIG_PXA_HAVE_BOARD_IRQS=y | |||
214 | # | 214 | # |
215 | # Processor Type | 215 | # Processor Type |
216 | # | 216 | # |
217 | CONFIG_CPU_32=y | ||
218 | CONFIG_CPU_XSCALE=y | 217 | CONFIG_CPU_XSCALE=y |
219 | CONFIG_CPU_32v5=y | 218 | CONFIG_CPU_32v5=y |
220 | CONFIG_CPU_ABRT_EV5T=y | 219 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/cpu9260_defconfig b/arch/arm/configs/cpu9260_defconfig index 601e7f3d5e97..c9137aaf23a9 100644 --- a/arch/arm/configs/cpu9260_defconfig +++ b/arch/arm/configs/cpu9260_defconfig | |||
@@ -229,7 +229,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
229 | # | 229 | # |
230 | # Processor Type | 230 | # Processor Type |
231 | # | 231 | # |
232 | CONFIG_CPU_32=y | ||
233 | CONFIG_CPU_ARM926T=y | 232 | CONFIG_CPU_ARM926T=y |
234 | CONFIG_CPU_32v5=y | 233 | CONFIG_CPU_32v5=y |
235 | CONFIG_CPU_ABRT_EV5TJ=y | 234 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/cpu9g20_defconfig b/arch/arm/configs/cpu9g20_defconfig index b5b9cbbc6977..d2344799171a 100644 --- a/arch/arm/configs/cpu9g20_defconfig +++ b/arch/arm/configs/cpu9g20_defconfig | |||
@@ -219,7 +219,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
219 | # | 219 | # |
220 | # Processor Type | 220 | # Processor Type |
221 | # | 221 | # |
222 | CONFIG_CPU_32=y | ||
223 | CONFIG_CPU_ARM926T=y | 222 | CONFIG_CPU_ARM926T=y |
224 | CONFIG_CPU_32v5=y | 223 | CONFIG_CPU_32v5=y |
225 | CONFIG_CPU_ABRT_EV5TJ=y | 224 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/cpuat91_defconfig b/arch/arm/configs/cpuat91_defconfig index 4901827253fb..1f8dda6e37c3 100644 --- a/arch/arm/configs/cpuat91_defconfig +++ b/arch/arm/configs/cpuat91_defconfig | |||
@@ -230,7 +230,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
230 | # | 230 | # |
231 | # Processor Type | 231 | # Processor Type |
232 | # | 232 | # |
233 | CONFIG_CPU_32=y | ||
234 | CONFIG_CPU_ARM920T=y | 233 | CONFIG_CPU_ARM920T=y |
235 | CONFIG_CPU_32v4T=y | 234 | CONFIG_CPU_32v4T=y |
236 | CONFIG_CPU_ABRT_EV4T=y | 235 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig index 29f68c2effe6..f095040dab07 100644 --- a/arch/arm/configs/csb337_defconfig +++ b/arch/arm/configs/csb337_defconfig | |||
@@ -193,7 +193,6 @@ CONFIG_AT91_TIMER_HZ=128 | |||
193 | # | 193 | # |
194 | # Processor Type | 194 | # Processor Type |
195 | # | 195 | # |
196 | CONFIG_CPU_32=y | ||
197 | CONFIG_CPU_ARM920T=y | 196 | CONFIG_CPU_ARM920T=y |
198 | CONFIG_CPU_32v4T=y | 197 | CONFIG_CPU_32v4T=y |
199 | CONFIG_CPU_ABRT_EV4T=y | 198 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/csb637_defconfig b/arch/arm/configs/csb637_defconfig index f7b60ceed6c7..507154016fc8 100644 --- a/arch/arm/configs/csb637_defconfig +++ b/arch/arm/configs/csb637_defconfig | |||
@@ -215,7 +215,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
215 | # | 215 | # |
216 | # Processor Type | 216 | # Processor Type |
217 | # | 217 | # |
218 | CONFIG_CPU_32=y | ||
219 | CONFIG_CPU_ARM920T=y | 218 | CONFIG_CPU_ARM920T=y |
220 | CONFIG_CPU_32v4T=y | 219 | CONFIG_CPU_32v4T=y |
221 | CONFIG_CPU_ABRT_EV4T=y | 220 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig index 50bd25a10f0d..e14c99c2b574 100644 --- a/arch/arm/configs/da8xx_omapl_defconfig +++ b/arch/arm/configs/da8xx_omapl_defconfig | |||
@@ -225,7 +225,6 @@ CONFIG_DAVINCI_RESET_CLOCKS=y | |||
225 | # | 225 | # |
226 | # Processor Type | 226 | # Processor Type |
227 | # | 227 | # |
228 | CONFIG_CPU_32=y | ||
229 | CONFIG_CPU_ARM926T=y | 228 | CONFIG_CPU_ARM926T=y |
230 | CONFIG_CPU_32v5=y | 229 | CONFIG_CPU_32v5=y |
231 | CONFIG_CPU_ABRT_EV5TJ=y | 230 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index bd656e8e6e4c..625035fd0a6c 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig | |||
@@ -223,7 +223,6 @@ CONFIG_DAVINCI_RESET_CLOCKS=y | |||
223 | # | 223 | # |
224 | # Processor Type | 224 | # Processor Type |
225 | # | 225 | # |
226 | CONFIG_CPU_32=y | ||
227 | CONFIG_CPU_ARM926T=y | 226 | CONFIG_CPU_ARM926T=y |
228 | CONFIG_CPU_32v5=y | 227 | CONFIG_CPU_32v5=y |
229 | CONFIG_CPU_ABRT_EV5TJ=y | 228 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index b3a491675d59..b7b2ab088dd9 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig | |||
@@ -186,7 +186,6 @@ CONFIG_PLAT_ORION=y | |||
186 | # | 186 | # |
187 | # Processor Type | 187 | # Processor Type |
188 | # | 188 | # |
189 | CONFIG_CPU_32=y | ||
190 | CONFIG_CPU_V6=y | 189 | CONFIG_CPU_V6=y |
191 | CONFIG_CPU_32v6K=y | 190 | CONFIG_CPU_32v6K=y |
192 | CONFIG_CPU_32v6=y | 191 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/ebsa110_defconfig b/arch/arm/configs/ebsa110_defconfig index afcfff6140f2..d5e827969118 100644 --- a/arch/arm/configs/ebsa110_defconfig +++ b/arch/arm/configs/ebsa110_defconfig | |||
@@ -83,7 +83,6 @@ CONFIG_ARCH_EBSA110=y | |||
83 | # | 83 | # |
84 | # Processor Type | 84 | # Processor Type |
85 | # | 85 | # |
86 | CONFIG_CPU_32=y | ||
87 | CONFIG_CPU_SA110=y | 86 | CONFIG_CPU_SA110=y |
88 | CONFIG_CPU_32v4=y | 87 | CONFIG_CPU_32v4=y |
89 | CONFIG_CPU_ABRT_EV4=y | 88 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/ecbat91_defconfig b/arch/arm/configs/ecbat91_defconfig index ca520733bdb0..25dd53b7cefd 100644 --- a/arch/arm/configs/ecbat91_defconfig +++ b/arch/arm/configs/ecbat91_defconfig | |||
@@ -186,7 +186,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | |||
186 | # | 186 | # |
187 | # Processor Type | 187 | # Processor Type |
188 | # | 188 | # |
189 | CONFIG_CPU_32=y | ||
190 | CONFIG_CPU_ARM920T=y | 189 | CONFIG_CPU_ARM920T=y |
191 | CONFIG_CPU_32v4T=y | 190 | CONFIG_CPU_32v4T=y |
192 | CONFIG_CPU_ABRT_EV4T=y | 191 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/edb7211_defconfig b/arch/arm/configs/edb7211_defconfig index 6ba7355ff85b..e3a6cd32669d 100644 --- a/arch/arm/configs/edb7211_defconfig +++ b/arch/arm/configs/edb7211_defconfig | |||
@@ -90,7 +90,6 @@ CONFIG_ARCH_EP7211=y | |||
90 | # | 90 | # |
91 | # Processor Type | 91 | # Processor Type |
92 | # | 92 | # |
93 | CONFIG_CPU_32=y | ||
94 | CONFIG_CPU_ARM720T=y | 93 | CONFIG_CPU_ARM720T=y |
95 | CONFIG_CPU_32v4=y | 94 | CONFIG_CPU_32v4=y |
96 | CONFIG_CPU_ABRT_LV4T=y | 95 | CONFIG_CPU_ABRT_LV4T=y |
diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig index e9955b786c80..2bee932439f6 100644 --- a/arch/arm/configs/em_x270_defconfig +++ b/arch/arm/configs/em_x270_defconfig | |||
@@ -202,7 +202,6 @@ CONFIG_PXA_SSP=y | |||
202 | # | 202 | # |
203 | # Processor Type | 203 | # Processor Type |
204 | # | 204 | # |
205 | CONFIG_CPU_32=y | ||
206 | CONFIG_CPU_XSCALE=y | 205 | CONFIG_CPU_XSCALE=y |
207 | CONFIG_CPU_32v5=y | 206 | CONFIG_CPU_32v5=y |
208 | CONFIG_CPU_ABRT_EV5T=y | 207 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/ep93xx_defconfig b/arch/arm/configs/ep93xx_defconfig index 3fb083b81b0a..35d735ede9b8 100644 --- a/arch/arm/configs/ep93xx_defconfig +++ b/arch/arm/configs/ep93xx_defconfig | |||
@@ -198,7 +198,6 @@ CONFIG_EP93XX_EARLY_UART1=y | |||
198 | # | 198 | # |
199 | # Processor Type | 199 | # Processor Type |
200 | # | 200 | # |
201 | CONFIG_CPU_32=y | ||
202 | CONFIG_CPU_ARM920T=y | 201 | CONFIG_CPU_ARM920T=y |
203 | CONFIG_CPU_32v4T=y | 202 | CONFIG_CPU_32v4T=y |
204 | CONFIG_CPU_ABRT_EV4T=y | 203 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/eseries_pxa_defconfig b/arch/arm/configs/eseries_pxa_defconfig index b6c5cbbf4c85..74baf5709290 100644 --- a/arch/arm/configs/eseries_pxa_defconfig +++ b/arch/arm/configs/eseries_pxa_defconfig | |||
@@ -203,7 +203,6 @@ CONFIG_PXA_HAVE_BOARD_IRQS=y | |||
203 | # | 203 | # |
204 | # Processor Type | 204 | # Processor Type |
205 | # | 205 | # |
206 | CONFIG_CPU_32=y | ||
207 | CONFIG_CPU_XSCALE=y | 206 | CONFIG_CPU_XSCALE=y |
208 | CONFIG_CPU_32v5=y | 207 | CONFIG_CPU_32v5=y |
209 | CONFIG_CPU_ABRT_EV5T=y | 208 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index 492f29aba332..9e9057c5a2a3 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig | |||
@@ -240,7 +240,6 @@ CONFIG_PLAT_PXA=y | |||
240 | # | 240 | # |
241 | # Processor Type | 241 | # Processor Type |
242 | # | 242 | # |
243 | CONFIG_CPU_32=y | ||
244 | CONFIG_CPU_XSCALE=y | 243 | CONFIG_CPU_XSCALE=y |
245 | CONFIG_CPU_32v5=y | 244 | CONFIG_CPU_32v5=y |
246 | CONFIG_CPU_ABRT_EV5T=y | 245 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/footbridge_defconfig b/arch/arm/configs/footbridge_defconfig index 6ace512fa101..04d97937afe2 100644 --- a/arch/arm/configs/footbridge_defconfig +++ b/arch/arm/configs/footbridge_defconfig | |||
@@ -95,7 +95,6 @@ CONFIG_ARCH_EBSA285=y | |||
95 | # | 95 | # |
96 | # Processor Type | 96 | # Processor Type |
97 | # | 97 | # |
98 | CONFIG_CPU_32=y | ||
99 | CONFIG_CPU_SA110=y | 98 | CONFIG_CPU_SA110=y |
100 | CONFIG_CPU_32v4=y | 99 | CONFIG_CPU_32v4=y |
101 | CONFIG_CPU_ABRT_EV4=y | 100 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/fortunet_defconfig b/arch/arm/configs/fortunet_defconfig index 65dc73a88c43..d58142bf6fa1 100644 --- a/arch/arm/configs/fortunet_defconfig +++ b/arch/arm/configs/fortunet_defconfig | |||
@@ -88,7 +88,6 @@ CONFIG_ARCH_FORTUNET=y | |||
88 | # | 88 | # |
89 | # Processor Type | 89 | # Processor Type |
90 | # | 90 | # |
91 | CONFIG_CPU_32=y | ||
92 | CONFIG_CPU_ARM720T=y | 91 | CONFIG_CPU_ARM720T=y |
93 | CONFIG_CPU_32v4=y | 92 | CONFIG_CPU_32v4=y |
94 | CONFIG_CPU_ABRT_LV4T=y | 93 | CONFIG_CPU_ABRT_LV4T=y |
diff --git a/arch/arm/configs/h3600_defconfig b/arch/arm/configs/h3600_defconfig index efa78e144e5c..a8ad8fbe1188 100644 --- a/arch/arm/configs/h3600_defconfig +++ b/arch/arm/configs/h3600_defconfig | |||
@@ -205,7 +205,6 @@ CONFIG_SA1100_H3600=y | |||
205 | # | 205 | # |
206 | # Processor Type | 206 | # Processor Type |
207 | # | 207 | # |
208 | CONFIG_CPU_32=y | ||
209 | CONFIG_CPU_SA1100=y | 208 | CONFIG_CPU_SA1100=y |
210 | CONFIG_CPU_32v4=y | 209 | CONFIG_CPU_32v4=y |
211 | CONFIG_CPU_ABRT_EV4=y | 210 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig index 649baa370495..5bb73728fad6 100644 --- a/arch/arm/configs/h5000_defconfig +++ b/arch/arm/configs/h5000_defconfig | |||
@@ -206,7 +206,6 @@ CONFIG_PXA25x=y | |||
206 | # | 206 | # |
207 | # Processor Type | 207 | # Processor Type |
208 | # | 208 | # |
209 | CONFIG_CPU_32=y | ||
210 | CONFIG_CPU_XSCALE=y | 209 | CONFIG_CPU_XSCALE=y |
211 | CONFIG_CPU_32v5=y | 210 | CONFIG_CPU_32v5=y |
212 | CONFIG_CPU_ABRT_EV5T=y | 211 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/h7201_defconfig b/arch/arm/configs/h7201_defconfig index 116920aecef7..09a6c6a27bdc 100644 --- a/arch/arm/configs/h7201_defconfig +++ b/arch/arm/configs/h7201_defconfig | |||
@@ -87,7 +87,6 @@ CONFIG_CPU_H7201=y | |||
87 | # | 87 | # |
88 | # Processor Type | 88 | # Processor Type |
89 | # | 89 | # |
90 | CONFIG_CPU_32=y | ||
91 | CONFIG_CPU_ARM720T=y | 90 | CONFIG_CPU_ARM720T=y |
92 | CONFIG_CPU_32v4=y | 91 | CONFIG_CPU_32v4=y |
93 | CONFIG_CPU_ABRT_LV4T=y | 92 | CONFIG_CPU_ABRT_LV4T=y |
diff --git a/arch/arm/configs/h7202_defconfig b/arch/arm/configs/h7202_defconfig index 0e739af52713..fedc52bd22b3 100644 --- a/arch/arm/configs/h7202_defconfig +++ b/arch/arm/configs/h7202_defconfig | |||
@@ -91,7 +91,6 @@ CONFIG_CPU_H7202=y | |||
91 | # | 91 | # |
92 | # Processor Type | 92 | # Processor Type |
93 | # | 93 | # |
94 | CONFIG_CPU_32=y | ||
95 | CONFIG_CPU_ARM720T=y | 94 | CONFIG_CPU_ARM720T=y |
96 | CONFIG_CPU_32v4=y | 95 | CONFIG_CPU_32v4=y |
97 | CONFIG_CPU_ABRT_LV4T=y | 96 | CONFIG_CPU_ABRT_LV4T=y |
diff --git a/arch/arm/configs/hackkit_defconfig b/arch/arm/configs/hackkit_defconfig index db0708d5cbea..2da1acf41f4b 100644 --- a/arch/arm/configs/hackkit_defconfig +++ b/arch/arm/configs/hackkit_defconfig | |||
@@ -103,7 +103,6 @@ CONFIG_SA1100_HACKKIT=y | |||
103 | # | 103 | # |
104 | # Processor Type | 104 | # Processor Type |
105 | # | 105 | # |
106 | CONFIG_CPU_32=y | ||
107 | CONFIG_CPU_SA1100=y | 106 | CONFIG_CPU_SA1100=y |
108 | CONFIG_CPU_32v4=y | 107 | CONFIG_CPU_32v4=y |
109 | CONFIG_CPU_ABRT_EV4=y | 108 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/htcherald_defconfig b/arch/arm/configs/htcherald_defconfig index 1b39691b816f..e0ef0d121aac 100644 --- a/arch/arm/configs/htcherald_defconfig +++ b/arch/arm/configs/htcherald_defconfig | |||
@@ -241,7 +241,6 @@ CONFIG_OMAP_ARM_195MHZ=y | |||
241 | # | 241 | # |
242 | # Processor Type | 242 | # Processor Type |
243 | # | 243 | # |
244 | CONFIG_CPU_32=y | ||
245 | CONFIG_CPU_ARM925T=y | 244 | CONFIG_CPU_ARM925T=y |
246 | CONFIG_CPU_ARM926T=y | 245 | CONFIG_CPU_ARM926T=y |
247 | CONFIG_CPU_32v4T=y | 246 | CONFIG_CPU_32v4T=y |
diff --git a/arch/arm/configs/igep0020_defconfig b/arch/arm/configs/igep0020_defconfig index c97f8d0ded48..a192248c6dd6 100644 --- a/arch/arm/configs/igep0020_defconfig +++ b/arch/arm/configs/igep0020_defconfig | |||
@@ -238,7 +238,6 @@ CONFIG_MACH_IGEP0020=y | |||
238 | # | 238 | # |
239 | # Processor Type | 239 | # Processor Type |
240 | # | 240 | # |
241 | CONFIG_CPU_32=y | ||
242 | CONFIG_CPU_32v6K=y | 241 | CONFIG_CPU_32v6K=y |
243 | CONFIG_CPU_V7=y | 242 | CONFIG_CPU_V7=y |
244 | CONFIG_CPU_32v7=y | 243 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index 3ce96e60b409..6b0d04395639 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig | |||
@@ -92,7 +92,6 @@ CONFIG_ARCH_INTEGRATOR_AP=y | |||
92 | # | 92 | # |
93 | # Processor Type | 93 | # Processor Type |
94 | # | 94 | # |
95 | CONFIG_CPU_32=y | ||
96 | CONFIG_CPU_ARM720T=y | 95 | CONFIG_CPU_ARM720T=y |
97 | CONFIG_CPU_ARM920T=y | 96 | CONFIG_CPU_ARM920T=y |
98 | # CONFIG_CPU_ARM922T is not set | 97 | # CONFIG_CPU_ARM922T is not set |
diff --git a/arch/arm/configs/iop13xx_defconfig b/arch/arm/configs/iop13xx_defconfig index 89c17761726b..3c040cc9f3b6 100644 --- a/arch/arm/configs/iop13xx_defconfig +++ b/arch/arm/configs/iop13xx_defconfig | |||
@@ -163,7 +163,6 @@ CONFIG_PLAT_IOP=y | |||
163 | # | 163 | # |
164 | # Processor Type | 164 | # Processor Type |
165 | # | 165 | # |
166 | CONFIG_CPU_32=y | ||
167 | CONFIG_CPU_XSC3=y | 166 | CONFIG_CPU_XSC3=y |
168 | CONFIG_CPU_32v5=y | 167 | CONFIG_CPU_32v5=y |
169 | CONFIG_CPU_ABRT_EV5T=y | 168 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/iop32x_defconfig b/arch/arm/configs/iop32x_defconfig index d70177b38f5f..62a854996be1 100644 --- a/arch/arm/configs/iop32x_defconfig +++ b/arch/arm/configs/iop32x_defconfig | |||
@@ -168,7 +168,6 @@ CONFIG_PLAT_IOP=y | |||
168 | # | 168 | # |
169 | # Processor Type | 169 | # Processor Type |
170 | # | 170 | # |
171 | CONFIG_CPU_32=y | ||
172 | CONFIG_CPU_XSCALE=y | 171 | CONFIG_CPU_XSCALE=y |
173 | CONFIG_CPU_32v5=y | 172 | CONFIG_CPU_32v5=y |
174 | CONFIG_CPU_ABRT_EV5T=y | 173 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/iop33x_defconfig b/arch/arm/configs/iop33x_defconfig index ed2d59d01829..0bc23ece4c2f 100644 --- a/arch/arm/configs/iop33x_defconfig +++ b/arch/arm/configs/iop33x_defconfig | |||
@@ -198,7 +198,6 @@ CONFIG_PLAT_IOP=y | |||
198 | # | 198 | # |
199 | # Processor Type | 199 | # Processor Type |
200 | # | 200 | # |
201 | CONFIG_CPU_32=y | ||
202 | CONFIG_CPU_XSCALE=y | 201 | CONFIG_CPU_XSCALE=y |
203 | CONFIG_CPU_32v5=y | 202 | CONFIG_CPU_32v5=y |
204 | CONFIG_CPU_ABRT_EV5T=y | 203 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/ixp2000_defconfig b/arch/arm/configs/ixp2000_defconfig index 57526c15e854..8b5b5764a228 100644 --- a/arch/arm/configs/ixp2000_defconfig +++ b/arch/arm/configs/ixp2000_defconfig | |||
@@ -151,7 +151,6 @@ CONFIG_ARCH_IXDP2X01=y | |||
151 | # | 151 | # |
152 | # Processor Type | 152 | # Processor Type |
153 | # | 153 | # |
154 | CONFIG_CPU_32=y | ||
155 | CONFIG_CPU_XSCALE=y | 154 | CONFIG_CPU_XSCALE=y |
156 | CONFIG_CPU_32v5=y | 155 | CONFIG_CPU_32v5=y |
157 | CONFIG_CPU_ABRT_EV5T=y | 156 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig index ef97561ed75b..59c11c93180f 100644 --- a/arch/arm/configs/ixp23xx_defconfig +++ b/arch/arm/configs/ixp23xx_defconfig | |||
@@ -145,7 +145,6 @@ CONFIG_MACH_ROADRUNNER=y | |||
145 | # | 145 | # |
146 | # Processor Type | 146 | # Processor Type |
147 | # | 147 | # |
148 | CONFIG_CPU_32=y | ||
149 | CONFIG_CPU_XSC3=y | 148 | CONFIG_CPU_XSC3=y |
150 | CONFIG_CPU_32v5=y | 149 | CONFIG_CPU_32v5=y |
151 | CONFIG_CPU_ABRT_EV5T=y | 150 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/ixp4xx_defconfig b/arch/arm/configs/ixp4xx_defconfig index 95cd8dfb5f1e..a907ad50ad33 100644 --- a/arch/arm/configs/ixp4xx_defconfig +++ b/arch/arm/configs/ixp4xx_defconfig | |||
@@ -189,7 +189,6 @@ CONFIG_IXP4XX_NPE=y | |||
189 | # | 189 | # |
190 | # Processor Type | 190 | # Processor Type |
191 | # | 191 | # |
192 | CONFIG_CPU_32=y | ||
193 | CONFIG_CPU_XSCALE=y | 192 | CONFIG_CPU_XSCALE=y |
194 | CONFIG_CPU_32v5=y | 193 | CONFIG_CPU_32v5=y |
195 | CONFIG_CPU_ABRT_EV5T=y | 194 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/jornada720_defconfig b/arch/arm/configs/jornada720_defconfig index df9bfbea8612..d1f1646e23c5 100644 --- a/arch/arm/configs/jornada720_defconfig +++ b/arch/arm/configs/jornada720_defconfig | |||
@@ -202,7 +202,6 @@ CONFIG_SA1100_SSP=y | |||
202 | # | 202 | # |
203 | # Processor Type | 203 | # Processor Type |
204 | # | 204 | # |
205 | CONFIG_CPU_32=y | ||
206 | CONFIG_CPU_SA1100=y | 205 | CONFIG_CPU_SA1100=y |
207 | CONFIG_CPU_32v4=y | 206 | CONFIG_CPU_32v4=y |
208 | CONFIG_CPU_ABRT_EV4=y | 207 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/kafa_defconfig b/arch/arm/configs/kafa_defconfig index 9f92fc527f59..f661e765d9ba 100644 --- a/arch/arm/configs/kafa_defconfig +++ b/arch/arm/configs/kafa_defconfig | |||
@@ -132,7 +132,6 @@ CONFIG_MACH_KAFA=y | |||
132 | # | 132 | # |
133 | # Processor Type | 133 | # Processor Type |
134 | # | 134 | # |
135 | CONFIG_CPU_32=y | ||
136 | CONFIG_CPU_ARM920T=y | 135 | CONFIG_CPU_ARM920T=y |
137 | CONFIG_CPU_32v4=y | 136 | CONFIG_CPU_32v4=y |
138 | CONFIG_CPU_ABRT_EV4T=y | 137 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/kb9202_defconfig b/arch/arm/configs/kb9202_defconfig index 605a8462f172..668ba59946d9 100644 --- a/arch/arm/configs/kb9202_defconfig +++ b/arch/arm/configs/kb9202_defconfig | |||
@@ -230,7 +230,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
230 | # | 230 | # |
231 | # Processor Type | 231 | # Processor Type |
232 | # | 232 | # |
233 | CONFIG_CPU_32=y | ||
234 | CONFIG_CPU_ARM920T=y | 233 | CONFIG_CPU_ARM920T=y |
235 | CONFIG_CPU_32v4T=y | 234 | CONFIG_CPU_32v4T=y |
236 | CONFIG_CPU_ABRT_EV4T=y | 235 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig index bcfade33bca9..5fc44c94b0ad 100644 --- a/arch/arm/configs/kirkwood_defconfig +++ b/arch/arm/configs/kirkwood_defconfig | |||
@@ -201,7 +201,6 @@ CONFIG_PLAT_ORION=y | |||
201 | # | 201 | # |
202 | # Processor Type | 202 | # Processor Type |
203 | # | 203 | # |
204 | CONFIG_CPU_32=y | ||
205 | CONFIG_CPU_FEROCEON=y | 204 | CONFIG_CPU_FEROCEON=y |
206 | # CONFIG_CPU_FEROCEON_OLD_ID is not set | 205 | # CONFIG_CPU_FEROCEON_OLD_ID is not set |
207 | CONFIG_CPU_32v5=y | 206 | CONFIG_CPU_32v5=y |
diff --git a/arch/arm/configs/ks8695_defconfig b/arch/arm/configs/ks8695_defconfig index d25c41bab06c..e6f2276904f2 100644 --- a/arch/arm/configs/ks8695_defconfig +++ b/arch/arm/configs/ks8695_defconfig | |||
@@ -186,7 +186,6 @@ CONFIG_MACH_DSM320=y | |||
186 | # | 186 | # |
187 | # Processor Type | 187 | # Processor Type |
188 | # | 188 | # |
189 | CONFIG_CPU_32=y | ||
190 | CONFIG_CPU_ARM922T=y | 189 | CONFIG_CPU_ARM922T=y |
191 | CONFIG_CPU_32v4T=y | 190 | CONFIG_CPU_32v4T=y |
192 | CONFIG_CPU_ABRT_EV4T=y | 191 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/lart_defconfig b/arch/arm/configs/lart_defconfig index 56ae56899d2e..af7595176939 100644 --- a/arch/arm/configs/lart_defconfig +++ b/arch/arm/configs/lart_defconfig | |||
@@ -99,7 +99,6 @@ CONFIG_SA1100_LART=y | |||
99 | # | 99 | # |
100 | # Processor Type | 100 | # Processor Type |
101 | # | 101 | # |
102 | CONFIG_CPU_32=y | ||
103 | CONFIG_CPU_SA1100=y | 102 | CONFIG_CPU_SA1100=y |
104 | CONFIG_CPU_32v4=y | 103 | CONFIG_CPU_32v4=y |
105 | CONFIG_CPU_ABRT_EV4=y | 104 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/loki_defconfig b/arch/arm/configs/loki_defconfig index b720fcffbcd4..6df7b147161c 100644 --- a/arch/arm/configs/loki_defconfig +++ b/arch/arm/configs/loki_defconfig | |||
@@ -174,7 +174,6 @@ CONFIG_PLAT_ORION=y | |||
174 | # | 174 | # |
175 | # Processor Type | 175 | # Processor Type |
176 | # | 176 | # |
177 | CONFIG_CPU_32=y | ||
178 | CONFIG_CPU_FEROCEON=y | 177 | CONFIG_CPU_FEROCEON=y |
179 | # CONFIG_CPU_FEROCEON_OLD_ID is not set | 178 | # CONFIG_CPU_FEROCEON_OLD_ID is not set |
180 | CONFIG_CPU_32v5=y | 179 | CONFIG_CPU_32v5=y |
diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig index 1a38d8e3fe66..aeb768615347 100644 --- a/arch/arm/configs/lpd270_defconfig +++ b/arch/arm/configs/lpd270_defconfig | |||
@@ -143,7 +143,6 @@ CONFIG_PXA27x=y | |||
143 | # | 143 | # |
144 | # Processor Type | 144 | # Processor Type |
145 | # | 145 | # |
146 | CONFIG_CPU_32=y | ||
147 | CONFIG_CPU_XSCALE=y | 146 | CONFIG_CPU_XSCALE=y |
148 | CONFIG_CPU_32v5=y | 147 | CONFIG_CPU_32v5=y |
149 | CONFIG_CPU_ABRT_EV5T=y | 148 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/lpd7a400_defconfig b/arch/arm/configs/lpd7a400_defconfig index f8ac29d5c654..6116feea2e12 100644 --- a/arch/arm/configs/lpd7a400_defconfig +++ b/arch/arm/configs/lpd7a400_defconfig | |||
@@ -95,7 +95,6 @@ CONFIG_LPD7A40X_CPLD_SSP=y | |||
95 | # | 95 | # |
96 | # Processor Type | 96 | # Processor Type |
97 | # | 97 | # |
98 | CONFIG_CPU_32=y | ||
99 | CONFIG_CPU_ARM922T=y | 98 | CONFIG_CPU_ARM922T=y |
100 | CONFIG_CPU_32v4=y | 99 | CONFIG_CPU_32v4=y |
101 | CONFIG_CPU_ABRT_EV4T=y | 100 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/lpd7a404_defconfig b/arch/arm/configs/lpd7a404_defconfig index 7a2e932da1c6..142cccdd971e 100644 --- a/arch/arm/configs/lpd7a404_defconfig +++ b/arch/arm/configs/lpd7a404_defconfig | |||
@@ -117,7 +117,6 @@ CONFIG_ARCH_LH7A404=y | |||
117 | # | 117 | # |
118 | # Processor Type | 118 | # Processor Type |
119 | # | 119 | # |
120 | CONFIG_CPU_32=y | ||
121 | CONFIG_CPU_ARM922T=y | 120 | CONFIG_CPU_ARM922T=y |
122 | CONFIG_CPU_32v4=y | 121 | CONFIG_CPU_32v4=y |
123 | CONFIG_CPU_ABRT_EV4T=y | 122 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig index e544bfbbde5d..75c6293376bb 100644 --- a/arch/arm/configs/lubbock_defconfig +++ b/arch/arm/configs/lubbock_defconfig | |||
@@ -92,7 +92,6 @@ CONFIG_PXA25x=y | |||
92 | # | 92 | # |
93 | # Processor Type | 93 | # Processor Type |
94 | # | 94 | # |
95 | CONFIG_CPU_32=y | ||
96 | CONFIG_CPU_XSCALE=y | 95 | CONFIG_CPU_XSCALE=y |
97 | CONFIG_CPU_32v5=y | 96 | CONFIG_CPU_32v5=y |
98 | CONFIG_CPU_ABRT_EV5T=y | 97 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/lusl7200_defconfig b/arch/arm/configs/lusl7200_defconfig index 42f6a77bc3c0..c1a1fb049a7c 100644 --- a/arch/arm/configs/lusl7200_defconfig +++ b/arch/arm/configs/lusl7200_defconfig | |||
@@ -82,7 +82,6 @@ CONFIG_ARCH_L7200=y | |||
82 | # | 82 | # |
83 | # Processor Type | 83 | # Processor Type |
84 | # | 84 | # |
85 | CONFIG_CPU_32=y | ||
86 | CONFIG_CPU_ARM720T=y | 85 | CONFIG_CPU_ARM720T=y |
87 | CONFIG_CPU_32v4=y | 86 | CONFIG_CPU_32v4=y |
88 | CONFIG_CPU_ABRT_LV4T=y | 87 | CONFIG_CPU_ABRT_LV4T=y |
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index 957fd5fa27ca..8e9a7232bc42 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig | |||
@@ -204,7 +204,6 @@ CONFIG_PXA_HAVE_BOARD_IRQS=y | |||
204 | # | 204 | # |
205 | # Processor Type | 205 | # Processor Type |
206 | # | 206 | # |
207 | CONFIG_CPU_32=y | ||
208 | CONFIG_CPU_XSCALE=y | 207 | CONFIG_CPU_XSCALE=y |
209 | CONFIG_CPU_32v5=y | 208 | CONFIG_CPU_32v5=y |
210 | CONFIG_CPU_ABRT_EV5T=y | 209 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig index cc8c95b99292..1cddb6178496 100644 --- a/arch/arm/configs/mainstone_defconfig +++ b/arch/arm/configs/mainstone_defconfig | |||
@@ -93,7 +93,6 @@ CONFIG_IWMMXT=y | |||
93 | # | 93 | # |
94 | # Processor Type | 94 | # Processor Type |
95 | # | 95 | # |
96 | CONFIG_CPU_32=y | ||
97 | CONFIG_CPU_XSCALE=y | 96 | CONFIG_CPU_XSCALE=y |
98 | CONFIG_CPU_32v5=y | 97 | CONFIG_CPU_32v5=y |
99 | CONFIG_CPU_ABRT_EV5T=y | 98 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/mini2440_defconfig b/arch/arm/configs/mini2440_defconfig index e49ed40f3be7..d2a90eb844a9 100644 --- a/arch/arm/configs/mini2440_defconfig +++ b/arch/arm/configs/mini2440_defconfig | |||
@@ -256,7 +256,6 @@ CONFIG_MACH_MINI2440=y | |||
256 | # | 256 | # |
257 | # Processor Type | 257 | # Processor Type |
258 | # | 258 | # |
259 | CONFIG_CPU_32=y | ||
260 | CONFIG_CPU_ARM920T=y | 259 | CONFIG_CPU_ARM920T=y |
261 | CONFIG_CPU_32v4T=y | 260 | CONFIG_CPU_32v4T=y |
262 | CONFIG_CPU_ABRT_EV4T=y | 261 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/msm_defconfig b/arch/arm/configs/msm_defconfig index cc3b06ee24f9..fe25e3b9a45a 100644 --- a/arch/arm/configs/msm_defconfig +++ b/arch/arm/configs/msm_defconfig | |||
@@ -155,7 +155,6 @@ CONFIG_MSM_SMD=y | |||
155 | # | 155 | # |
156 | # Processor Type | 156 | # Processor Type |
157 | # | 157 | # |
158 | CONFIG_CPU_32=y | ||
159 | CONFIG_CPU_V6=y | 158 | CONFIG_CPU_V6=y |
160 | # CONFIG_CPU_32v6K is not set | 159 | # CONFIG_CPU_32v6K is not set |
161 | CONFIG_CPU_32v6=y | 160 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig index 398274b0771a..6afa2c108eaa 100644 --- a/arch/arm/configs/mv78xx0_defconfig +++ b/arch/arm/configs/mv78xx0_defconfig | |||
@@ -181,7 +181,6 @@ CONFIG_PLAT_ORION=y | |||
181 | # | 181 | # |
182 | # Processor Type | 182 | # Processor Type |
183 | # | 183 | # |
184 | CONFIG_CPU_32=y | ||
185 | CONFIG_CPU_FEROCEON=y | 184 | CONFIG_CPU_FEROCEON=y |
186 | CONFIG_CPU_FEROCEON_OLD_ID=y | 185 | CONFIG_CPU_FEROCEON_OLD_ID=y |
187 | CONFIG_CPU_32v5=y | 186 | CONFIG_CPU_32v5=y |
diff --git a/arch/arm/configs/mx1_defconfig b/arch/arm/configs/mx1_defconfig index 0200d67e30ba..f5750703b707 100644 --- a/arch/arm/configs/mx1_defconfig +++ b/arch/arm/configs/mx1_defconfig | |||
@@ -190,7 +190,6 @@ CONFIG_MXC_IRQ_PRIOR=y | |||
190 | # | 190 | # |
191 | # Processor Type | 191 | # Processor Type |
192 | # | 192 | # |
193 | CONFIG_CPU_32=y | ||
194 | CONFIG_CPU_ARM920T=y | 193 | CONFIG_CPU_ARM920T=y |
195 | CONFIG_CPU_32v4T=y | 194 | CONFIG_CPU_32v4T=y |
196 | CONFIG_CPU_ABRT_EV4T=y | 195 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/mx1ads_defconfig b/arch/arm/configs/mx1ads_defconfig index 577d7e1b5d42..3cabbb6d9276 100644 --- a/arch/arm/configs/mx1ads_defconfig +++ b/arch/arm/configs/mx1ads_defconfig | |||
@@ -88,7 +88,6 @@ CONFIG_ARCH_MX1ADS=y | |||
88 | # | 88 | # |
89 | # Processor Type | 89 | # Processor Type |
90 | # | 90 | # |
91 | CONFIG_CPU_32=y | ||
92 | CONFIG_CPU_ARM920T=y | 91 | CONFIG_CPU_ARM920T=y |
93 | CONFIG_CPU_32v4=y | 92 | CONFIG_CPU_32v4=y |
94 | CONFIG_CPU_ABRT_EV4T=y | 93 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/mx21_defconfig b/arch/arm/configs/mx21_defconfig index 4b04290d8e81..1ecd6276e0f1 100644 --- a/arch/arm/configs/mx21_defconfig +++ b/arch/arm/configs/mx21_defconfig | |||
@@ -185,7 +185,6 @@ CONFIG_MXC_PWM=y | |||
185 | # | 185 | # |
186 | # Processor Type | 186 | # Processor Type |
187 | # | 187 | # |
188 | CONFIG_CPU_32=y | ||
189 | CONFIG_CPU_ARM926T=y | 188 | CONFIG_CPU_ARM926T=y |
190 | CONFIG_CPU_32v5=y | 189 | CONFIG_CPU_32v5=y |
191 | CONFIG_CPU_ABRT_EV5TJ=y | 190 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/mx27_defconfig b/arch/arm/configs/mx27_defconfig index 75263a83741c..edfdd6faf800 100644 --- a/arch/arm/configs/mx27_defconfig +++ b/arch/arm/configs/mx27_defconfig | |||
@@ -207,7 +207,6 @@ CONFIG_MXC_PWM=y | |||
207 | # | 207 | # |
208 | # Processor Type | 208 | # Processor Type |
209 | # | 209 | # |
210 | CONFIG_CPU_32=y | ||
211 | CONFIG_CPU_ARM926T=y | 210 | CONFIG_CPU_ARM926T=y |
212 | CONFIG_CPU_32v5=y | 211 | CONFIG_CPU_32v5=y |
213 | CONFIG_CPU_ABRT_EV5TJ=y | 212 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/mx31pdk_defconfig b/arch/arm/configs/mx31pdk_defconfig index 95ffc0db95a0..d40953798d9e 100644 --- a/arch/arm/configs/mx31pdk_defconfig +++ b/arch/arm/configs/mx31pdk_defconfig | |||
@@ -173,7 +173,6 @@ CONFIG_MACH_MX31_3DS=y | |||
173 | # | 173 | # |
174 | # Processor Type | 174 | # Processor Type |
175 | # | 175 | # |
176 | CONFIG_CPU_32=y | ||
177 | CONFIG_CPU_V6=y | 176 | CONFIG_CPU_V6=y |
178 | # CONFIG_CPU_32v6K is not set | 177 | # CONFIG_CPU_32v6K is not set |
179 | CONFIG_CPU_32v6=y | 178 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/mx3_defconfig b/arch/arm/configs/mx3_defconfig index 7734ccab2119..8a06bc64fe59 100644 --- a/arch/arm/configs/mx3_defconfig +++ b/arch/arm/configs/mx3_defconfig | |||
@@ -218,7 +218,6 @@ CONFIG_ARCH_MXC_IOMUX_V3=y | |||
218 | # | 218 | # |
219 | # Processor Type | 219 | # Processor Type |
220 | # | 220 | # |
221 | CONFIG_CPU_32=y | ||
222 | CONFIG_CPU_V6=y | 221 | CONFIG_CPU_V6=y |
223 | # CONFIG_CPU_32v6K is not set | 222 | # CONFIG_CPU_32v6K is not set |
224 | CONFIG_CPU_32v6=y | 223 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/n770_defconfig b/arch/arm/configs/n770_defconfig index a1657b73683f..75cae18fbcb6 100644 --- a/arch/arm/configs/n770_defconfig +++ b/arch/arm/configs/n770_defconfig | |||
@@ -210,7 +210,6 @@ CONFIG_OMAP_ARM_216MHZ=y | |||
210 | # | 210 | # |
211 | # Processor Type | 211 | # Processor Type |
212 | # | 212 | # |
213 | CONFIG_CPU_32=y | ||
214 | CONFIG_CPU_ARM926T=y | 213 | CONFIG_CPU_ARM926T=y |
215 | CONFIG_CPU_32v5=y | 214 | CONFIG_CPU_32v5=y |
216 | CONFIG_CPU_ABRT_EV5TJ=y | 215 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/n8x0_defconfig b/arch/arm/configs/n8x0_defconfig index 264f52b5c52d..e6f667c5e58a 100644 --- a/arch/arm/configs/n8x0_defconfig +++ b/arch/arm/configs/n8x0_defconfig | |||
@@ -232,7 +232,6 @@ CONFIG_MACH_NOKIA_N8X0=y | |||
232 | # | 232 | # |
233 | # Processor Type | 233 | # Processor Type |
234 | # | 234 | # |
235 | CONFIG_CPU_32=y | ||
236 | CONFIG_CPU_V6=y | 235 | CONFIG_CPU_V6=y |
237 | # CONFIG_CPU_32v6K is not set | 236 | # CONFIG_CPU_32v6K is not set |
238 | CONFIG_CPU_32v6=y | 237 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/neocore926_defconfig b/arch/arm/configs/neocore926_defconfig index e0e4e98b5aa2..d165c757e44c 100644 --- a/arch/arm/configs/neocore926_defconfig +++ b/arch/arm/configs/neocore926_defconfig | |||
@@ -218,7 +218,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
218 | # | 218 | # |
219 | # Processor Type | 219 | # Processor Type |
220 | # | 220 | # |
221 | CONFIG_CPU_32=y | ||
222 | CONFIG_CPU_ARM926T=y | 221 | CONFIG_CPU_ARM926T=y |
223 | CONFIG_CPU_32v5=y | 222 | CONFIG_CPU_32v5=y |
224 | CONFIG_CPU_ABRT_EV5TJ=y | 223 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/neponset_defconfig b/arch/arm/configs/neponset_defconfig index 36cd62edd05c..171265ed02ef 100644 --- a/arch/arm/configs/neponset_defconfig +++ b/arch/arm/configs/neponset_defconfig | |||
@@ -103,7 +103,6 @@ CONFIG_ASSABET_NEPONSET=y | |||
103 | # | 103 | # |
104 | # Processor Type | 104 | # Processor Type |
105 | # | 105 | # |
106 | CONFIG_CPU_32=y | ||
107 | CONFIG_CPU_SA1100=y | 106 | CONFIG_CPU_SA1100=y |
108 | CONFIG_CPU_32v4=y | 107 | CONFIG_CPU_32v4=y |
109 | CONFIG_CPU_ABRT_EV4=y | 108 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/netwinder_defconfig b/arch/arm/configs/netwinder_defconfig index c1a63a35c58d..78f58a99c5a3 100644 --- a/arch/arm/configs/netwinder_defconfig +++ b/arch/arm/configs/netwinder_defconfig | |||
@@ -89,7 +89,6 @@ CONFIG_FOOTBRIDGE_HOST=y | |||
89 | # | 89 | # |
90 | # Processor Type | 90 | # Processor Type |
91 | # | 91 | # |
92 | CONFIG_CPU_32=y | ||
93 | CONFIG_CPU_SA110=y | 92 | CONFIG_CPU_SA110=y |
94 | CONFIG_CPU_32v4=y | 93 | CONFIG_CPU_32v4=y |
95 | CONFIG_CPU_ABRT_EV4=y | 94 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/netx_defconfig b/arch/arm/configs/netx_defconfig index 61d0fc5b2417..2a97e361ec7b 100644 --- a/arch/arm/configs/netx_defconfig +++ b/arch/arm/configs/netx_defconfig | |||
@@ -122,7 +122,6 @@ CONFIG_MACH_NXEB500HMI=y | |||
122 | # | 122 | # |
123 | # Processor Type | 123 | # Processor Type |
124 | # | 124 | # |
125 | CONFIG_CPU_32=y | ||
126 | CONFIG_CPU_ARM926T=y | 125 | CONFIG_CPU_ARM926T=y |
127 | CONFIG_CPU_32v5=y | 126 | CONFIG_CPU_32v5=y |
128 | CONFIG_CPU_ABRT_EV5TJ=y | 127 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/nhk8815_defconfig b/arch/arm/configs/nhk8815_defconfig index 600cb270f2bf..92d90862f5ed 100644 --- a/arch/arm/configs/nhk8815_defconfig +++ b/arch/arm/configs/nhk8815_defconfig | |||
@@ -191,7 +191,6 @@ CONFIG_I2C_BITBANG_8815NHK=y | |||
191 | # | 191 | # |
192 | # Processor Type | 192 | # Processor Type |
193 | # | 193 | # |
194 | CONFIG_CPU_32=y | ||
195 | CONFIG_CPU_ARM926T=y | 194 | CONFIG_CPU_ARM926T=y |
196 | CONFIG_CPU_32v5=y | 195 | CONFIG_CPU_32v5=y |
197 | CONFIG_CPU_ABRT_EV5TJ=y | 196 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/nuc910_defconfig b/arch/arm/configs/nuc910_defconfig index 5245655a0ad3..f80848a929ae 100644 --- a/arch/arm/configs/nuc910_defconfig +++ b/arch/arm/configs/nuc910_defconfig | |||
@@ -180,7 +180,6 @@ CONFIG_MACH_W90P910EVB=y | |||
180 | # | 180 | # |
181 | # Processor Type | 181 | # Processor Type |
182 | # | 182 | # |
183 | CONFIG_CPU_32=y | ||
184 | CONFIG_CPU_ARM926T=y | 183 | CONFIG_CPU_ARM926T=y |
185 | CONFIG_CPU_32v5=y | 184 | CONFIG_CPU_32v5=y |
186 | CONFIG_CPU_ABRT_EV5TJ=y | 185 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/nuc950_defconfig b/arch/arm/configs/nuc950_defconfig index df1de9b45ca4..97300ec478dd 100644 --- a/arch/arm/configs/nuc950_defconfig +++ b/arch/arm/configs/nuc950_defconfig | |||
@@ -201,7 +201,6 @@ CONFIG_MACH_W90P950EVB=y | |||
201 | # | 201 | # |
202 | # Processor Type | 202 | # Processor Type |
203 | # | 203 | # |
204 | CONFIG_CPU_32=y | ||
205 | CONFIG_CPU_ARM926T=y | 204 | CONFIG_CPU_ARM926T=y |
206 | CONFIG_CPU_32v5=y | 205 | CONFIG_CPU_32v5=y |
207 | CONFIG_CPU_ABRT_EV5TJ=y | 206 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/nuc960_defconfig b/arch/arm/configs/nuc960_defconfig index 4b2cd9eae9bc..aa7e128f5d79 100644 --- a/arch/arm/configs/nuc960_defconfig +++ b/arch/arm/configs/nuc960_defconfig | |||
@@ -201,7 +201,6 @@ CONFIG_MACH_W90N960EVB=y | |||
201 | # | 201 | # |
202 | # Processor Type | 202 | # Processor Type |
203 | # | 203 | # |
204 | CONFIG_CPU_32=y | ||
205 | CONFIG_CPU_ARM926T=y | 204 | CONFIG_CPU_ARM926T=y |
206 | CONFIG_CPU_32v5=y | 205 | CONFIG_CPU_32v5=y |
207 | CONFIG_CPU_ABRT_EV5TJ=y | 206 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig index 9cfae374e041..c7999f5b1c9a 100644 --- a/arch/arm/configs/omap3_beagle_defconfig +++ b/arch/arm/configs/omap3_beagle_defconfig | |||
@@ -213,7 +213,6 @@ CONFIG_MACH_OMAP3_BEAGLE=y | |||
213 | # | 213 | # |
214 | # Processor Type | 214 | # Processor Type |
215 | # | 215 | # |
216 | CONFIG_CPU_32=y | ||
217 | CONFIG_CPU_32v6K=y | 216 | CONFIG_CPU_32v6K=y |
218 | CONFIG_CPU_V7=y | 217 | CONFIG_CPU_V7=y |
219 | CONFIG_CPU_32v7=y | 218 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap3_defconfig b/arch/arm/configs/omap3_defconfig index 2af28eab9060..367be98a6aef 100644 --- a/arch/arm/configs/omap3_defconfig +++ b/arch/arm/configs/omap3_defconfig | |||
@@ -245,7 +245,6 @@ CONFIG_MACH_OMAP_3630SDP=y | |||
245 | # | 245 | # |
246 | # Processor Type | 246 | # Processor Type |
247 | # | 247 | # |
248 | CONFIG_CPU_32=y | ||
249 | CONFIG_CPU_32v6K=y | 248 | CONFIG_CPU_32v6K=y |
250 | CONFIG_CPU_V7=y | 249 | CONFIG_CPU_V7=y |
251 | CONFIG_CPU_32v7=y | 250 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap3_evm_defconfig b/arch/arm/configs/omap3_evm_defconfig index e190fc8b9a7c..86cc4bea616b 100644 --- a/arch/arm/configs/omap3_evm_defconfig +++ b/arch/arm/configs/omap3_evm_defconfig | |||
@@ -220,7 +220,6 @@ CONFIG_MACH_OMAP3EVM=y | |||
220 | # | 220 | # |
221 | # Processor Type | 221 | # Processor Type |
222 | # | 222 | # |
223 | CONFIG_CPU_32=y | ||
224 | CONFIG_CPU_32v6K=y | 223 | CONFIG_CPU_32v6K=y |
225 | CONFIG_CPU_V7=y | 224 | CONFIG_CPU_V7=y |
226 | CONFIG_CPU_32v7=y | 225 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap3_pandora_defconfig b/arch/arm/configs/omap3_pandora_defconfig index b7a8d9fa49db..f74eb9a1d191 100644 --- a/arch/arm/configs/omap3_pandora_defconfig +++ b/arch/arm/configs/omap3_pandora_defconfig | |||
@@ -211,7 +211,6 @@ CONFIG_MACH_OMAP3_PANDORA=y | |||
211 | # | 211 | # |
212 | # Processor Type | 212 | # Processor Type |
213 | # | 213 | # |
214 | CONFIG_CPU_32=y | ||
215 | CONFIG_CPU_32v6K=y | 214 | CONFIG_CPU_32v6K=y |
216 | CONFIG_CPU_V7=y | 215 | CONFIG_CPU_V7=y |
217 | CONFIG_CPU_32v7=y | 216 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap3_touchbook_defconfig b/arch/arm/configs/omap3_touchbook_defconfig index 7c8515e65c02..74fe6be9c5ec 100644 --- a/arch/arm/configs/omap3_touchbook_defconfig +++ b/arch/arm/configs/omap3_touchbook_defconfig | |||
@@ -246,7 +246,6 @@ CONFIG_MACH_OMAP3_TOUCHBOOK=y | |||
246 | # | 246 | # |
247 | # Processor Type | 247 | # Processor Type |
248 | # | 248 | # |
249 | CONFIG_CPU_32=y | ||
250 | CONFIG_CPU_32v6K=y | 249 | CONFIG_CPU_32v6K=y |
251 | CONFIG_CPU_V7=y | 250 | CONFIG_CPU_V7=y |
252 | CONFIG_CPU_32v7=y | 251 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap_2430sdp_defconfig b/arch/arm/configs/omap_2430sdp_defconfig index 640e9afc4630..45b4ebae3056 100644 --- a/arch/arm/configs/omap_2430sdp_defconfig +++ b/arch/arm/configs/omap_2430sdp_defconfig | |||
@@ -197,7 +197,6 @@ CONFIG_MACH_OMAP_2430SDP=y | |||
197 | # | 197 | # |
198 | # Processor Type | 198 | # Processor Type |
199 | # | 199 | # |
200 | CONFIG_CPU_32=y | ||
201 | CONFIG_CPU_V6=y | 200 | CONFIG_CPU_V6=y |
202 | # CONFIG_CPU_32v6K is not set | 201 | # CONFIG_CPU_32v6K is not set |
203 | CONFIG_CPU_32v6=y | 202 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/omap_3430sdp_defconfig b/arch/arm/configs/omap_3430sdp_defconfig index 592457cfbbe5..bb2917e5cb47 100644 --- a/arch/arm/configs/omap_3430sdp_defconfig +++ b/arch/arm/configs/omap_3430sdp_defconfig | |||
@@ -232,7 +232,6 @@ CONFIG_MACH_OMAP_3430SDP=y | |||
232 | # | 232 | # |
233 | # Processor Type | 233 | # Processor Type |
234 | # | 234 | # |
235 | CONFIG_CPU_32=y | ||
236 | CONFIG_CPU_32v6K=y | 235 | CONFIG_CPU_32v6K=y |
237 | CONFIG_CPU_V7=y | 236 | CONFIG_CPU_V7=y |
238 | CONFIG_CPU_32v7=y | 237 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap_3630sdp_defconfig b/arch/arm/configs/omap_3630sdp_defconfig index e836c8a00148..d25c3d4424ca 100644 --- a/arch/arm/configs/omap_3630sdp_defconfig +++ b/arch/arm/configs/omap_3630sdp_defconfig | |||
@@ -236,7 +236,6 @@ CONFIG_MACH_OMAP_3630SDP=y | |||
236 | # | 236 | # |
237 | # Processor Type | 237 | # Processor Type |
238 | # | 238 | # |
239 | CONFIG_CPU_32=y | ||
240 | CONFIG_CPU_32v6K=y | 239 | CONFIG_CPU_32v6K=y |
241 | CONFIG_CPU_V7=y | 240 | CONFIG_CPU_V7=y |
242 | CONFIG_CPU_32v7=y | 241 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig index 2319113c86bf..3de640ac294b 100644 --- a/arch/arm/configs/omap_4430sdp_defconfig +++ b/arch/arm/configs/omap_4430sdp_defconfig | |||
@@ -220,7 +220,6 @@ CONFIG_MACH_OMAP_4430SDP=y | |||
220 | # | 220 | # |
221 | # Processor Type | 221 | # Processor Type |
222 | # | 222 | # |
223 | CONFIG_CPU_32=y | ||
224 | CONFIG_CPU_32v6K=y | 223 | CONFIG_CPU_32v6K=y |
225 | CONFIG_CPU_V7=y | 224 | CONFIG_CPU_V7=y |
226 | CONFIG_CPU_32v7=y | 225 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap_apollon_2420_defconfig b/arch/arm/configs/omap_apollon_2420_defconfig index ac7adf34c54a..cc86342896a0 100644 --- a/arch/arm/configs/omap_apollon_2420_defconfig +++ b/arch/arm/configs/omap_apollon_2420_defconfig | |||
@@ -196,7 +196,6 @@ CONFIG_MACH_OMAP_APOLLON=y | |||
196 | # | 196 | # |
197 | # Processor Type | 197 | # Processor Type |
198 | # | 198 | # |
199 | CONFIG_CPU_32=y | ||
200 | CONFIG_CPU_V6=y | 199 | CONFIG_CPU_V6=y |
201 | # CONFIG_CPU_32v6K is not set | 200 | # CONFIG_CPU_32v6K is not set |
202 | CONFIG_CPU_32v6=y | 201 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/omap_generic_1510_defconfig b/arch/arm/configs/omap_generic_1510_defconfig index ccdc661b5856..61744e507e47 100644 --- a/arch/arm/configs/omap_generic_1510_defconfig +++ b/arch/arm/configs/omap_generic_1510_defconfig | |||
@@ -205,7 +205,6 @@ CONFIG_OMAP_ARM_168MHZ=y | |||
205 | # | 205 | # |
206 | # Processor Type | 206 | # Processor Type |
207 | # | 207 | # |
208 | CONFIG_CPU_32=y | ||
209 | CONFIG_CPU_ARM925T=y | 208 | CONFIG_CPU_ARM925T=y |
210 | CONFIG_CPU_32v4T=y | 209 | CONFIG_CPU_32v4T=y |
211 | CONFIG_CPU_ABRT_EV4T=y | 210 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/omap_generic_1610_defconfig b/arch/arm/configs/omap_generic_1610_defconfig index 0c42c8955047..d773857ed0cd 100644 --- a/arch/arm/configs/omap_generic_1610_defconfig +++ b/arch/arm/configs/omap_generic_1610_defconfig | |||
@@ -207,7 +207,6 @@ CONFIG_OMAP_ARM_192MHZ=y | |||
207 | # | 207 | # |
208 | # Processor Type | 208 | # Processor Type |
209 | # | 209 | # |
210 | CONFIG_CPU_32=y | ||
211 | CONFIG_CPU_ARM926T=y | 210 | CONFIG_CPU_ARM926T=y |
212 | CONFIG_CPU_32v5=y | 211 | CONFIG_CPU_32v5=y |
213 | CONFIG_CPU_ABRT_EV5TJ=y | 212 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/omap_generic_1710_defconfig b/arch/arm/configs/omap_generic_1710_defconfig index 0a00a708a4fc..6ec487e6e027 100644 --- a/arch/arm/configs/omap_generic_1710_defconfig +++ b/arch/arm/configs/omap_generic_1710_defconfig | |||
@@ -201,7 +201,6 @@ CONFIG_OMAP_ARM_192MHZ=y | |||
201 | # | 201 | # |
202 | # Processor Type | 202 | # Processor Type |
203 | # | 203 | # |
204 | CONFIG_CPU_32=y | ||
205 | CONFIG_CPU_ARM926T=y | 204 | CONFIG_CPU_ARM926T=y |
206 | CONFIG_CPU_32v5=y | 205 | CONFIG_CPU_32v5=y |
207 | CONFIG_CPU_ABRT_EV5TJ=y | 206 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/omap_generic_2420_defconfig b/arch/arm/configs/omap_generic_2420_defconfig index cf4073b47aaa..7218b96c0b76 100644 --- a/arch/arm/configs/omap_generic_2420_defconfig +++ b/arch/arm/configs/omap_generic_2420_defconfig | |||
@@ -191,7 +191,6 @@ CONFIG_ARCH_OMAP2420=y | |||
191 | # | 191 | # |
192 | # Processor Type | 192 | # Processor Type |
193 | # | 193 | # |
194 | CONFIG_CPU_32=y | ||
195 | CONFIG_CPU_V6=y | 194 | CONFIG_CPU_V6=y |
196 | # CONFIG_CPU_32v6K is not set | 195 | # CONFIG_CPU_32v6K is not set |
197 | CONFIG_CPU_32v6=y | 196 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig index 74dbdc644d32..523189586a4b 100644 --- a/arch/arm/configs/omap_h2_1610_defconfig +++ b/arch/arm/configs/omap_h2_1610_defconfig | |||
@@ -231,7 +231,6 @@ CONFIG_OMAP_ARM_60MHZ=y | |||
231 | # | 231 | # |
232 | # Processor Type | 232 | # Processor Type |
233 | # | 233 | # |
234 | CONFIG_CPU_32=y | ||
235 | CONFIG_CPU_ARM926T=y | 234 | CONFIG_CPU_ARM926T=y |
236 | CONFIG_CPU_32v5=y | 235 | CONFIG_CPU_32v5=y |
237 | CONFIG_CPU_ABRT_EV5TJ=y | 236 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/omap_h4_2420_defconfig b/arch/arm/configs/omap_h4_2420_defconfig index a4aab8e4c29b..b12b406c1960 100644 --- a/arch/arm/configs/omap_h4_2420_defconfig +++ b/arch/arm/configs/omap_h4_2420_defconfig | |||
@@ -201,7 +201,6 @@ CONFIG_MACH_OMAP_H4=y | |||
201 | # | 201 | # |
202 | # Processor Type | 202 | # Processor Type |
203 | # | 203 | # |
204 | CONFIG_CPU_32=y | ||
205 | CONFIG_CPU_V6=y | 204 | CONFIG_CPU_V6=y |
206 | # CONFIG_CPU_32v6K is not set | 205 | # CONFIG_CPU_32v6K is not set |
207 | CONFIG_CPU_32v6=y | 206 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/omap_innovator_1510_defconfig b/arch/arm/configs/omap_innovator_1510_defconfig index 0cfe363e3365..e9c140821256 100644 --- a/arch/arm/configs/omap_innovator_1510_defconfig +++ b/arch/arm/configs/omap_innovator_1510_defconfig | |||
@@ -205,7 +205,6 @@ CONFIG_OMAP_ARM_168MHZ=y | |||
205 | # | 205 | # |
206 | # Processor Type | 206 | # Processor Type |
207 | # | 207 | # |
208 | CONFIG_CPU_32=y | ||
209 | CONFIG_CPU_ARM925T=y | 208 | CONFIG_CPU_ARM925T=y |
210 | CONFIG_CPU_32v4T=y | 209 | CONFIG_CPU_32v4T=y |
211 | CONFIG_CPU_ABRT_EV4T=y | 210 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/omap_innovator_1610_defconfig b/arch/arm/configs/omap_innovator_1610_defconfig index 95d9f2be53e0..fea9319ed7fd 100644 --- a/arch/arm/configs/omap_innovator_1610_defconfig +++ b/arch/arm/configs/omap_innovator_1610_defconfig | |||
@@ -206,7 +206,6 @@ CONFIG_OMAP_ARM_192MHZ=y | |||
206 | # | 206 | # |
207 | # Processor Type | 207 | # Processor Type |
208 | # | 208 | # |
209 | CONFIG_CPU_32=y | ||
210 | CONFIG_CPU_ARM926T=y | 209 | CONFIG_CPU_ARM926T=y |
211 | CONFIG_CPU_32v5=y | 210 | CONFIG_CPU_32v5=y |
212 | CONFIG_CPU_ABRT_EV5TJ=y | 211 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/omap_ldp_defconfig b/arch/arm/configs/omap_ldp_defconfig index 9139532c3be7..0efb4b044fff 100644 --- a/arch/arm/configs/omap_ldp_defconfig +++ b/arch/arm/configs/omap_ldp_defconfig | |||
@@ -214,7 +214,6 @@ CONFIG_MACH_OMAP_LDP=y | |||
214 | # | 214 | # |
215 | # Processor Type | 215 | # Processor Type |
216 | # | 216 | # |
217 | CONFIG_CPU_32=y | ||
218 | CONFIG_CPU_32v6K=y | 217 | CONFIG_CPU_32v6K=y |
219 | CONFIG_CPU_V7=y | 218 | CONFIG_CPU_V7=y |
220 | CONFIG_CPU_32v7=y | 219 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap_osk_5912_defconfig b/arch/arm/configs/omap_osk_5912_defconfig index 6b3b5c610da0..556fcca1b1db 100644 --- a/arch/arm/configs/omap_osk_5912_defconfig +++ b/arch/arm/configs/omap_osk_5912_defconfig | |||
@@ -212,7 +212,6 @@ CONFIG_OMAP_ARM_192MHZ=y | |||
212 | # | 212 | # |
213 | # Processor Type | 213 | # Processor Type |
214 | # | 214 | # |
215 | CONFIG_CPU_32=y | ||
216 | CONFIG_CPU_ARM926T=y | 215 | CONFIG_CPU_ARM926T=y |
217 | CONFIG_CPU_32v5=y | 216 | CONFIG_CPU_32v5=y |
218 | CONFIG_CPU_ABRT_EV5TJ=y | 217 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/omap_perseus2_730_defconfig b/arch/arm/configs/omap_perseus2_730_defconfig index b94800c0e000..9a15d5da57f9 100644 --- a/arch/arm/configs/omap_perseus2_730_defconfig +++ b/arch/arm/configs/omap_perseus2_730_defconfig | |||
@@ -199,7 +199,6 @@ CONFIG_OMAP_ARM_182MHZ=y | |||
199 | # | 199 | # |
200 | # Processor Type | 200 | # Processor Type |
201 | # | 201 | # |
202 | CONFIG_CPU_32=y | ||
203 | CONFIG_CPU_ARM926T=y | 202 | CONFIG_CPU_ARM926T=y |
204 | CONFIG_CPU_32v5=y | 203 | CONFIG_CPU_32v5=y |
205 | CONFIG_CPU_ABRT_EV5TJ=y | 204 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/omap_zoom2_defconfig b/arch/arm/configs/omap_zoom2_defconfig index 4b00a4306812..a82e81332a03 100644 --- a/arch/arm/configs/omap_zoom2_defconfig +++ b/arch/arm/configs/omap_zoom2_defconfig | |||
@@ -222,7 +222,6 @@ CONFIG_MACH_OMAP_ZOOM2=y | |||
222 | # | 222 | # |
223 | # Processor Type | 223 | # Processor Type |
224 | # | 224 | # |
225 | CONFIG_CPU_32=y | ||
226 | CONFIG_CPU_32v6K=y | 225 | CONFIG_CPU_32v6K=y |
227 | CONFIG_CPU_V7=y | 226 | CONFIG_CPU_V7=y |
228 | CONFIG_CPU_32v7=y | 227 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/omap_zoom3_defconfig b/arch/arm/configs/omap_zoom3_defconfig index 0d7e37a3651b..a3e3c8274c9b 100644 --- a/arch/arm/configs/omap_zoom3_defconfig +++ b/arch/arm/configs/omap_zoom3_defconfig | |||
@@ -236,7 +236,6 @@ CONFIG_MACH_OMAP_ZOOM3=y | |||
236 | # | 236 | # |
237 | # Processor Type | 237 | # Processor Type |
238 | # | 238 | # |
239 | CONFIG_CPU_32=y | ||
240 | CONFIG_CPU_32v6K=y | 239 | CONFIG_CPU_32v6K=y |
241 | CONFIG_CPU_V7=y | 240 | CONFIG_CPU_V7=y |
242 | CONFIG_CPU_32v7=y | 241 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/onearm_defconfig b/arch/arm/configs/onearm_defconfig index f8701fadb600..19b91dedc7fe 100644 --- a/arch/arm/configs/onearm_defconfig +++ b/arch/arm/configs/onearm_defconfig | |||
@@ -161,7 +161,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | |||
161 | # | 161 | # |
162 | # Processor Type | 162 | # Processor Type |
163 | # | 163 | # |
164 | CONFIG_CPU_32=y | ||
165 | CONFIG_CPU_ARM920T=y | 164 | CONFIG_CPU_ARM920T=y |
166 | CONFIG_CPU_32v4T=y | 165 | CONFIG_CPU_32v4T=y |
167 | CONFIG_CPU_ABRT_EV4T=y | 166 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 5383cd0dff54..85b05d3e279b 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig | |||
@@ -210,7 +210,6 @@ CONFIG_PLAT_ORION=y | |||
210 | # | 210 | # |
211 | # Processor Type | 211 | # Processor Type |
212 | # | 212 | # |
213 | CONFIG_CPU_32=y | ||
214 | CONFIG_CPU_FEROCEON=y | 213 | CONFIG_CPU_FEROCEON=y |
215 | CONFIG_CPU_FEROCEON_OLD_ID=y | 214 | CONFIG_CPU_FEROCEON_OLD_ID=y |
216 | CONFIG_CPU_32v5=y | 215 | CONFIG_CPU_32v5=y |
diff --git a/arch/arm/configs/overo_defconfig b/arch/arm/configs/overo_defconfig index b3ea2c4c0f91..bf06d3660a30 100644 --- a/arch/arm/configs/overo_defconfig +++ b/arch/arm/configs/overo_defconfig | |||
@@ -217,7 +217,6 @@ CONFIG_MACH_OVERO=y | |||
217 | # | 217 | # |
218 | # Processor Type | 218 | # Processor Type |
219 | # | 219 | # |
220 | CONFIG_CPU_32=y | ||
221 | CONFIG_CPU_32v6K=y | 220 | CONFIG_CPU_32v6K=y |
222 | CONFIG_CPU_V7=y | 221 | CONFIG_CPU_V7=y |
223 | CONFIG_CPU_32v7=y | 222 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/palmte_defconfig b/arch/arm/configs/palmte_defconfig index 40fc6a778e00..feffaa2deae2 100644 --- a/arch/arm/configs/palmte_defconfig +++ b/arch/arm/configs/palmte_defconfig | |||
@@ -196,7 +196,6 @@ CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | |||
196 | # | 196 | # |
197 | # Processor Type | 197 | # Processor Type |
198 | # | 198 | # |
199 | CONFIG_CPU_32=y | ||
200 | CONFIG_CPU_ARM925T=y | 199 | CONFIG_CPU_ARM925T=y |
201 | CONFIG_CPU_32v4T=y | 200 | CONFIG_CPU_32v4T=y |
202 | CONFIG_CPU_ABRT_EV4T=y | 201 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/palmtt_defconfig b/arch/arm/configs/palmtt_defconfig index e54ced41217e..55d5b7dfb7a6 100644 --- a/arch/arm/configs/palmtt_defconfig +++ b/arch/arm/configs/palmtt_defconfig | |||
@@ -176,7 +176,6 @@ CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | |||
176 | # | 176 | # |
177 | # Processor Type | 177 | # Processor Type |
178 | # | 178 | # |
179 | CONFIG_CPU_32=y | ||
180 | CONFIG_CPU_ARM925T=y | 179 | CONFIG_CPU_ARM925T=y |
181 | CONFIG_CPU_32v4T=y | 180 | CONFIG_CPU_32v4T=y |
182 | CONFIG_CPU_ABRT_EV4T=y | 181 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/palmz71_defconfig b/arch/arm/configs/palmz71_defconfig index 08e14068fff7..6efc7465a76c 100644 --- a/arch/arm/configs/palmz71_defconfig +++ b/arch/arm/configs/palmz71_defconfig | |||
@@ -200,7 +200,6 @@ CONFIG_OMAP_CLOCKS_SET_BY_BOOTLOADER=y | |||
200 | # | 200 | # |
201 | # Processor Type | 201 | # Processor Type |
202 | # | 202 | # |
203 | CONFIG_CPU_32=y | ||
204 | CONFIG_CPU_ARM925T=y | 203 | CONFIG_CPU_ARM925T=y |
205 | CONFIG_CPU_32v4T=y | 204 | CONFIG_CPU_32v4T=y |
206 | CONFIG_CPU_ABRT_EV4T=y | 205 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/palmz72_defconfig b/arch/arm/configs/palmz72_defconfig index a0dc37c05dea..6d162b137ce8 100644 --- a/arch/arm/configs/palmz72_defconfig +++ b/arch/arm/configs/palmz72_defconfig | |||
@@ -209,7 +209,6 @@ CONFIG_PXA_PWM=y | |||
209 | # | 209 | # |
210 | # Processor Type | 210 | # Processor Type |
211 | # | 211 | # |
212 | CONFIG_CPU_32=y | ||
213 | CONFIG_CPU_XSCALE=y | 212 | CONFIG_CPU_XSCALE=y |
214 | CONFIG_CPU_32v5=y | 213 | CONFIG_CPU_32v5=y |
215 | CONFIG_CPU_ABRT_EV5T=y | 214 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig index 05ad96a43b1d..fa153f2711bb 100644 --- a/arch/arm/configs/pcm027_defconfig +++ b/arch/arm/configs/pcm027_defconfig | |||
@@ -168,7 +168,6 @@ CONFIG_PXA27x=y | |||
168 | # | 168 | # |
169 | # Processor Type | 169 | # Processor Type |
170 | # | 170 | # |
171 | CONFIG_CPU_32=y | ||
172 | CONFIG_CPU_XSCALE=y | 171 | CONFIG_CPU_XSCALE=y |
173 | CONFIG_CPU_32v5=y | 172 | CONFIG_CPU_32v5=y |
174 | CONFIG_CPU_ABRT_EV5T=y | 173 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/picotux200_defconfig b/arch/arm/configs/picotux200_defconfig index 9018f0f298aa..6e7155c122a4 100644 --- a/arch/arm/configs/picotux200_defconfig +++ b/arch/arm/configs/picotux200_defconfig | |||
@@ -168,7 +168,6 @@ CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | |||
168 | # | 168 | # |
169 | # Processor Type | 169 | # Processor Type |
170 | # | 170 | # |
171 | CONFIG_CPU_32=y | ||
172 | CONFIG_CPU_ARM920T=y | 171 | CONFIG_CPU_ARM920T=y |
173 | CONFIG_CPU_32v4T=y | 172 | CONFIG_CPU_32v4T=y |
174 | CONFIG_CPU_ABRT_EV4T=y | 173 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/pleb_defconfig b/arch/arm/configs/pleb_defconfig index f2d2dda25949..dbfabb5eede8 100644 --- a/arch/arm/configs/pleb_defconfig +++ b/arch/arm/configs/pleb_defconfig | |||
@@ -100,7 +100,6 @@ CONFIG_SA1100_PLEB=y | |||
100 | # | 100 | # |
101 | # Processor Type | 101 | # Processor Type |
102 | # | 102 | # |
103 | CONFIG_CPU_32=y | ||
104 | CONFIG_CPU_SA1100=y | 103 | CONFIG_CPU_SA1100=y |
105 | CONFIG_CPU_32v4=y | 104 | CONFIG_CPU_32v4=y |
106 | CONFIG_CPU_ABRT_EV4=y | 105 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/pnx4008_defconfig b/arch/arm/configs/pnx4008_defconfig index 67b5f1e15f4a..2f7b9ce7dad3 100644 --- a/arch/arm/configs/pnx4008_defconfig +++ b/arch/arm/configs/pnx4008_defconfig | |||
@@ -121,7 +121,6 @@ CONFIG_ARCH_PNX4008=y | |||
121 | # | 121 | # |
122 | # Processor Type | 122 | # Processor Type |
123 | # | 123 | # |
124 | CONFIG_CPU_32=y | ||
125 | CONFIG_CPU_ARM926T=y | 124 | CONFIG_CPU_ARM926T=y |
126 | CONFIG_CPU_32v5=y | 125 | CONFIG_CPU_32v5=y |
127 | CONFIG_CPU_ABRT_EV5TJ=y | 126 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/pxa168_defconfig b/arch/arm/configs/pxa168_defconfig index db5faeaec96c..791b8c39aefc 100644 --- a/arch/arm/configs/pxa168_defconfig +++ b/arch/arm/configs/pxa168_defconfig | |||
@@ -184,7 +184,6 @@ CONFIG_PLAT_PXA=y | |||
184 | # | 184 | # |
185 | # Processor Type | 185 | # Processor Type |
186 | # | 186 | # |
187 | CONFIG_CPU_32=y | ||
188 | CONFIG_CPU_MOHAWK=y | 187 | CONFIG_CPU_MOHAWK=y |
189 | CONFIG_CPU_32v5=y | 188 | CONFIG_CPU_32v5=y |
190 | CONFIG_CPU_ABRT_EV5T=y | 189 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig index 46e5089df0ae..3365c5d77cad 100644 --- a/arch/arm/configs/pxa255-idp_defconfig +++ b/arch/arm/configs/pxa255-idp_defconfig | |||
@@ -92,7 +92,6 @@ CONFIG_PXA25x=y | |||
92 | # | 92 | # |
93 | # Processor Type | 93 | # Processor Type |
94 | # | 94 | # |
95 | CONFIG_CPU_32=y | ||
96 | CONFIG_CPU_XSCALE=y | 95 | CONFIG_CPU_XSCALE=y |
97 | CONFIG_CPU_32v5=y | 96 | CONFIG_CPU_32v5=y |
98 | CONFIG_CPU_ABRT_EV5T=y | 97 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig index 733b851e5b7e..82ca6c80d6af 100644 --- a/arch/arm/configs/pxa3xx_defconfig +++ b/arch/arm/configs/pxa3xx_defconfig | |||
@@ -240,7 +240,6 @@ CONFIG_PLAT_PXA=y | |||
240 | # | 240 | # |
241 | # Processor Type | 241 | # Processor Type |
242 | # | 242 | # |
243 | CONFIG_CPU_32=y | ||
244 | CONFIG_CPU_XSC3=y | 243 | CONFIG_CPU_XSC3=y |
245 | CONFIG_CPU_32v5=y | 244 | CONFIG_CPU_32v5=y |
246 | CONFIG_CPU_ABRT_EV5T=y | 245 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/pxa910_defconfig b/arch/arm/configs/pxa910_defconfig index 8c7e299f1d66..94e20fe6dbde 100644 --- a/arch/arm/configs/pxa910_defconfig +++ b/arch/arm/configs/pxa910_defconfig | |||
@@ -184,7 +184,6 @@ CONFIG_PLAT_PXA=y | |||
184 | # | 184 | # |
185 | # Processor Type | 185 | # Processor Type |
186 | # | 186 | # |
187 | CONFIG_CPU_32=y | ||
188 | CONFIG_CPU_MOHAWK=y | 187 | CONFIG_CPU_MOHAWK=y |
189 | CONFIG_CPU_32v5=y | 188 | CONFIG_CPU_32v5=y |
190 | CONFIG_CPU_ABRT_EV5T=y | 189 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/qil-a9260_defconfig b/arch/arm/configs/qil-a9260_defconfig index 9b32d0eb89ba..12d0d64e3216 100644 --- a/arch/arm/configs/qil-a9260_defconfig +++ b/arch/arm/configs/qil-a9260_defconfig | |||
@@ -195,7 +195,6 @@ CONFIG_AT91_EARLY_USART0=y | |||
195 | # | 195 | # |
196 | # Processor Type | 196 | # Processor Type |
197 | # | 197 | # |
198 | CONFIG_CPU_32=y | ||
199 | CONFIG_CPU_ARM926T=y | 198 | CONFIG_CPU_ARM926T=y |
200 | CONFIG_CPU_32v5=y | 199 | CONFIG_CPU_32v5=y |
201 | CONFIG_CPU_ABRT_EV5TJ=y | 200 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/realview-smp_defconfig b/arch/arm/configs/realview-smp_defconfig index 21db4b3ec8ff..123701754d42 100644 --- a/arch/arm/configs/realview-smp_defconfig +++ b/arch/arm/configs/realview-smp_defconfig | |||
@@ -186,7 +186,6 @@ CONFIG_REALVIEW_HIGH_PHYS_OFFSET=y | |||
186 | # | 186 | # |
187 | # Processor Type | 187 | # Processor Type |
188 | # | 188 | # |
189 | CONFIG_CPU_32=y | ||
190 | # CONFIG_CPU_ARM926T is not set | 189 | # CONFIG_CPU_ARM926T is not set |
191 | CONFIG_CPU_V6=y | 190 | CONFIG_CPU_V6=y |
192 | CONFIG_CPU_32v6K=y | 191 | CONFIG_CPU_32v6K=y |
diff --git a/arch/arm/configs/realview_defconfig b/arch/arm/configs/realview_defconfig index 9a75c30b910d..a509a5e59d2c 100644 --- a/arch/arm/configs/realview_defconfig +++ b/arch/arm/configs/realview_defconfig | |||
@@ -184,7 +184,6 @@ CONFIG_MACH_REALVIEW_PB1176=y | |||
184 | # | 184 | # |
185 | # Processor Type | 185 | # Processor Type |
186 | # | 186 | # |
187 | CONFIG_CPU_32=y | ||
188 | # CONFIG_CPU_ARM926T is not set | 187 | # CONFIG_CPU_ARM926T is not set |
189 | CONFIG_CPU_V6=y | 188 | CONFIG_CPU_V6=y |
190 | # CONFIG_CPU_32v6K is not set | 189 | # CONFIG_CPU_32v6K is not set |
diff --git a/arch/arm/configs/rpc_defconfig b/arch/arm/configs/rpc_defconfig index a29d61fe4c6a..e9124a000393 100644 --- a/arch/arm/configs/rpc_defconfig +++ b/arch/arm/configs/rpc_defconfig | |||
@@ -150,7 +150,6 @@ CONFIG_ARCH_ACORN=y | |||
150 | # | 150 | # |
151 | # Processor Type | 151 | # Processor Type |
152 | # | 152 | # |
153 | CONFIG_CPU_32=y | ||
154 | CONFIG_CPU_ARM610=y | 153 | CONFIG_CPU_ARM610=y |
155 | CONFIG_CPU_ARM710=y | 154 | CONFIG_CPU_ARM710=y |
156 | CONFIG_CPU_SA110=y | 155 | CONFIG_CPU_SA110=y |
diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig index 155973426025..b6eeebb31761 100644 --- a/arch/arm/configs/rx51_defconfig +++ b/arch/arm/configs/rx51_defconfig | |||
@@ -212,7 +212,6 @@ CONFIG_MACH_NOKIA_RX51=y | |||
212 | # | 212 | # |
213 | # Processor Type | 213 | # Processor Type |
214 | # | 214 | # |
215 | CONFIG_CPU_32=y | ||
216 | CONFIG_CPU_32v6K=y | 215 | CONFIG_CPU_32v6K=y |
217 | CONFIG_CPU_V7=y | 216 | CONFIG_CPU_V7=y |
218 | CONFIG_CPU_32v7=y | 217 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index b49810461e41..2f10dae02796 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
@@ -277,7 +277,6 @@ CONFIG_MACH_SMDK2443=y | |||
277 | # | 277 | # |
278 | # Processor Type | 278 | # Processor Type |
279 | # | 279 | # |
280 | CONFIG_CPU_32=y | ||
281 | CONFIG_CPU_ARM920T=y | 280 | CONFIG_CPU_ARM920T=y |
282 | CONFIG_CPU_ARM926T=y | 281 | CONFIG_CPU_ARM926T=y |
283 | CONFIG_CPU_32v4T=y | 282 | CONFIG_CPU_32v4T=y |
diff --git a/arch/arm/configs/s3c6400_defconfig b/arch/arm/configs/s3c6400_defconfig index 32860609e057..f56e50fab79b 100644 --- a/arch/arm/configs/s3c6400_defconfig +++ b/arch/arm/configs/s3c6400_defconfig | |||
@@ -192,7 +192,6 @@ CONFIG_SMDK6410_SD_CH0=y | |||
192 | # | 192 | # |
193 | # Processor Type | 193 | # Processor Type |
194 | # | 194 | # |
195 | CONFIG_CPU_32=y | ||
196 | CONFIG_CPU_V6=y | 195 | CONFIG_CPU_V6=y |
197 | CONFIG_CPU_32v6K=y | 196 | CONFIG_CPU_32v6K=y |
198 | CONFIG_CPU_32v6=y | 197 | CONFIG_CPU_32v6=y |
diff --git a/arch/arm/configs/s5pc100_defconfig b/arch/arm/configs/s5pc100_defconfig index b0d7d3d3a5e3..dc108afc060c 100644 --- a/arch/arm/configs/s5pc100_defconfig +++ b/arch/arm/configs/s5pc100_defconfig | |||
@@ -202,7 +202,6 @@ CONFIG_MACH_SMDKC100=y | |||
202 | # | 202 | # |
203 | # Processor Type | 203 | # Processor Type |
204 | # | 204 | # |
205 | CONFIG_CPU_32=y | ||
206 | CONFIG_CPU_32v6K=y | 205 | CONFIG_CPU_32v6K=y |
207 | CONFIG_CPU_V7=y | 206 | CONFIG_CPU_V7=y |
208 | CONFIG_CPU_32v7=y | 207 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/sam9_l9260_defconfig b/arch/arm/configs/sam9_l9260_defconfig index 1174e2764875..81b290ad5d25 100644 --- a/arch/arm/configs/sam9_l9260_defconfig +++ b/arch/arm/configs/sam9_l9260_defconfig | |||
@@ -175,7 +175,6 @@ CONFIG_MTD_AT91_DATAFLASH_CARD=y | |||
175 | # | 175 | # |
176 | # Processor Type | 176 | # Processor Type |
177 | # | 177 | # |
178 | CONFIG_CPU_32=y | ||
179 | CONFIG_CPU_ARM926T=y | 178 | CONFIG_CPU_ARM926T=y |
180 | CONFIG_CPU_32v5=y | 179 | CONFIG_CPU_32v5=y |
181 | CONFIG_CPU_ABRT_EV5TJ=y | 180 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/shannon_defconfig b/arch/arm/configs/shannon_defconfig index 984f7096a533..7c49bc352462 100644 --- a/arch/arm/configs/shannon_defconfig +++ b/arch/arm/configs/shannon_defconfig | |||
@@ -99,7 +99,6 @@ CONFIG_SA1100_SHANNON=y | |||
99 | # | 99 | # |
100 | # Processor Type | 100 | # Processor Type |
101 | # | 101 | # |
102 | CONFIG_CPU_32=y | ||
103 | CONFIG_CPU_SA1100=y | 102 | CONFIG_CPU_SA1100=y |
104 | CONFIG_CPU_32v4=y | 103 | CONFIG_CPU_32v4=y |
105 | CONFIG_CPU_ABRT_EV4=y | 104 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/shark_defconfig b/arch/arm/configs/shark_defconfig index 90235bf7a1de..46de1247d127 100644 --- a/arch/arm/configs/shark_defconfig +++ b/arch/arm/configs/shark_defconfig | |||
@@ -173,7 +173,6 @@ CONFIG_ARCH_SHARK=y | |||
173 | # | 173 | # |
174 | # Processor Type | 174 | # Processor Type |
175 | # | 175 | # |
176 | CONFIG_CPU_32=y | ||
177 | CONFIG_CPU_SA110=y | 176 | CONFIG_CPU_SA110=y |
178 | CONFIG_CPU_32v4=y | 177 | CONFIG_CPU_32v4=y |
179 | CONFIG_CPU_ABRT_EV4=y | 178 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/simpad_defconfig b/arch/arm/configs/simpad_defconfig index 685d2b513206..ee25e6344151 100644 --- a/arch/arm/configs/simpad_defconfig +++ b/arch/arm/configs/simpad_defconfig | |||
@@ -101,7 +101,6 @@ CONFIG_SA1100_SIMPAD=y | |||
101 | # | 101 | # |
102 | # Processor Type | 102 | # Processor Type |
103 | # | 103 | # |
104 | CONFIG_CPU_32=y | ||
105 | CONFIG_CPU_SA1100=y | 104 | CONFIG_CPU_SA1100=y |
106 | CONFIG_CPU_32v4=y | 105 | CONFIG_CPU_32v4=y |
107 | CONFIG_CPU_ABRT_EV4=y | 106 | CONFIG_CPU_ABRT_EV4=y |
diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index 745c68ffb885..7d894894194f 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig | |||
@@ -212,7 +212,6 @@ CONFIG_PXA_SSP=y | |||
212 | # | 212 | # |
213 | # Processor Type | 213 | # Processor Type |
214 | # | 214 | # |
215 | CONFIG_CPU_32=y | ||
216 | CONFIG_CPU_XSCALE=y | 215 | CONFIG_CPU_XSCALE=y |
217 | CONFIG_CPU_32v5=y | 216 | CONFIG_CPU_32v5=y |
218 | CONFIG_CPU_ABRT_EV5T=y | 217 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/stmp378x_defconfig b/arch/arm/configs/stmp378x_defconfig index 44461f197a17..b1a3a97d46ee 100644 --- a/arch/arm/configs/stmp378x_defconfig +++ b/arch/arm/configs/stmp378x_defconfig | |||
@@ -193,7 +193,6 @@ CONFIG_MACH_STMP378X=y | |||
193 | # | 193 | # |
194 | # Processor Type | 194 | # Processor Type |
195 | # | 195 | # |
196 | CONFIG_CPU_32=y | ||
197 | CONFIG_CPU_ARM926T=y | 196 | CONFIG_CPU_ARM926T=y |
198 | CONFIG_CPU_32v5=y | 197 | CONFIG_CPU_32v5=y |
199 | CONFIG_CPU_ABRT_EV5TJ=y | 198 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/stmp37xx_defconfig b/arch/arm/configs/stmp37xx_defconfig index 401279d531d5..a3751c9e1416 100644 --- a/arch/arm/configs/stmp37xx_defconfig +++ b/arch/arm/configs/stmp37xx_defconfig | |||
@@ -182,7 +182,6 @@ CONFIG_MACH_STMP37XX=y | |||
182 | # | 182 | # |
183 | # Processor Type | 183 | # Processor Type |
184 | # | 184 | # |
185 | CONFIG_CPU_32=y | ||
186 | CONFIG_CPU_ARM926T=y | 185 | CONFIG_CPU_ARM926T=y |
187 | CONFIG_CPU_32v5=y | 186 | CONFIG_CPU_32v5=y |
188 | CONFIG_CPU_ABRT_EV5TJ=y | 187 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/sx1_defconfig b/arch/arm/configs/sx1_defconfig index 25b007ff8bab..8a9e7e6bd03b 100644 --- a/arch/arm/configs/sx1_defconfig +++ b/arch/arm/configs/sx1_defconfig | |||
@@ -210,7 +210,6 @@ CONFIG_OMAP_ARM_168MHZ=y | |||
210 | # | 210 | # |
211 | # Processor Type | 211 | # Processor Type |
212 | # | 212 | # |
213 | CONFIG_CPU_32=y | ||
214 | CONFIG_CPU_ARM925T=y | 213 | CONFIG_CPU_ARM925T=y |
215 | CONFIG_CPU_32v4T=y | 214 | CONFIG_CPU_32v4T=y |
216 | CONFIG_CPU_ABRT_EV4T=y | 215 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/tct_hammer_defconfig b/arch/arm/configs/tct_hammer_defconfig index 9d32faef05f6..dccf14b4ee02 100644 --- a/arch/arm/configs/tct_hammer_defconfig +++ b/arch/arm/configs/tct_hammer_defconfig | |||
@@ -215,7 +215,6 @@ CONFIG_MACH_TCT_HAMMER=y | |||
215 | # | 215 | # |
216 | # Processor Type | 216 | # Processor Type |
217 | # | 217 | # |
218 | CONFIG_CPU_32=y | ||
219 | CONFIG_CPU_ARM920T=y | 218 | CONFIG_CPU_ARM920T=y |
220 | CONFIG_CPU_32v4T=y | 219 | CONFIG_CPU_32v4T=y |
221 | CONFIG_CPU_ABRT_EV4T=y | 220 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig index b6f838197816..1e8f5a211856 100644 --- a/arch/arm/configs/trizeps4_defconfig +++ b/arch/arm/configs/trizeps4_defconfig | |||
@@ -156,7 +156,6 @@ CONFIG_PXA27x=y | |||
156 | # | 156 | # |
157 | # Processor Type | 157 | # Processor Type |
158 | # | 158 | # |
159 | CONFIG_CPU_32=y | ||
160 | CONFIG_CPU_XSCALE=y | 159 | CONFIG_CPU_XSCALE=y |
161 | CONFIG_CPU_32v5=y | 160 | CONFIG_CPU_32v5=y |
162 | CONFIG_CPU_ABRT_EV5T=y | 161 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/u300_defconfig b/arch/arm/configs/u300_defconfig index 953ba0297fc4..610ac3c47b0f 100644 --- a/arch/arm/configs/u300_defconfig +++ b/arch/arm/configs/u300_defconfig | |||
@@ -207,7 +207,6 @@ CONFIG_MACH_U300_SPIDUMMY=y | |||
207 | # | 207 | # |
208 | # Processor Type | 208 | # Processor Type |
209 | # | 209 | # |
210 | CONFIG_CPU_32=y | ||
211 | CONFIG_CPU_ARM926T=y | 210 | CONFIG_CPU_ARM926T=y |
212 | CONFIG_CPU_32v5=y | 211 | CONFIG_CPU_32v5=y |
213 | CONFIG_CPU_ABRT_EV5TJ=y | 212 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 15fde22ce3f3..727aff9fe347 100644 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig | |||
@@ -201,7 +201,6 @@ CONFIG_MACH_U8500_MOP=y | |||
201 | # | 201 | # |
202 | # Processor Type | 202 | # Processor Type |
203 | # | 203 | # |
204 | CONFIG_CPU_32=y | ||
205 | CONFIG_CPU_32v6K=y | 204 | CONFIG_CPU_32v6K=y |
206 | CONFIG_CPU_V7=y | 205 | CONFIG_CPU_V7=y |
207 | CONFIG_CPU_32v7=y | 206 | CONFIG_CPU_32v7=y |
diff --git a/arch/arm/configs/usb-a9260_defconfig b/arch/arm/configs/usb-a9260_defconfig index fd7774033d64..87b700e2db84 100644 --- a/arch/arm/configs/usb-a9260_defconfig +++ b/arch/arm/configs/usb-a9260_defconfig | |||
@@ -195,7 +195,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
195 | # | 195 | # |
196 | # Processor Type | 196 | # Processor Type |
197 | # | 197 | # |
198 | CONFIG_CPU_32=y | ||
199 | CONFIG_CPU_ARM926T=y | 198 | CONFIG_CPU_ARM926T=y |
200 | CONFIG_CPU_32v5=y | 199 | CONFIG_CPU_32v5=y |
201 | CONFIG_CPU_ABRT_EV5TJ=y | 200 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/usb-a9263_defconfig b/arch/arm/configs/usb-a9263_defconfig index e7c19dd92557..7f018edd2480 100644 --- a/arch/arm/configs/usb-a9263_defconfig +++ b/arch/arm/configs/usb-a9263_defconfig | |||
@@ -187,7 +187,6 @@ CONFIG_AT91_EARLY_DBGU=y | |||
187 | # | 187 | # |
188 | # Processor Type | 188 | # Processor Type |
189 | # | 189 | # |
190 | CONFIG_CPU_32=y | ||
191 | CONFIG_CPU_ARM926T=y | 190 | CONFIG_CPU_ARM926T=y |
192 | CONFIG_CPU_32v5=y | 191 | CONFIG_CPU_32v5=y |
193 | CONFIG_CPU_ABRT_EV5TJ=y | 192 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig index b11c5da3996c..a1af0b972c0d 100644 --- a/arch/arm/configs/versatile_defconfig +++ b/arch/arm/configs/versatile_defconfig | |||
@@ -117,7 +117,6 @@ CONFIG_MACH_VERSATILE_AB=y | |||
117 | # | 117 | # |
118 | # Processor Type | 118 | # Processor Type |
119 | # | 119 | # |
120 | CONFIG_CPU_32=y | ||
121 | CONFIG_CPU_ARM926T=y | 120 | CONFIG_CPU_ARM926T=y |
122 | CONFIG_CPU_32v5=y | 121 | CONFIG_CPU_32v5=y |
123 | CONFIG_CPU_ABRT_EV5TJ=y | 122 | CONFIG_CPU_ABRT_EV5TJ=y |
diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index 6ab5dd5868de..909887ae524c 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig | |||
@@ -204,7 +204,6 @@ CONFIG_PXA_HAVE_ISA_IRQS=y | |||
204 | # | 204 | # |
205 | # Processor Type | 205 | # Processor Type |
206 | # | 206 | # |
207 | CONFIG_CPU_32=y | ||
208 | CONFIG_CPU_XSCALE=y | 207 | CONFIG_CPU_XSCALE=y |
209 | CONFIG_CPU_32v5=y | 208 | CONFIG_CPU_32v5=y |
210 | CONFIG_CPU_ABRT_EV5T=y | 209 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig index 33bb7250946b..84a72ac222cf 100644 --- a/arch/arm/configs/xcep_defconfig +++ b/arch/arm/configs/xcep_defconfig | |||
@@ -208,7 +208,6 @@ CONFIG_PLAT_PXA=y | |||
208 | # | 208 | # |
209 | # Processor Type | 209 | # Processor Type |
210 | # | 210 | # |
211 | CONFIG_CPU_32=y | ||
212 | CONFIG_CPU_XSCALE=y | 211 | CONFIG_CPU_XSCALE=y |
213 | CONFIG_CPU_32v5=y | 212 | CONFIG_CPU_32v5=y |
214 | CONFIG_CPU_ABRT_EV5T=y | 213 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/configs/yl9200_defconfig b/arch/arm/configs/yl9200_defconfig index 9192e5977674..3b627aadeb54 100644 --- a/arch/arm/configs/yl9200_defconfig +++ b/arch/arm/configs/yl9200_defconfig | |||
@@ -183,7 +183,6 @@ CONFIG_MACH_YL9200=y | |||
183 | # | 183 | # |
184 | # Processor Type | 184 | # Processor Type |
185 | # | 185 | # |
186 | CONFIG_CPU_32=y | ||
187 | CONFIG_CPU_ARM920T=y | 186 | CONFIG_CPU_ARM920T=y |
188 | CONFIG_CPU_32v4T=y | 187 | CONFIG_CPU_32v4T=y |
189 | CONFIG_CPU_ABRT_EV4T=y | 188 | CONFIG_CPU_ABRT_EV4T=y |
diff --git a/arch/arm/configs/zeus_defconfig b/arch/arm/configs/zeus_defconfig index 823b11e7091a..fca5ff68ea67 100644 --- a/arch/arm/configs/zeus_defconfig +++ b/arch/arm/configs/zeus_defconfig | |||
@@ -271,7 +271,6 @@ CONFIG_PLAT_PXA=y | |||
271 | # | 271 | # |
272 | # Processor Type | 272 | # Processor Type |
273 | # | 273 | # |
274 | CONFIG_CPU_32=y | ||
275 | CONFIG_CPU_XSCALE=y | 274 | CONFIG_CPU_XSCALE=y |
276 | CONFIG_CPU_32v5=y | 275 | CONFIG_CPU_32v5=y |
277 | CONFIG_CPU_ABRT_EV5T=y | 276 | CONFIG_CPU_ABRT_EV5T=y |
diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h index 3976412685f8..8fdae9bc9abb 100644 --- a/arch/arm/include/asm/proc-fns.h +++ b/arch/arm/include/asm/proc-fns.h | |||
@@ -24,206 +24,228 @@ | |||
24 | * CPU_NAME - the prefix for CPU related functions | 24 | * CPU_NAME - the prefix for CPU related functions |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #ifdef CONFIG_CPU_32 | 27 | #ifdef CONFIG_CPU_ARM610 |
28 | # ifdef CONFIG_CPU_ARM610 | 28 | # ifdef CPU_NAME |
29 | # ifdef CPU_NAME | 29 | # undef MULTI_CPU |
30 | # undef MULTI_CPU | 30 | # define MULTI_CPU |
31 | # define MULTI_CPU | 31 | # else |
32 | # else | 32 | # define CPU_NAME cpu_arm6 |
33 | # define CPU_NAME cpu_arm6 | ||
34 | # endif | ||
35 | # endif | 33 | # endif |
36 | # ifdef CONFIG_CPU_ARM7TDMI | 34 | #endif |
37 | # ifdef CPU_NAME | 35 | |
38 | # undef MULTI_CPU | 36 | #ifdef CONFIG_CPU_ARM7TDMI |
39 | # define MULTI_CPU | 37 | # ifdef CPU_NAME |
40 | # else | 38 | # undef MULTI_CPU |
41 | # define CPU_NAME cpu_arm7tdmi | 39 | # define MULTI_CPU |
42 | # endif | 40 | # else |
41 | # define CPU_NAME cpu_arm7tdmi | ||
43 | # endif | 42 | # endif |
44 | # ifdef CONFIG_CPU_ARM710 | 43 | #endif |
45 | # ifdef CPU_NAME | 44 | |
46 | # undef MULTI_CPU | 45 | #ifdef CONFIG_CPU_ARM710 |
47 | # define MULTI_CPU | 46 | # ifdef CPU_NAME |
48 | # else | 47 | # undef MULTI_CPU |
49 | # define CPU_NAME cpu_arm7 | 48 | # define MULTI_CPU |
50 | # endif | 49 | # else |
50 | # define CPU_NAME cpu_arm7 | ||
51 | # endif | 51 | # endif |
52 | # ifdef CONFIG_CPU_ARM720T | 52 | #endif |
53 | # ifdef CPU_NAME | 53 | |
54 | # undef MULTI_CPU | 54 | #ifdef CONFIG_CPU_ARM720T |
55 | # define MULTI_CPU | 55 | # ifdef CPU_NAME |
56 | # else | 56 | # undef MULTI_CPU |
57 | # define CPU_NAME cpu_arm720 | 57 | # define MULTI_CPU |
58 | # endif | 58 | # else |
59 | # define CPU_NAME cpu_arm720 | ||
59 | # endif | 60 | # endif |
60 | # ifdef CONFIG_CPU_ARM740T | 61 | #endif |
61 | # ifdef CPU_NAME | 62 | |
62 | # undef MULTI_CPU | 63 | #ifdef CONFIG_CPU_ARM740T |
63 | # define MULTI_CPU | 64 | # ifdef CPU_NAME |
64 | # else | 65 | # undef MULTI_CPU |
65 | # define CPU_NAME cpu_arm740 | 66 | # define MULTI_CPU |
66 | # endif | 67 | # else |
68 | # define CPU_NAME cpu_arm740 | ||
67 | # endif | 69 | # endif |
68 | # ifdef CONFIG_CPU_ARM9TDMI | 70 | #endif |
69 | # ifdef CPU_NAME | 71 | |
70 | # undef MULTI_CPU | 72 | #ifdef CONFIG_CPU_ARM9TDMI |
71 | # define MULTI_CPU | 73 | # ifdef CPU_NAME |
72 | # else | 74 | # undef MULTI_CPU |
73 | # define CPU_NAME cpu_arm9tdmi | 75 | # define MULTI_CPU |
74 | # endif | 76 | # else |
77 | # define CPU_NAME cpu_arm9tdmi | ||
75 | # endif | 78 | # endif |
76 | # ifdef CONFIG_CPU_ARM920T | 79 | #endif |
77 | # ifdef CPU_NAME | 80 | |
78 | # undef MULTI_CPU | 81 | #ifdef CONFIG_CPU_ARM920T |
79 | # define MULTI_CPU | 82 | # ifdef CPU_NAME |
80 | # else | 83 | # undef MULTI_CPU |
81 | # define CPU_NAME cpu_arm920 | 84 | # define MULTI_CPU |
82 | # endif | 85 | # else |
86 | # define CPU_NAME cpu_arm920 | ||
83 | # endif | 87 | # endif |
84 | # ifdef CONFIG_CPU_ARM922T | 88 | #endif |
85 | # ifdef CPU_NAME | 89 | |
86 | # undef MULTI_CPU | 90 | #ifdef CONFIG_CPU_ARM922T |
87 | # define MULTI_CPU | 91 | # ifdef CPU_NAME |
88 | # else | 92 | # undef MULTI_CPU |
89 | # define CPU_NAME cpu_arm922 | 93 | # define MULTI_CPU |
90 | # endif | 94 | # else |
95 | # define CPU_NAME cpu_arm922 | ||
91 | # endif | 96 | # endif |
92 | # ifdef CONFIG_CPU_FA526 | 97 | #endif |
93 | # ifdef CPU_NAME | 98 | |
94 | # undef MULTI_CPU | 99 | #ifdef CONFIG_CPU_FA526 |
95 | # define MULTI_CPU | 100 | # ifdef CPU_NAME |
96 | # else | 101 | # undef MULTI_CPU |
97 | # define CPU_NAME cpu_fa526 | 102 | # define MULTI_CPU |
98 | # endif | 103 | # else |
104 | # define CPU_NAME cpu_fa526 | ||
99 | # endif | 105 | # endif |
100 | # ifdef CONFIG_CPU_ARM925T | 106 | #endif |
101 | # ifdef CPU_NAME | 107 | |
102 | # undef MULTI_CPU | 108 | #ifdef CONFIG_CPU_ARM925T |
103 | # define MULTI_CPU | 109 | # ifdef CPU_NAME |
104 | # else | 110 | # undef MULTI_CPU |
105 | # define CPU_NAME cpu_arm925 | 111 | # define MULTI_CPU |
106 | # endif | 112 | # else |
113 | # define CPU_NAME cpu_arm925 | ||
107 | # endif | 114 | # endif |
108 | # ifdef CONFIG_CPU_ARM926T | 115 | #endif |
109 | # ifdef CPU_NAME | 116 | |
110 | # undef MULTI_CPU | 117 | #ifdef CONFIG_CPU_ARM926T |
111 | # define MULTI_CPU | 118 | # ifdef CPU_NAME |
112 | # else | 119 | # undef MULTI_CPU |
113 | # define CPU_NAME cpu_arm926 | 120 | # define MULTI_CPU |
114 | # endif | 121 | # else |
122 | # define CPU_NAME cpu_arm926 | ||
115 | # endif | 123 | # endif |
116 | # ifdef CONFIG_CPU_ARM940T | 124 | #endif |
117 | # ifdef CPU_NAME | 125 | |
118 | # undef MULTI_CPU | 126 | #ifdef CONFIG_CPU_ARM940T |
119 | # define MULTI_CPU | 127 | # ifdef CPU_NAME |
120 | # else | 128 | # undef MULTI_CPU |
121 | # define CPU_NAME cpu_arm940 | 129 | # define MULTI_CPU |
122 | # endif | 130 | # else |
131 | # define CPU_NAME cpu_arm940 | ||
123 | # endif | 132 | # endif |
124 | # ifdef CONFIG_CPU_ARM946E | 133 | #endif |
125 | # ifdef CPU_NAME | 134 | |
126 | # undef MULTI_CPU | 135 | #ifdef CONFIG_CPU_ARM946E |
127 | # define MULTI_CPU | 136 | # ifdef CPU_NAME |
128 | # else | 137 | # undef MULTI_CPU |
129 | # define CPU_NAME cpu_arm946 | 138 | # define MULTI_CPU |
130 | # endif | 139 | # else |
140 | # define CPU_NAME cpu_arm946 | ||
131 | # endif | 141 | # endif |
132 | # ifdef CONFIG_CPU_SA110 | 142 | #endif |
133 | # ifdef CPU_NAME | 143 | |
134 | # undef MULTI_CPU | 144 | #ifdef CONFIG_CPU_SA110 |
135 | # define MULTI_CPU | 145 | # ifdef CPU_NAME |
136 | # else | 146 | # undef MULTI_CPU |
137 | # define CPU_NAME cpu_sa110 | 147 | # define MULTI_CPU |
138 | # endif | 148 | # else |
149 | # define CPU_NAME cpu_sa110 | ||
139 | # endif | 150 | # endif |
140 | # ifdef CONFIG_CPU_SA1100 | 151 | #endif |
141 | # ifdef CPU_NAME | 152 | |
142 | # undef MULTI_CPU | 153 | #ifdef CONFIG_CPU_SA1100 |
143 | # define MULTI_CPU | 154 | # ifdef CPU_NAME |
144 | # else | 155 | # undef MULTI_CPU |
145 | # define CPU_NAME cpu_sa1100 | 156 | # define MULTI_CPU |
146 | # endif | 157 | # else |
158 | # define CPU_NAME cpu_sa1100 | ||
147 | # endif | 159 | # endif |
148 | # ifdef CONFIG_CPU_ARM1020 | 160 | #endif |
149 | # ifdef CPU_NAME | 161 | |
150 | # undef MULTI_CPU | 162 | #ifdef CONFIG_CPU_ARM1020 |
151 | # define MULTI_CPU | 163 | # ifdef CPU_NAME |
152 | # else | 164 | # undef MULTI_CPU |
153 | # define CPU_NAME cpu_arm1020 | 165 | # define MULTI_CPU |
154 | # endif | 166 | # else |
167 | # define CPU_NAME cpu_arm1020 | ||
155 | # endif | 168 | # endif |
156 | # ifdef CONFIG_CPU_ARM1020E | 169 | #endif |
157 | # ifdef CPU_NAME | 170 | |
158 | # undef MULTI_CPU | 171 | #ifdef CONFIG_CPU_ARM1020E |
159 | # define MULTI_CPU | 172 | # ifdef CPU_NAME |
160 | # else | 173 | # undef MULTI_CPU |
161 | # define CPU_NAME cpu_arm1020e | 174 | # define MULTI_CPU |
162 | # endif | 175 | # else |
176 | # define CPU_NAME cpu_arm1020e | ||
163 | # endif | 177 | # endif |
164 | # ifdef CONFIG_CPU_ARM1022 | 178 | #endif |
165 | # ifdef CPU_NAME | 179 | |
166 | # undef MULTI_CPU | 180 | #ifdef CONFIG_CPU_ARM1022 |
167 | # define MULTI_CPU | 181 | # ifdef CPU_NAME |
168 | # else | 182 | # undef MULTI_CPU |
169 | # define CPU_NAME cpu_arm1022 | 183 | # define MULTI_CPU |
170 | # endif | 184 | # else |
185 | # define CPU_NAME cpu_arm1022 | ||
171 | # endif | 186 | # endif |
172 | # ifdef CONFIG_CPU_ARM1026 | 187 | #endif |
173 | # ifdef CPU_NAME | 188 | |
174 | # undef MULTI_CPU | 189 | #ifdef CONFIG_CPU_ARM1026 |
175 | # define MULTI_CPU | 190 | # ifdef CPU_NAME |
176 | # else | 191 | # undef MULTI_CPU |
177 | # define CPU_NAME cpu_arm1026 | 192 | # define MULTI_CPU |
178 | # endif | 193 | # else |
194 | # define CPU_NAME cpu_arm1026 | ||
179 | # endif | 195 | # endif |
180 | # ifdef CONFIG_CPU_XSCALE | 196 | #endif |
181 | # ifdef CPU_NAME | 197 | |
182 | # undef MULTI_CPU | 198 | #ifdef CONFIG_CPU_XSCALE |
183 | # define MULTI_CPU | 199 | # ifdef CPU_NAME |
184 | # else | 200 | # undef MULTI_CPU |
185 | # define CPU_NAME cpu_xscale | 201 | # define MULTI_CPU |
186 | # endif | 202 | # else |
203 | # define CPU_NAME cpu_xscale | ||
187 | # endif | 204 | # endif |
188 | # ifdef CONFIG_CPU_XSC3 | 205 | #endif |
189 | # ifdef CPU_NAME | 206 | |
190 | # undef MULTI_CPU | 207 | #ifdef CONFIG_CPU_XSC3 |
191 | # define MULTI_CPU | 208 | # ifdef CPU_NAME |
192 | # else | 209 | # undef MULTI_CPU |
193 | # define CPU_NAME cpu_xsc3 | 210 | # define MULTI_CPU |
194 | # endif | 211 | # else |
212 | # define CPU_NAME cpu_xsc3 | ||
195 | # endif | 213 | # endif |
196 | # ifdef CONFIG_CPU_MOHAWK | 214 | #endif |
197 | # ifdef CPU_NAME | 215 | |
198 | # undef MULTI_CPU | 216 | #ifdef CONFIG_CPU_MOHAWK |
199 | # define MULTI_CPU | 217 | # ifdef CPU_NAME |
200 | # else | 218 | # undef MULTI_CPU |
201 | # define CPU_NAME cpu_mohawk | 219 | # define MULTI_CPU |
202 | # endif | 220 | # else |
221 | # define CPU_NAME cpu_mohawk | ||
203 | # endif | 222 | # endif |
204 | # ifdef CONFIG_CPU_FEROCEON | 223 | #endif |
205 | # ifdef CPU_NAME | 224 | |
206 | # undef MULTI_CPU | 225 | #ifdef CONFIG_CPU_FEROCEON |
207 | # define MULTI_CPU | 226 | # ifdef CPU_NAME |
208 | # else | 227 | # undef MULTI_CPU |
209 | # define CPU_NAME cpu_feroceon | 228 | # define MULTI_CPU |
210 | # endif | 229 | # else |
230 | # define CPU_NAME cpu_feroceon | ||
211 | # endif | 231 | # endif |
212 | # ifdef CONFIG_CPU_V6 | 232 | #endif |
213 | # ifdef CPU_NAME | 233 | |
214 | # undef MULTI_CPU | 234 | #ifdef CONFIG_CPU_V6 |
215 | # define MULTI_CPU | 235 | # ifdef CPU_NAME |
216 | # else | 236 | # undef MULTI_CPU |
217 | # define CPU_NAME cpu_v6 | 237 | # define MULTI_CPU |
218 | # endif | 238 | # else |
239 | # define CPU_NAME cpu_v6 | ||
219 | # endif | 240 | # endif |
220 | # ifdef CONFIG_CPU_V7 | 241 | #endif |
221 | # ifdef CPU_NAME | 242 | |
222 | # undef MULTI_CPU | 243 | #ifdef CONFIG_CPU_V7 |
223 | # define MULTI_CPU | 244 | # ifdef CPU_NAME |
224 | # else | 245 | # undef MULTI_CPU |
225 | # define CPU_NAME cpu_v7 | 246 | # define MULTI_CPU |
226 | # endif | 247 | # else |
248 | # define CPU_NAME cpu_v7 | ||
227 | # endif | 249 | # endif |
228 | #endif | 250 | #endif |
229 | 251 | ||
diff --git a/arch/arm/include/asm/thread_notify.h b/arch/arm/include/asm/thread_notify.h index f27379d7f72a..c4391ba20350 100644 --- a/arch/arm/include/asm/thread_notify.h +++ b/arch/arm/include/asm/thread_notify.h | |||
@@ -41,7 +41,7 @@ static inline void thread_notify(unsigned long rc, struct thread_info *thread) | |||
41 | * These are the reason codes for the thread notifier. | 41 | * These are the reason codes for the thread notifier. |
42 | */ | 42 | */ |
43 | #define THREAD_NOTIFY_FLUSH 0 | 43 | #define THREAD_NOTIFY_FLUSH 0 |
44 | #define THREAD_NOTIFY_RELEASE 1 | 44 | #define THREAD_NOTIFY_EXIT 1 |
45 | #define THREAD_NOTIFY_SWITCH 2 | 45 | #define THREAD_NOTIFY_SWITCH 2 |
46 | 46 | ||
47 | #endif | 47 | #endif |
diff --git a/arch/arm/kernel/crunch.c b/arch/arm/kernel/crunch.c index 769abe15cf91..25ef223ba7f3 100644 --- a/arch/arm/kernel/crunch.c +++ b/arch/arm/kernel/crunch.c | |||
@@ -51,7 +51,7 @@ static int crunch_do(struct notifier_block *self, unsigned long cmd, void *t) | |||
51 | * initialised state information on the first fault. | 51 | * initialised state information on the first fault. |
52 | */ | 52 | */ |
53 | 53 | ||
54 | case THREAD_NOTIFY_RELEASE: | 54 | case THREAD_NOTIFY_EXIT: |
55 | crunch_task_release(thread); | 55 | crunch_task_release(thread); |
56 | break; | 56 | break; |
57 | 57 | ||
diff --git a/arch/arm/kernel/dma-isa.c b/arch/arm/kernel/dma-isa.c index 0e88e46fc732..360bb6d701f5 100644 --- a/arch/arm/kernel/dma-isa.c +++ b/arch/arm/kernel/dma-isa.c | |||
@@ -207,8 +207,6 @@ void __init isa_init_dma(void) | |||
207 | outb(0x32, 0x4d6); | 207 | outb(0x32, 0x4d6); |
208 | outb(0x33, 0x4d6); | 208 | outb(0x33, 0x4d6); |
209 | 209 | ||
210 | request_dma(DMA_ISA_CASCADE, "cascade"); | ||
211 | |||
212 | for (i = 0; i < ARRAY_SIZE(dma_resources); i++) | 210 | for (i = 0; i < ARRAY_SIZE(dma_resources); i++) |
213 | request_resource(&ioport_resource, dma_resources + i); | 211 | request_resource(&ioport_resource, dma_resources + i); |
214 | 212 | ||
@@ -218,5 +216,7 @@ void __init isa_init_dma(void) | |||
218 | printk(KERN_ERR "ISADMA%u: unable to register: %d\n", | 216 | printk(KERN_ERR "ISADMA%u: unable to register: %d\n", |
219 | chan, ret); | 217 | chan, ret); |
220 | } | 218 | } |
219 | |||
220 | request_dma(DMA_ISA_CASCADE, "cascade"); | ||
221 | } | 221 | } |
222 | } | 222 | } |
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 0d96d0171c05..67304138a2ca 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
@@ -274,17 +274,18 @@ void show_regs(struct pt_regs * regs) | |||
274 | __backtrace(); | 274 | __backtrace(); |
275 | } | 275 | } |
276 | 276 | ||
277 | ATOMIC_NOTIFIER_HEAD(thread_notify_head); | ||
278 | |||
279 | EXPORT_SYMBOL_GPL(thread_notify_head); | ||
280 | |||
277 | /* | 281 | /* |
278 | * Free current thread data structures etc.. | 282 | * Free current thread data structures etc.. |
279 | */ | 283 | */ |
280 | void exit_thread(void) | 284 | void exit_thread(void) |
281 | { | 285 | { |
286 | thread_notify(THREAD_NOTIFY_EXIT, current_thread_info()); | ||
282 | } | 287 | } |
283 | 288 | ||
284 | ATOMIC_NOTIFIER_HEAD(thread_notify_head); | ||
285 | |||
286 | EXPORT_SYMBOL_GPL(thread_notify_head); | ||
287 | |||
288 | void flush_thread(void) | 289 | void flush_thread(void) |
289 | { | 290 | { |
290 | struct thread_info *thread = current_thread_info(); | 291 | struct thread_info *thread = current_thread_info(); |
@@ -299,9 +300,6 @@ void flush_thread(void) | |||
299 | 300 | ||
300 | void release_thread(struct task_struct *dead_task) | 301 | void release_thread(struct task_struct *dead_task) |
301 | { | 302 | { |
302 | struct thread_info *thread = task_thread_info(dead_task); | ||
303 | |||
304 | thread_notify(THREAD_NOTIFY_RELEASE, thread); | ||
305 | } | 303 | } |
306 | 304 | ||
307 | asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); | 305 | asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); |
diff --git a/arch/arm/kernel/xscale-cp0.c b/arch/arm/kernel/xscale-cp0.c index 17127db906fa..1796157e3dd5 100644 --- a/arch/arm/kernel/xscale-cp0.c +++ b/arch/arm/kernel/xscale-cp0.c | |||
@@ -70,7 +70,7 @@ static int iwmmxt_do(struct notifier_block *self, unsigned long cmd, void *t) | |||
70 | * initialised state information on the first fault. | 70 | * initialised state information on the first fault. |
71 | */ | 71 | */ |
72 | 72 | ||
73 | case THREAD_NOTIFY_RELEASE: | 73 | case THREAD_NOTIFY_EXIT: |
74 | iwmmxt_task_release(thread); | 74 | iwmmxt_task_release(thread); |
75 | break; | 75 | break; |
76 | 76 | ||
diff --git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile index 32f8609e4f85..3afb1b25946f 100644 --- a/arch/arm/mach-footbridge/Makefile +++ b/arch/arm/mach-footbridge/Makefile | |||
@@ -4,7 +4,7 @@ | |||
4 | 4 | ||
5 | # Object file lists. | 5 | # Object file lists. |
6 | 6 | ||
7 | obj-y := common.o dc21285.o dma.o isa-irq.o time.o | 7 | obj-y := common.o dc21285.o dma.o isa-irq.o |
8 | obj-m := | 8 | obj-m := |
9 | obj-n := | 9 | obj-n := |
10 | obj- := | 10 | obj- := |
@@ -25,4 +25,4 @@ obj-$(CONFIG_ARCH_PERSONAL_SERVER) += personal.o dc21285-timer.o | |||
25 | obj-$(CONFIG_PCI) +=$(pci-y) | 25 | obj-$(CONFIG_PCI) +=$(pci-y) |
26 | obj-$(CONFIG_LEDS) +=$(leds-y) | 26 | obj-$(CONFIG_LEDS) +=$(leds-y) |
27 | 27 | ||
28 | obj-$(CONFIG_ISA) += isa.o | 28 | obj-$(CONFIG_ISA) += isa.o isa-rtc.o |
diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index da35bc5c5ccc..bc5e83fb5819 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c | |||
@@ -56,8 +56,6 @@ static void __init footbridge_timer_init(void) | |||
56 | *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD | TIMER_CNTL_DIV16; | 56 | *CSR_TIMER1_CNTL = TIMER_CNTL_ENABLE | TIMER_CNTL_AUTORELOAD | TIMER_CNTL_DIV16; |
57 | 57 | ||
58 | setup_irq(IRQ_TIMER1, &footbridge_timer_irq); | 58 | setup_irq(IRQ_TIMER1, &footbridge_timer_irq); |
59 | |||
60 | isa_rtc_init(); | ||
61 | } | 59 | } |
62 | 60 | ||
63 | struct sys_timer footbridge_timer = { | 61 | struct sys_timer footbridge_timer = { |
diff --git a/arch/arm/mach-footbridge/isa-rtc.c b/arch/arm/mach-footbridge/isa-rtc.c new file mode 100644 index 000000000000..07fde4051f78 --- /dev/null +++ b/arch/arm/mach-footbridge/isa-rtc.c | |||
@@ -0,0 +1,57 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-footbridge/isa-rtc.c | ||
3 | * | ||
4 | * Copyright (C) 1998 Russell King. | ||
5 | * Copyright (C) 1998 Phil Blundell | ||
6 | * | ||
7 | * CATS has a real-time clock, though the evaluation board doesn't. | ||
8 | * | ||
9 | * Changelog: | ||
10 | * 21-Mar-1998 RMK Created | ||
11 | * 27-Aug-1998 PJB CATS support | ||
12 | * 28-Dec-1998 APH Made leds optional | ||
13 | * 20-Jan-1999 RMK Started merge of EBSA285, CATS and NetWinder | ||
14 | * 16-Mar-1999 RMK More support for EBSA285-like machines with RTCs in | ||
15 | */ | ||
16 | |||
17 | #define RTC_PORT(x) (0x70+(x)) | ||
18 | #define RTC_ALWAYS_BCD 0 | ||
19 | |||
20 | #include <linux/init.h> | ||
21 | #include <linux/mc146818rtc.h> | ||
22 | #include <linux/bcd.h> | ||
23 | #include <linux/io.h> | ||
24 | |||
25 | #include "common.h" | ||
26 | |||
27 | void __init isa_rtc_init(void) | ||
28 | { | ||
29 | int reg_d, reg_b; | ||
30 | |||
31 | /* | ||
32 | * Probe for the RTC. | ||
33 | */ | ||
34 | reg_d = CMOS_READ(RTC_REG_D); | ||
35 | |||
36 | /* | ||
37 | * make sure the divider is set | ||
38 | */ | ||
39 | CMOS_WRITE(RTC_REF_CLCK_32KHZ, RTC_REG_A); | ||
40 | |||
41 | /* | ||
42 | * Set control reg B | ||
43 | * (24 hour mode, update enabled) | ||
44 | */ | ||
45 | reg_b = CMOS_READ(RTC_REG_B) & 0x7f; | ||
46 | reg_b |= 2; | ||
47 | CMOS_WRITE(reg_b, RTC_REG_B); | ||
48 | |||
49 | if ((CMOS_READ(RTC_REG_A) & 0x7f) == RTC_REF_CLCK_32KHZ && | ||
50 | CMOS_READ(RTC_REG_B) == reg_b) { | ||
51 | /* | ||
52 | * We have a RTC. Check the battery | ||
53 | */ | ||
54 | if ((reg_d & 0x80) == 0) | ||
55 | printk(KERN_WARNING "RTC: *** warning: CMOS battery bad\n"); | ||
56 | } | ||
57 | } | ||
diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c index 0c8390082fa8..f488fa2082d7 100644 --- a/arch/arm/mach-footbridge/isa-timer.c +++ b/arch/arm/mach-footbridge/isa-timer.c | |||
@@ -76,8 +76,6 @@ static struct irqaction isa_timer_irq = { | |||
76 | 76 | ||
77 | static void __init isa_timer_init(void) | 77 | static void __init isa_timer_init(void) |
78 | { | 78 | { |
79 | isa_rtc_init(); | ||
80 | |||
81 | /* enable PIT timer */ | 79 | /* enable PIT timer */ |
82 | /* set for periodic (4) and LSB/MSB write (0x30) */ | 80 | /* set for periodic (4) and LSB/MSB write (0x30) */ |
83 | outb(0x34, 0x43); | 81 | outb(0x34, 0x43); |
diff --git a/arch/arm/mach-footbridge/isa.c b/arch/arm/mach-footbridge/isa.c index 725a219d0ed5..4d9276c27d6f 100644 --- a/arch/arm/mach-footbridge/isa.c +++ b/arch/arm/mach-footbridge/isa.c | |||
@@ -11,6 +11,9 @@ | |||
11 | #include <linux/serial_8250.h> | 11 | #include <linux/serial_8250.h> |
12 | 12 | ||
13 | #include <asm/irq.h> | 13 | #include <asm/irq.h> |
14 | #include <asm/hardware/dec21285.h> | ||
15 | |||
16 | #include "common.h" | ||
14 | 17 | ||
15 | static struct resource rtc_resources[] = { | 18 | static struct resource rtc_resources[] = { |
16 | [0] = { | 19 | [0] = { |
@@ -77,11 +80,18 @@ static struct platform_device serial_device = { | |||
77 | 80 | ||
78 | static int __init footbridge_isa_init(void) | 81 | static int __init footbridge_isa_init(void) |
79 | { | 82 | { |
80 | int err; | 83 | int err = 0; |
81 | 84 | ||
82 | err = platform_device_register(&rtc_device); | 85 | if (!footbridge_cfn_mode()) |
83 | if (err) | 86 | return 0; |
84 | printk(KERN_ERR "Unable to register RTC device: %d\n", err); | 87 | |
88 | /* Personal server doesn't have RTC */ | ||
89 | if (!machine_is_personal_server()) { | ||
90 | isa_rtc_init(); | ||
91 | err = platform_device_register(&rtc_device); | ||
92 | if (err) | ||
93 | printk(KERN_ERR "Unable to register RTC device: %d\n", err); | ||
94 | } | ||
85 | err = platform_device_register(&serial_device); | 95 | err = platform_device_register(&serial_device); |
86 | if (err) | 96 | if (err) |
87 | printk(KERN_ERR "Unable to register serial device: %d\n", err); | 97 | printk(KERN_ERR "Unable to register serial device: %d\n", err); |
diff --git a/arch/arm/mach-footbridge/time.c b/arch/arm/mach-footbridge/time.c deleted file mode 100644 index cd1b54ff9fe2..000000000000 --- a/arch/arm/mach-footbridge/time.c +++ /dev/null | |||
@@ -1,164 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-footbridge/include/mach/time.h | ||
3 | * | ||
4 | * Copyright (C) 1998 Russell King. | ||
5 | * Copyright (C) 1998 Phil Blundell | ||
6 | * | ||
7 | * CATS has a real-time clock, though the evaluation board doesn't. | ||
8 | * | ||
9 | * Changelog: | ||
10 | * 21-Mar-1998 RMK Created | ||
11 | * 27-Aug-1998 PJB CATS support | ||
12 | * 28-Dec-1998 APH Made leds optional | ||
13 | * 20-Jan-1999 RMK Started merge of EBSA285, CATS and NetWinder | ||
14 | * 16-Mar-1999 RMK More support for EBSA285-like machines with RTCs in | ||
15 | */ | ||
16 | |||
17 | #define RTC_PORT(x) (rtc_base+(x)) | ||
18 | #define RTC_ALWAYS_BCD 0 | ||
19 | |||
20 | #include <linux/timex.h> | ||
21 | #include <linux/init.h> | ||
22 | #include <linux/sched.h> | ||
23 | #include <linux/mc146818rtc.h> | ||
24 | #include <linux/bcd.h> | ||
25 | #include <linux/io.h> | ||
26 | |||
27 | #include <mach/hardware.h> | ||
28 | |||
29 | #include <asm/mach/time.h> | ||
30 | #include "common.h" | ||
31 | |||
32 | static int rtc_base; | ||
33 | |||
34 | static unsigned long __init get_isa_cmos_time(void) | ||
35 | { | ||
36 | unsigned int year, mon, day, hour, min, sec; | ||
37 | |||
38 | // check to see if the RTC makes sense..... | ||
39 | if ((CMOS_READ(RTC_VALID) & RTC_VRT) == 0) | ||
40 | return mktime(1970, 1, 1, 0, 0, 0); | ||
41 | |||
42 | do { | ||
43 | sec = CMOS_READ(RTC_SECONDS); | ||
44 | min = CMOS_READ(RTC_MINUTES); | ||
45 | hour = CMOS_READ(RTC_HOURS); | ||
46 | day = CMOS_READ(RTC_DAY_OF_MONTH); | ||
47 | mon = CMOS_READ(RTC_MONTH); | ||
48 | year = CMOS_READ(RTC_YEAR); | ||
49 | } while (sec != CMOS_READ(RTC_SECONDS)); | ||
50 | |||
51 | if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { | ||
52 | sec = bcd2bin(sec); | ||
53 | min = bcd2bin(min); | ||
54 | hour = bcd2bin(hour); | ||
55 | day = bcd2bin(day); | ||
56 | mon = bcd2bin(mon); | ||
57 | year = bcd2bin(year); | ||
58 | } | ||
59 | if ((year += 1900) < 1970) | ||
60 | year += 100; | ||
61 | return mktime(year, mon, day, hour, min, sec); | ||
62 | } | ||
63 | |||
64 | static int set_isa_cmos_time(void) | ||
65 | { | ||
66 | int retval = 0; | ||
67 | int real_seconds, real_minutes, cmos_minutes; | ||
68 | unsigned char save_control, save_freq_select; | ||
69 | unsigned long nowtime = xtime.tv_sec; | ||
70 | |||
71 | save_control = CMOS_READ(RTC_CONTROL); /* tell the clock it's being set */ | ||
72 | CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL); | ||
73 | |||
74 | save_freq_select = CMOS_READ(RTC_FREQ_SELECT); /* stop and reset prescaler */ | ||
75 | CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); | ||
76 | |||
77 | cmos_minutes = CMOS_READ(RTC_MINUTES); | ||
78 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | ||
79 | cmos_minutes = bcd2bin(cmos_minutes); | ||
80 | |||
81 | /* | ||
82 | * since we're only adjusting minutes and seconds, | ||
83 | * don't interfere with hour overflow. This avoids | ||
84 | * messing with unknown time zones but requires your | ||
85 | * RTC not to be off by more than 15 minutes | ||
86 | */ | ||
87 | real_seconds = nowtime % 60; | ||
88 | real_minutes = nowtime / 60; | ||
89 | if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1) | ||
90 | real_minutes += 30; /* correct for half hour time zone */ | ||
91 | real_minutes %= 60; | ||
92 | |||
93 | if (abs(real_minutes - cmos_minutes) < 30) { | ||
94 | if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { | ||
95 | real_seconds = bin2bcd(real_seconds); | ||
96 | real_minutes = bin2bcd(real_minutes); | ||
97 | } | ||
98 | CMOS_WRITE(real_seconds,RTC_SECONDS); | ||
99 | CMOS_WRITE(real_minutes,RTC_MINUTES); | ||
100 | } else | ||
101 | retval = -1; | ||
102 | |||
103 | /* The following flags have to be released exactly in this order, | ||
104 | * otherwise the DS12887 (popular MC146818A clone with integrated | ||
105 | * battery and quartz) will not reset the oscillator and will not | ||
106 | * update precisely 500 ms later. You won't find this mentioned in | ||
107 | * the Dallas Semiconductor data sheets, but who believes data | ||
108 | * sheets anyway ... -- Markus Kuhn | ||
109 | */ | ||
110 | CMOS_WRITE(save_control, RTC_CONTROL); | ||
111 | CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT); | ||
112 | |||
113 | return retval; | ||
114 | } | ||
115 | |||
116 | void __init isa_rtc_init(void) | ||
117 | { | ||
118 | if (machine_is_personal_server()) | ||
119 | /* | ||
120 | * Add-in 21285s shouldn't access the RTC | ||
121 | */ | ||
122 | rtc_base = 0; | ||
123 | else | ||
124 | rtc_base = 0x70; | ||
125 | |||
126 | if (rtc_base) { | ||
127 | int reg_d, reg_b; | ||
128 | |||
129 | /* | ||
130 | * Probe for the RTC. | ||
131 | */ | ||
132 | reg_d = CMOS_READ(RTC_REG_D); | ||
133 | |||
134 | /* | ||
135 | * make sure the divider is set | ||
136 | */ | ||
137 | CMOS_WRITE(RTC_REF_CLCK_32KHZ, RTC_REG_A); | ||
138 | |||
139 | /* | ||
140 | * Set control reg B | ||
141 | * (24 hour mode, update enabled) | ||
142 | */ | ||
143 | reg_b = CMOS_READ(RTC_REG_B) & 0x7f; | ||
144 | reg_b |= 2; | ||
145 | CMOS_WRITE(reg_b, RTC_REG_B); | ||
146 | |||
147 | if ((CMOS_READ(RTC_REG_A) & 0x7f) == RTC_REF_CLCK_32KHZ && | ||
148 | CMOS_READ(RTC_REG_B) == reg_b) { | ||
149 | struct timespec tv; | ||
150 | |||
151 | /* | ||
152 | * We have a RTC. Check the battery | ||
153 | */ | ||
154 | if ((reg_d & 0x80) == 0) | ||
155 | printk(KERN_WARNING "RTC: *** warning: CMOS battery bad\n"); | ||
156 | |||
157 | tv.tv_nsec = 0; | ||
158 | tv.tv_sec = get_isa_cmos_time(); | ||
159 | do_settimeofday(&tv); | ||
160 | set_rtc = set_isa_cmos_time; | ||
161 | } else | ||
162 | rtc_base = 0; | ||
163 | } | ||
164 | } | ||
diff --git a/arch/arm/mach-w90x900/cpu.c b/arch/arm/mach-w90x900/cpu.c index 921cef991bf0..20dc0c96214d 100644 --- a/arch/arm/mach-w90x900/cpu.c +++ b/arch/arm/mach-w90x900/cpu.c | |||
@@ -96,6 +96,7 @@ static struct clk_lookup nuc900_clkregs[] = { | |||
96 | 96 | ||
97 | struct plat_serial8250_port nuc900_uart_data[] = { | 97 | struct plat_serial8250_port nuc900_uart_data[] = { |
98 | NUC900_8250PORT(UART0), | 98 | NUC900_8250PORT(UART0), |
99 | {}, | ||
99 | }; | 100 | }; |
100 | 101 | ||
101 | struct platform_device nuc900_serial_device = { | 102 | struct platform_device nuc900_serial_device = { |
diff --git a/arch/arm/mach-w90x900/dev.c b/arch/arm/mach-w90x900/dev.c index 51f17b753348..ec711f4b4019 100644 --- a/arch/arm/mach-w90x900/dev.c +++ b/arch/arm/mach-w90x900/dev.c | |||
@@ -197,7 +197,7 @@ static struct platform_device nuc900_device_emc = { | |||
197 | 197 | ||
198 | /* SPI device */ | 198 | /* SPI device */ |
199 | 199 | ||
200 | static struct w90p910_spi_info nuc900_spiflash_data = { | 200 | static struct nuc900_spi_info nuc900_spiflash_data = { |
201 | .num_cs = 1, | 201 | .num_cs = 1, |
202 | .lsb = 0, | 202 | .lsb = 0, |
203 | .txneg = 1, | 203 | .txneg = 1, |
diff --git a/arch/arm/mach-w90x900/include/mach/uncompress.h b/arch/arm/mach-w90x900/include/mach/uncompress.h index 050d9fe5ae1b..56f1a74d7016 100644 --- a/arch/arm/mach-w90x900/include/mach/uncompress.h +++ b/arch/arm/mach-w90x900/include/mach/uncompress.h | |||
@@ -22,11 +22,21 @@ | |||
22 | 22 | ||
23 | #include <mach/regs-serial.h> | 23 | #include <mach/regs-serial.h> |
24 | #include <mach/map.h> | 24 | #include <mach/map.h> |
25 | #include <linux/serial_reg.h> | ||
25 | 26 | ||
26 | #define arch_decomp_wdog() | 27 | #define arch_decomp_wdog() |
27 | 28 | ||
29 | #define TX_DONE (UART_LSR_TEMT | UART_LSR_THRE) | ||
30 | static volatile u32 * uart_base = (u32 *)UART0_PA; | ||
31 | |||
28 | static void putc(int ch) | 32 | static void putc(int ch) |
29 | { | 33 | { |
34 | /* Check THRE and TEMT bits before we transmit the character. | ||
35 | */ | ||
36 | while ((uart_base[UART_LSR] & TX_DONE) != TX_DONE) | ||
37 | barrier(); | ||
38 | |||
39 | *uart_base = ch; | ||
30 | } | 40 | } |
31 | 41 | ||
32 | static inline void flush(void) | 42 | static inline void flush(void) |
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index dd4698c67cc3..baf638487a2d 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -1,9 +1,5 @@ | |||
1 | comment "Processor Type" | 1 | comment "Processor Type" |
2 | 2 | ||
3 | config CPU_32 | ||
4 | bool | ||
5 | default y | ||
6 | |||
7 | # Select CPU types depending on the architecture selected. This selects | 3 | # Select CPU types depending on the architecture selected. This selects |
8 | # which CPUs we support in the kernel image, and the compiler instruction | 4 | # which CPUs we support in the kernel image, and the compiler instruction |
9 | # optimiser behaviour. | 5 | # optimiser behaviour. |
diff --git a/arch/arm/mm/copypage-v6.c b/arch/arm/mm/copypage-v6.c index 841f355319bf..0fa1319273de 100644 --- a/arch/arm/mm/copypage-v6.c +++ b/arch/arm/mm/copypage-v6.c | |||
@@ -48,7 +48,7 @@ static void v6_copy_user_highpage_nonaliasing(struct page *to, | |||
48 | */ | 48 | */ |
49 | if (page_address(to) != NULL) | 49 | if (page_address(to) != NULL) |
50 | #endif | 50 | #endif |
51 | __cpuc_flush_dcache_page(kto); | 51 | __cpuc_flush_dcache_area(kto, PAGE_SIZE); |
52 | kunmap_atomic(kto, KM_USER1); | 52 | kunmap_atomic(kto, KM_USER1); |
53 | kunmap_atomic(kfrom, KM_USER0); | 53 | kunmap_atomic(kfrom, KM_USER0); |
54 | } | 54 | } |
diff --git a/arch/arm/mm/fault-armv.c b/arch/arm/mm/fault-armv.c index 729602291958..56ee15321b00 100644 --- a/arch/arm/mm/fault-armv.c +++ b/arch/arm/mm/fault-armv.c | |||
@@ -207,9 +207,8 @@ void __init check_writebuffer_bugs(void) | |||
207 | page = alloc_page(GFP_KERNEL); | 207 | page = alloc_page(GFP_KERNEL); |
208 | if (page) { | 208 | if (page) { |
209 | unsigned long *p1, *p2; | 209 | unsigned long *p1, *p2; |
210 | pgprot_t prot = __pgprot(L_PTE_PRESENT|L_PTE_YOUNG| | 210 | pgprot_t prot = __pgprot_modify(PAGE_KERNEL, |
211 | L_PTE_DIRTY|L_PTE_WRITE| | 211 | L_PTE_MT_MASK, L_PTE_MT_BUFFERABLE); |
212 | L_PTE_MT_BUFFERABLE); | ||
213 | 212 | ||
214 | p1 = vmap(&page, 1, VM_IOREMAP, prot); | 213 | p1 = vmap(&page, 1, VM_IOREMAP, prot); |
215 | p2 = vmap(&page, 1, VM_IOREMAP, prot); | 214 | p2 = vmap(&page, 1, VM_IOREMAP, prot); |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 8c7fbd19a4b3..1708da82da96 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -453,8 +453,7 @@ static void __init build_mem_type_table(void) | |||
453 | 453 | ||
454 | pgprot_user = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | user_pgprot); | 454 | pgprot_user = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | user_pgprot); |
455 | pgprot_kernel = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | | 455 | pgprot_kernel = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG | |
456 | L_PTE_DIRTY | L_PTE_WRITE | | 456 | L_PTE_DIRTY | L_PTE_WRITE | kern_pgprot); |
457 | L_PTE_EXEC | kern_pgprot); | ||
458 | 457 | ||
459 | mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask; | 458 | mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask; |
460 | mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask; | 459 | mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask; |
diff --git a/arch/arm/nwfpe/Makefile b/arch/arm/nwfpe/Makefile index b29178c0414e..deb3a82ddbdf 100644 --- a/arch/arm/nwfpe/Makefile +++ b/arch/arm/nwfpe/Makefile | |||
@@ -6,7 +6,7 @@ obj-$(CONFIG_FPE_NWFPE) += nwfpe.o | |||
6 | 6 | ||
7 | nwfpe-y += fpa11.o fpa11_cpdo.o fpa11_cpdt.o \ | 7 | nwfpe-y += fpa11.o fpa11_cpdo.o fpa11_cpdt.o \ |
8 | fpa11_cprt.o fpmodule.o fpopcode.o \ | 8 | fpa11_cprt.o fpmodule.o fpopcode.o \ |
9 | softfloat.o single_cpdo.o double_cpdo.o | 9 | softfloat.o single_cpdo.o double_cpdo.o \ |
10 | entry.o | ||
10 | 11 | ||
11 | nwfpe-$(CONFIG_FPE_NWFPE_XP) += extended_cpdo.o | 12 | nwfpe-$(CONFIG_FPE_NWFPE_XP) += extended_cpdo.o |
12 | nwfpe-$(CONFIG_CPU_32) += entry.o | ||
diff --git a/arch/arm/oprofile/op_model_v7.c b/arch/arm/oprofile/op_model_v7.c index f20295f14adb..2088a6c0cc0e 100644 --- a/arch/arm/oprofile/op_model_v7.c +++ b/arch/arm/oprofile/op_model_v7.c | |||
@@ -191,12 +191,8 @@ int armv7_setup_pmnc(void) | |||
191 | return -EBUSY; | 191 | return -EBUSY; |
192 | } | 192 | } |
193 | 193 | ||
194 | /* | 194 | /* Initialize & Reset PMNC: C bit and P bit */ |
195 | * Initialize & Reset PMNC: C bit, D bit and P bit. | 195 | armv7_pmnc_write(PMNC_P | PMNC_C); |
196 | * Note: Using a slower count for CCNT (D bit: divide by 64) results | ||
197 | * in a more stable system | ||
198 | */ | ||
199 | armv7_pmnc_write(PMNC_P | PMNC_C | PMNC_D); | ||
200 | 196 | ||
201 | 197 | ||
202 | for (cnt = CCNT; cnt < CNTMAX; cnt++) { | 198 | for (cnt = CCNT; cnt < CNTMAX; cnt++) { |
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c index aed05bc3c2ea..f60a5400a25b 100644 --- a/arch/arm/vfp/vfpmodule.c +++ b/arch/arm/vfp/vfpmodule.c | |||
@@ -63,14 +63,15 @@ static void vfp_thread_flush(struct thread_info *thread) | |||
63 | put_cpu(); | 63 | put_cpu(); |
64 | } | 64 | } |
65 | 65 | ||
66 | static void vfp_thread_release(struct thread_info *thread) | 66 | static void vfp_thread_exit(struct thread_info *thread) |
67 | { | 67 | { |
68 | /* release case: Per-thread VFP cleanup. */ | 68 | /* release case: Per-thread VFP cleanup. */ |
69 | union vfp_state *vfp = &thread->vfpstate; | 69 | union vfp_state *vfp = &thread->vfpstate; |
70 | unsigned int cpu = thread->cpu; | 70 | unsigned int cpu = get_cpu(); |
71 | 71 | ||
72 | if (last_VFP_context[cpu] == vfp) | 72 | if (last_VFP_context[cpu] == vfp) |
73 | last_VFP_context[cpu] = NULL; | 73 | last_VFP_context[cpu] = NULL; |
74 | put_cpu(); | ||
74 | } | 75 | } |
75 | 76 | ||
76 | /* | 77 | /* |
@@ -88,11 +89,13 @@ static void vfp_thread_release(struct thread_info *thread) | |||
88 | * but may change at any time. | 89 | * but may change at any time. |
89 | * - we could be preempted if tree preempt rcu is enabled, so | 90 | * - we could be preempted if tree preempt rcu is enabled, so |
90 | * it is unsafe to use thread->cpu. | 91 | * it is unsafe to use thread->cpu. |
91 | * THREAD_NOTIFY_RELEASE: | 92 | * THREAD_NOTIFY_EXIT |
92 | * - the thread (v) will not be running on any CPU; it is a dead thread. | 93 | * - the thread (v) will be running on the local CPU, so |
93 | * - thread->cpu will be the last CPU the thread ran on, which may not | 94 | * v === current_thread_info() |
94 | * be the current CPU. | 95 | * - thread->cpu is the local CPU number at the time it is accessed, |
95 | * - we could be preempted if tree preempt rcu is enabled. | 96 | * but may change at any time. |
97 | * - we could be preempted if tree preempt rcu is enabled, so | ||
98 | * it is unsafe to use thread->cpu. | ||
96 | */ | 99 | */ |
97 | static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v) | 100 | static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v) |
98 | { | 101 | { |
@@ -133,7 +136,7 @@ static int vfp_notifier(struct notifier_block *self, unsigned long cmd, void *v) | |||
133 | if (cmd == THREAD_NOTIFY_FLUSH) | 136 | if (cmd == THREAD_NOTIFY_FLUSH) |
134 | vfp_thread_flush(thread); | 137 | vfp_thread_flush(thread); |
135 | else | 138 | else |
136 | vfp_thread_release(thread); | 139 | vfp_thread_exit(thread); |
137 | 140 | ||
138 | return NOTIFY_DONE; | 141 | return NOTIFY_DONE; |
139 | } | 142 | } |
diff --git a/drivers/char/nwflash.c b/drivers/char/nwflash.c index 8c7df5ba088f..f80810901db6 100644 --- a/drivers/char/nwflash.c +++ b/drivers/char/nwflash.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
28 | #include <linux/smp_lock.h> | 28 | #include <linux/smp_lock.h> |
29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
30 | #include <linux/jiffies.h> | ||
30 | 31 | ||
31 | #include <asm/hardware/dec21285.h> | 32 | #include <asm/hardware/dec21285.h> |
32 | #include <asm/io.h> | 33 | #include <asm/io.h> |
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index da7c01b39be2..3a561df2e8a2 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
@@ -1573,15 +1573,15 @@ cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
1573 | if (err) | 1573 | if (err) |
1574 | return err; | 1574 | return err; |
1575 | 1575 | ||
1576 | err = pci_request_regions(dev, name); | ||
1577 | if (err) | ||
1578 | return err; | ||
1579 | |||
1580 | err = -ENOMEM; | 1576 | err = -ENOMEM; |
1581 | cfb = cyberpro_alloc_fb_info(id->driver_data, name); | 1577 | cfb = cyberpro_alloc_fb_info(id->driver_data, name); |
1582 | if (!cfb) | 1578 | if (!cfb) |
1583 | goto failed_release; | 1579 | goto failed_release; |
1584 | 1580 | ||
1581 | err = pci_request_regions(dev, cfb->fb.fix.id); | ||
1582 | if (err) | ||
1583 | goto failed_regions; | ||
1584 | |||
1585 | cfb->dev = dev; | 1585 | cfb->dev = dev; |
1586 | cfb->region = pci_ioremap_bar(dev, 0); | 1586 | cfb->region = pci_ioremap_bar(dev, 0); |
1587 | if (!cfb->region) | 1587 | if (!cfb->region) |
@@ -1633,10 +1633,10 @@ cyberpro_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
1633 | failed: | 1633 | failed: |
1634 | iounmap(cfb->region); | 1634 | iounmap(cfb->region); |
1635 | failed_ioremap: | 1635 | failed_ioremap: |
1636 | pci_release_regions(dev); | ||
1637 | failed_regions: | ||
1636 | cyberpro_free_fb_info(cfb); | 1638 | cyberpro_free_fb_info(cfb); |
1637 | failed_release: | 1639 | failed_release: |
1638 | pci_release_regions(dev); | ||
1639 | |||
1640 | return err; | 1640 | return err; |
1641 | } | 1641 | } |
1642 | 1642 | ||