Skip to content

Commit 3995f4c

Browse files
author
Linus Torvalds
committed
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2 parents 0581445 + fe38ea5 commit 3995f4c

File tree

134 files changed

+3322
-5028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+3322
-5028
lines changed

‎arch/arm/Kconfig

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,6 @@ config ARCH_EBSA110
9999
Ethernet interface, two PCMCIA sockets, two serial ports and a
100100
parallel port.
101101

102-
config ARCH_CAMELOT
103-
bool "Epxa10db"
104-
help
105-
This enables support for Altera's Excalibur XA10 development board.
106-
If you would like to build your kernel to run on one of these boards
107-
then you must say 'Y' here. Otherwise say 'N'
108-
109102
config ARCH_FOOTBRIDGE
110103
bool "FootBridge"
111104
select FOOTBRIDGE
@@ -213,12 +206,16 @@ config ARCH_AAEC2000
213206
help
214207
This enables support for systems based on the Agilent AAEC-2000
215208

209+
config ARCH_AT91RM9200
210+
bool "AT91RM9200"
211+
help
212+
Say Y here if you intend to run this kernel on an AT91RM9200-based
213+
board.
214+
216215
endchoice
217216

218217
source "arch/arm/mach-clps711x/Kconfig"
219218

220-
source "arch/arm/mach-epxa10db/Kconfig"
221-
222219
source "arch/arm/mach-footbridge/Kconfig"
223220

224221
source "arch/arm/mach-integrator/Kconfig"
@@ -253,6 +250,8 @@ source "arch/arm/mach-aaec2000/Kconfig"
253250

254251
source "arch/arm/mach-realview/Kconfig"
255252

253+
source "arch/arm/mach-at91rm9200/Kconfig"
254+
256255
# Definitions to make life easier
257256
config ARCH_ACORN
258257
bool
@@ -418,7 +417,8 @@ config LEDS
418417
ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \
419418
ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \
420419
ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
421-
ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE
420+
ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
421+
ARCH_AT91RM9200
422422
help
423423
If you say Y here, the LEDs on your machine will be used
424424
to provide useful information about your current system status.

‎arch/arm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ endif
8484
machine-$(CONFIG_ARCH_PXA) := pxa
8585
machine-$(CONFIG_ARCH_L7200) := l7200
8686
machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
87-
machine-$(CONFIG_ARCH_CAMELOT) := epxa10db
8887
textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
8988
machine-$(CONFIG_ARCH_CLPS711X) := clps711x
9089
machine-$(CONFIG_ARCH_IOP3XX) := iop3xx
@@ -100,6 +99,7 @@ endif
10099
machine-$(CONFIG_ARCH_H720X) := h720x
101100
machine-$(CONFIG_ARCH_AAEC2000) := aaec2000
102101
machine-$(CONFIG_ARCH_REALVIEW) := realview
102+
machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200
103103

104104
ifeq ($(CONFIG_ARCH_EBSA110),y)
105105
# This is what happens if you forget the IOCS16 line.

‎arch/arm/boot/compressed/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ ifeq ($(CONFIG_ARCH_SHARK),y)
2121
OBJS += head-shark.o ofw-shark.o
2222
endif
2323

24-
ifeq ($(CONFIG_ARCH_CAMELOT),y)
25-
OBJS += head-epxa10db.o
26-
endif
27-
2824
ifeq ($(CONFIG_ARCH_L7200),y)
2925
OBJS += head-l7200.o
3026
endif
@@ -50,6 +46,10 @@ ifeq ($(CONFIG_PXA_SHARPSL),y)
5046
OBJS += head-sharpsl.o
5147
endif
5248

49+
ifeq ($(CONFIG_ARCH_AT91RM9200),y)
50+
OBJS += head-at91rm9200.o
51+
endif
52+
5353
ifeq ($(CONFIG_DEBUG_ICEDCC),y)
5454
OBJS += ice-dcc.o
5555
endif

‎arch/arm/boot/compressed/head-at91rm9200.S

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
* linux/arch/arm/boot/compressed/head-at91rm9200.S
3+
*
4+
* Copyright (C) 2003 SAN People
5+
*
6+
* This program is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
*/
12+
#include <asm/mach-types.h>
13+
14+
.section ".start", "ax"
15+
16+
@ Atmel AT91RM9200-DK : 262
17+
mov r3, #(MACH_TYPE_AT91RM9200DK & 0xff)
18+
orr r3, r3, #(MACH_TYPE_AT91RM9200DK & 0xff00)
19+
cmp r7, r3
20+
beq 99f
21+
22+
@ Cogent CSB337 : 399
23+
mov r3, #(MACH_TYPE_CSB337 & 0xff)
24+
orr r3, r3, #(MACH_TYPE_CSB337 & 0xff00)
25+
cmp r7, r3
26+
beq 99f
27+
28+
@ Cogent CSB637 : 648
29+
mov r3, #(MACH_TYPE_CSB637 & 0xff)
30+
orr r3, r3, #(MACH_TYPE_CSB637 & 0xff00)
31+
cmp r7, r3
32+
beq 99f
33+
34+
@ Atmel AT91RM9200-EK : 705
35+
mov r3, #(MACH_TYPE_AT91RM9200EK & 0xff)
36+
orr r3, r3, #(MACH_TYPE_AT91RM9200EK & 0xff00)
37+
cmp r7, r3
38+
beq 99f
39+
40+
@ Conitec Carmeva : 769
41+
mov r3, #(MACH_TYPE_CARMEVA & 0xff)
42+
orr r3, r3, #(MACH_TYPE_CARMEVA & 0xff00)
43+
cmp r7, r3
44+
beq 99f
45+
46+
@ KwikByte KB920x : 612
47+
mov r3, #(MACH_TYPE_KB9200 & 0xff)
48+
orr r3, r3, #(MACH_TYPE_KB9200 & 0xff00)
49+
cmp r7, r3
50+
beq 99f
51+
52+
@ Unknown board, use the AT91RM9200DK board
53+
@ mov r7, #MACH_TYPE_AT91RM9200
54+
mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff)
55+
orr r7, r7, #(MACH_TYPE_AT91RM9200DK & 0xff00)
56+
57+
99:

‎arch/arm/boot/compressed/head-epxa10db.S

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎arch/arm/configs/assabet_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ CONFIG_OBSOLETE_MODPARM=y
6363
# CONFIG_ARCH_CLPS711X is not set
6464
# CONFIG_ARCH_CO285 is not set
6565
# CONFIG_ARCH_EBSA110 is not set
66-
# CONFIG_ARCH_CAMELOT is not set
6766
# CONFIG_ARCH_FOOTBRIDGE is not set
6867
# CONFIG_ARCH_INTEGRATOR is not set
6968
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/badge4_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ CONFIG_KMOD=y
6666
# CONFIG_ARCH_CLPS711X is not set
6767
# CONFIG_ARCH_CO285 is not set
6868
# CONFIG_ARCH_EBSA110 is not set
69-
# CONFIG_ARCH_CAMELOT is not set
7069
# CONFIG_ARCH_FOOTBRIDGE is not set
7170
# CONFIG_ARCH_INTEGRATOR is not set
7271
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/bast_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ CONFIG_KMOD=y
6464
# CONFIG_ARCH_CLPS711X is not set
6565
# CONFIG_ARCH_CO285 is not set
6666
# CONFIG_ARCH_EBSA110 is not set
67-
# CONFIG_ARCH_CAMELOT is not set
6867
# CONFIG_ARCH_FOOTBRIDGE is not set
6968
# CONFIG_ARCH_INTEGRATOR is not set
7069
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/cerfcube_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ CONFIG_KMOD=y
6565
# CONFIG_ARCH_CLPS711X is not set
6666
# CONFIG_ARCH_CO285 is not set
6767
# CONFIG_ARCH_EBSA110 is not set
68-
# CONFIG_ARCH_CAMELOT is not set
6968
# CONFIG_ARCH_FOOTBRIDGE is not set
7069
# CONFIG_ARCH_INTEGRATOR is not set
7170
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/clps7500_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ CONFIG_ARCH_CLPS7500=y
5757
# CONFIG_ARCH_CLPS711X is not set
5858
# CONFIG_ARCH_CO285 is not set
5959
# CONFIG_ARCH_EBSA110 is not set
60-
# CONFIG_ARCH_CAMELOT is not set
6160
# CONFIG_ARCH_FOOTBRIDGE is not set
6261
# CONFIG_ARCH_INTEGRATOR is not set
6362
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/collie_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ CONFIG_KMOD=y
7171
# CONFIG_ARCH_CLPS711X is not set
7272
# CONFIG_ARCH_CO285 is not set
7373
# CONFIG_ARCH_EBSA110 is not set
74-
# CONFIG_ARCH_CAMELOT is not set
7574
# CONFIG_ARCH_FOOTBRIDGE is not set
7675
# CONFIG_ARCH_INTEGRATOR is not set
7776
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/corgi_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
8787
# CONFIG_ARCH_CLPS711X is not set
8888
# CONFIG_ARCH_CO285 is not set
8989
# CONFIG_ARCH_EBSA110 is not set
90-
# CONFIG_ARCH_CAMELOT is not set
9190
# CONFIG_ARCH_FOOTBRIDGE is not set
9291
# CONFIG_ARCH_INTEGRATOR is not set
9392
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/ebsa110_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ CONFIG_KMOD=y
6363
# CONFIG_ARCH_CLPS711X is not set
6464
# CONFIG_ARCH_CO285 is not set
6565
CONFIG_ARCH_EBSA110=y
66-
# CONFIG_ARCH_CAMELOT is not set
6766
# CONFIG_ARCH_FOOTBRIDGE is not set
6867
# CONFIG_ARCH_INTEGRATOR is not set
6968
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/edb7211_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ CONFIG_BASE_SMALL=0
5757
CONFIG_ARCH_CLPS711X=y
5858
# CONFIG_ARCH_CO285 is not set
5959
# CONFIG_ARCH_EBSA110 is not set
60-
# CONFIG_ARCH_CAMELOT is not set
6160
# CONFIG_ARCH_FOOTBRIDGE is not set
6261
# CONFIG_ARCH_INTEGRATOR is not set
6362
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/enp2611_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
8686
# CONFIG_ARCH_CLPS711X is not set
8787
# CONFIG_ARCH_CO285 is not set
8888
# CONFIG_ARCH_EBSA110 is not set
89-
# CONFIG_ARCH_CAMELOT is not set
9089
# CONFIG_ARCH_FOOTBRIDGE is not set
9190
# CONFIG_ARCH_INTEGRATOR is not set
9291
# CONFIG_ARCH_IOP3XX is not set

‎arch/arm/configs/ep80219_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ CONFIG_KMOD=y
6464
# CONFIG_ARCH_CLPS711X is not set
6565
# CONFIG_ARCH_CO285 is not set
6666
# CONFIG_ARCH_EBSA110 is not set
67-
# CONFIG_ARCH_CAMELOT is not set
6867
# CONFIG_ARCH_FOOTBRIDGE is not set
6968
# CONFIG_ARCH_INTEGRATOR is not set
7069
CONFIG_ARCH_IOP3XX=y

0 commit comments

Comments
 (0)