aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 18:01:05 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 18:01:05 -0400
commitf6e6e883730aff2718610d3eba7608fcf73328ed (patch)
treeec595db5e2454ac5f505a2ce971e45d674f8d6b3 /arch
parentba262e4a4d4c23b5e6c15dbb3a99696b562e8035 (diff)
parentf964c303fe33b0d2ee563349bc8bea4d57d7a265 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3657/1: S3C24XX: Documentation update of Overview.txt [ARM] Update mach-types [ARM] 3656/1: S3C2412: Add S3C2412 and S3C2413 documenation [ARM] 3654/1: add ajeco 1arm sbc support [ARM] fix drivers/mfd/ucb1x00-core.c IRQ probing bug [ARM] 3651/1: S3C24XX: Make arch list more detailed [ARM] 3650/1: S3C2412: Update s3c2410_defconfig [ARM] 3649/1: S3C24XX: Fix capitalisation of CPU on SMDK2440 [ARM] 3612/1: make pci bus optional for ixp4xx platform [ARM] Remove MODE_(SVC|IRQ|FIQ|USR) and DEFAULT_FIQ [ARM] Remove save_lr/restore_pc macros [ARM] Remove partial non-v6 binutils compatibility [ARM] Remove LOADREGS macro [ARM] Remove RETINSTR macro
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm/boot/compressed/head-at91rm9200.S6
-rw-r--r--arch/arm/boot/compressed/ll_char_wr.S6
-rw-r--r--arch/arm/configs/onearm_defconfig1053
-rw-r--r--arch/arm/configs/s3c2410_defconfig50
-rw-r--r--arch/arm/kernel/entry-common.S2
-rw-r--r--arch/arm/kernel/head-nommu.S2
-rw-r--r--arch/arm/kernel/head.S4
-rw-r--r--arch/arm/lib/backtrace.S8
-rw-r--r--arch/arm/lib/clear_user.S4
-rw-r--r--arch/arm/lib/copy_page.S2
-rw-r--r--arch/arm/lib/csumipv6.S2
-rw-r--r--arch/arm/lib/delay.S18
-rw-r--r--arch/arm/lib/ecard.S4
-rw-r--r--arch/arm/lib/findbit.S10
-rw-r--r--arch/arm/lib/io-readsb.S6
-rw-r--r--arch/arm/lib/io-readsw-armv3.S6
-rw-r--r--arch/arm/lib/io-writesb.S6
-rw-r--r--arch/arm/lib/io-writesw-armv3.S6
-rw-r--r--arch/arm/lib/memchr.S2
-rw-r--r--arch/arm/lib/memset.S4
-rw-r--r--arch/arm/lib/memzero.S4
-rw-r--r--arch/arm/lib/strchr.S2
-rw-r--r--arch/arm/lib/strncpy_from_user.S5
-rw-r--r--arch/arm/lib/strnlen_user.S5
-rw-r--r--arch/arm/lib/strrchr.S2
-rw-r--r--arch/arm/lib/uaccess.S8
-rw-r--r--arch/arm/mach-at91rm9200/Kconfig6
-rw-r--r--arch/arm/mach-at91rm9200/Makefile1
-rw-r--r--arch/arm/mach-at91rm9200/board-1arm.c109
-rw-r--r--arch/arm/mach-ixp4xx/Kconfig3
-rw-r--r--arch/arm/mach-ixp4xx/Makefile24
-rw-r--r--arch/arm/mach-pxa/sleep.S2
-rw-r--r--arch/arm/mach-s3c2410/Kconfig4
-rw-r--r--arch/arm/mach-s3c2410/sleep.S2
-rw-r--r--arch/arm/mach-sa1100/sleep.S2
-rw-r--r--arch/arm/mm/copypage-v3.S2
-rw-r--r--arch/arm/mm/proc-v6.S32
-rw-r--r--arch/arm/nwfpe/entry26.S2
-rw-r--r--arch/arm/tools/mach-types71
40 files changed, 1357 insertions, 134 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1b7e5c2e90ef..3d1a3fb7d5fc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -253,7 +253,7 @@ config ARCH_SA1100
253 Support for StrongARM 11x0 based boards. 253 Support for StrongARM 11x0 based boards.
254 254
255config ARCH_S3C2410 255config ARCH_S3C2410
256 bool "Samsung S3C2410" 256 bool "Samsung S3C2410, S3C2412, S3C2413, S3C2440, S3C2442"
257 help 257 help
258 Samsung S3C2410X CPU based systems, such as the Simtec Electronics 258 Samsung S3C2410X CPU based systems, such as the Simtec Electronics
259 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or 259 BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
@@ -372,7 +372,7 @@ config ISA_DMA_API
372 bool 372 bool
373 373
374config PCI 374config PCI
375 bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB 375 bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX
376 help 376 help
377 Find out whether you have a PCI motherboard. PCI is the name of a 377 Find out whether you have a PCI motherboard. PCI is the name of a
378 bus system, i.e. the way the CPU talks to the other stuff inside 378 bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/arm/boot/compressed/head-at91rm9200.S b/arch/arm/boot/compressed/head-at91rm9200.S
index 57a3b163b2cb..d68b9acd826e 100644
--- a/arch/arm/boot/compressed/head-at91rm9200.S
+++ b/arch/arm/boot/compressed/head-at91rm9200.S
@@ -61,6 +61,12 @@
61 cmp r7, r3 61 cmp r7, r3
62 beq 99f 62 beq 99f
63 63
64 @ Ajeco 1ARM : 1075
65 mov r3, #(MACH_TYPE_ONEARM & 0xff)
66 orr r3, r3, #(MACH_TYPE_ONEARM & 0xff00)
67 cmp r7, r3
68 beq 99f
69
64 @ Unknown board, use the AT91RM9200DK board 70 @ Unknown board, use the AT91RM9200DK board
65 @ mov r7, #MACH_TYPE_AT91RM9200 71 @ mov r7, #MACH_TYPE_AT91RM9200
66 mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff) 72 mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff)
diff --git a/arch/arm/boot/compressed/ll_char_wr.S b/arch/arm/boot/compressed/ll_char_wr.S
index d7bbd9da2fca..8517c8606b4a 100644
--- a/arch/arm/boot/compressed/ll_char_wr.S
+++ b/arch/arm/boot/compressed/ll_char_wr.S
@@ -77,7 +77,7 @@ Lrow4bpplp:
77 subne r1, r1, #1 77 subne r1, r1, #1
78 ldrneb r7, [r6, r1] 78 ldrneb r7, [r6, r1]
79 bne Lrow4bpplp 79 bne Lrow4bpplp
80 LOADREGS(fd, sp!, {r4 - r7, pc}) 80 ldmfd sp!, {r4 - r7, pc}
81 81
82@ 82@
83@ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc) 83@ Smashable regs: {r0 - r3}, [r4], {r5 - r7}, (r8 - fp), [ip], (sp), {lr}, (pc)
@@ -105,7 +105,7 @@ Lrow8bpplp:
105 subne r1, r1, #1 105 subne r1, r1, #1
106 ldrneb r7, [r6, r1] 106 ldrneb r7, [r6, r1]
107 bne Lrow8bpplp 107 bne Lrow8bpplp
108 LOADREGS(fd, sp!, {r4 - r7, pc}) 108 ldmfd sp!, {r4 - r7, pc}
109 109
110@ 110@
111@ Smashable regs: {r0 - r3}, [r4], {r5, r6}, [r7], (r8 - fp), [ip], (sp), [lr], (pc) 111@ Smashable regs: {r0 - r3}, [r4], {r5, r6}, [r7], (r8 - fp), [ip], (sp), [lr], (pc)
@@ -127,7 +127,7 @@ Lrow1bpp:
127 strb r7, [r0], r5 127 strb r7, [r0], r5
128 mov r7, r7, lsr #8 128 mov r7, r7, lsr #8
129 strb r7, [r0], r5 129 strb r7, [r0], r5
130 LOADREGS(fd, sp!, {r4 - r7, pc}) 130 ldmfd sp!, {r4 - r7, pc}
131 131
132 .bss 132 .bss
133ENTRY(con_charconvtable) 133ENTRY(con_charconvtable)
diff --git a/arch/arm/configs/onearm_defconfig b/arch/arm/configs/onearm_defconfig
new file mode 100644
index 000000000000..5401c01caefe
--- /dev/null
+++ b/arch/arm/configs/onearm_defconfig
@@ -0,0 +1,1053 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17-git10
4# Mon Jun 26 13:45:44 2006
5#
6CONFIG_ARM=y
7CONFIG_MMU=y
8CONFIG_RWSEM_GENERIC_SPINLOCK=y
9CONFIG_GENERIC_HWEIGHT=y
10CONFIG_GENERIC_CALIBRATE_DELAY=y
11CONFIG_VECTORS_BASE=0xffff0000
12
13#
14# Code maturity level options
15#
16CONFIG_EXPERIMENTAL=y
17CONFIG_BROKEN_ON_SMP=y
18CONFIG_INIT_ENV_ARG_LIMIT=32
19
20#
21# General setup
22#
23CONFIG_LOCALVERSION=""
24CONFIG_LOCALVERSION_AUTO=y
25# CONFIG_SWAP is not set
26CONFIG_SYSVIPC=y
27# CONFIG_POSIX_MQUEUE is not set
28# CONFIG_BSD_PROCESS_ACCT is not set
29CONFIG_SYSCTL=y
30# CONFIG_AUDIT is not set
31# CONFIG_IKCONFIG is not set
32# CONFIG_RELAY is not set
33CONFIG_INITRAMFS_SOURCE=""
34CONFIG_UID16=y
35CONFIG_CC_OPTIMIZE_FOR_SIZE=y
36CONFIG_EMBEDDED=y
37CONFIG_KALLSYMS=y
38# CONFIG_KALLSYMS_ALL is not set
39# CONFIG_KALLSYMS_EXTRA_PASS is not set
40CONFIG_HOTPLUG=y
41CONFIG_PRINTK=y
42CONFIG_BUG=y
43CONFIG_ELF_CORE=y
44CONFIG_BASE_FULL=y
45CONFIG_FUTEX=y
46CONFIG_EPOLL=y
47CONFIG_SHMEM=y
48CONFIG_SLAB=y
49# CONFIG_TINY_SHMEM is not set
50CONFIG_BASE_SMALL=0
51# CONFIG_SLOB is not set
52
53#
54# Loadable module support
55#
56CONFIG_MODULES=y
57CONFIG_MODULE_UNLOAD=y
58# CONFIG_MODULE_FORCE_UNLOAD is not set
59# CONFIG_MODVERSIONS is not set
60# CONFIG_MODULE_SRCVERSION_ALL is not set
61CONFIG_KMOD=y
62
63#
64# Block layer
65#
66# CONFIG_BLK_DEV_IO_TRACE is not set
67
68#
69# IO Schedulers
70#
71CONFIG_IOSCHED_NOOP=y
72CONFIG_IOSCHED_AS=y
73# CONFIG_IOSCHED_DEADLINE is not set
74# CONFIG_IOSCHED_CFQ is not set
75CONFIG_DEFAULT_AS=y
76# CONFIG_DEFAULT_DEADLINE is not set
77# CONFIG_DEFAULT_CFQ is not set
78# CONFIG_DEFAULT_NOOP is not set
79CONFIG_DEFAULT_IOSCHED="anticipatory"
80
81#
82# System Type
83#
84# CONFIG_ARCH_AAEC2000 is not set
85# CONFIG_ARCH_INTEGRATOR is not set
86# CONFIG_ARCH_REALVIEW is not set
87# CONFIG_ARCH_VERSATILE is not set
88CONFIG_ARCH_AT91RM9200=y
89# CONFIG_ARCH_CLPS7500 is not set
90# CONFIG_ARCH_CLPS711X is not set
91# CONFIG_ARCH_CO285 is not set
92# CONFIG_ARCH_EBSA110 is not set
93# CONFIG_ARCH_EP93XX is not set
94# CONFIG_ARCH_FOOTBRIDGE is not set
95# CONFIG_ARCH_NETX is not set
96# CONFIG_ARCH_H720X is not set
97# CONFIG_ARCH_IMX is not set
98# CONFIG_ARCH_IOP3XX is not set
99# CONFIG_ARCH_IXP4XX is not set
100# CONFIG_ARCH_IXP2000 is not set
101# CONFIG_ARCH_IXP23XX is not set
102# CONFIG_ARCH_L7200 is not set
103# CONFIG_ARCH_PNX4008 is not set
104# CONFIG_ARCH_PXA is not set
105# CONFIG_ARCH_RPC is not set
106# CONFIG_ARCH_SA1100 is not set
107# CONFIG_ARCH_S3C2410 is not set
108# CONFIG_ARCH_SHARK is not set
109# CONFIG_ARCH_LH7A40X is not set
110# CONFIG_ARCH_OMAP is not set
111
112#
113# AT91RM9200 Implementations
114#
115
116#
117# AT91RM9200 Board Type
118#
119CONFIG_MACH_ONEARM=y
120# CONFIG_ARCH_AT91RM9200DK is not set
121# CONFIG_MACH_AT91RM9200EK is not set
122# CONFIG_MACH_CSB337 is not set
123# CONFIG_MACH_CSB637 is not set
124# CONFIG_MACH_CARMEVA is not set
125# CONFIG_MACH_KB9200 is not set
126# CONFIG_MACH_ATEB9200 is not set
127# CONFIG_MACH_KAFA is not set
128
129#
130# AT91RM9200 Feature Selections
131#
132CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
133
134#
135# Processor Type
136#
137CONFIG_CPU_32=y
138CONFIG_CPU_ARM920T=y
139CONFIG_CPU_32v4=y
140CONFIG_CPU_ABRT_EV4T=y
141CONFIG_CPU_CACHE_V4WT=y
142CONFIG_CPU_CACHE_VIVT=y
143CONFIG_CPU_COPY_V4WB=y
144CONFIG_CPU_TLB_V4WBI=y
145
146#
147# Processor Features
148#
149# CONFIG_ARM_THUMB is not set
150# CONFIG_CPU_ICACHE_DISABLE is not set
151# CONFIG_CPU_DCACHE_DISABLE is not set
152# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
153
154#
155# Bus support
156#
157
158#
159# PCCARD (PCMCIA/CardBus) support
160#
161CONFIG_PCCARD=y
162# CONFIG_PCMCIA_DEBUG is not set
163CONFIG_PCMCIA=y
164CONFIG_PCMCIA_LOAD_CIS=y
165CONFIG_PCMCIA_IOCTL=y
166
167#
168# PC-card bridges
169#
170CONFIG_AT91_CF=y
171
172#
173# Kernel Features
174#
175# CONFIG_PREEMPT is not set
176# CONFIG_NO_IDLE_HZ is not set
177CONFIG_HZ=100
178# CONFIG_AEABI is not set
179# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
180CONFIG_SELECT_MEMORY_MODEL=y
181CONFIG_FLATMEM_MANUAL=y
182# CONFIG_DISCONTIGMEM_MANUAL is not set
183# CONFIG_SPARSEMEM_MANUAL is not set
184CONFIG_FLATMEM=y
185CONFIG_FLAT_NODE_MEM_MAP=y
186# CONFIG_SPARSEMEM_STATIC is not set
187CONFIG_SPLIT_PTLOCK_CPUS=4096
188CONFIG_LEDS=y
189CONFIG_LEDS_TIMER=y
190# CONFIG_LEDS_CPU is not set
191CONFIG_ALIGNMENT_TRAP=y
192
193#
194# Boot options
195#
196CONFIG_ZBOOT_ROM_TEXT=0x0
197CONFIG_ZBOOT_ROM_BSS=0x0
198CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/nfs ip=bootp mem=64M"
199# CONFIG_XIP_KERNEL is not set
200
201#
202# Floating point emulation
203#
204
205#
206# At least one emulation must be selected
207#
208CONFIG_FPE_NWFPE=y
209# CONFIG_FPE_NWFPE_XP is not set
210# CONFIG_FPE_FASTFPE is not set
211
212#
213# Userspace binary formats
214#
215CONFIG_BINFMT_ELF=y
216# CONFIG_BINFMT_AOUT is not set
217# CONFIG_BINFMT_MISC is not set
218# CONFIG_ARTHUR is not set
219
220#
221# Power management options
222#
223# CONFIG_PM is not set
224# CONFIG_APM is not set
225
226#
227# Networking
228#
229CONFIG_NET=y
230
231#
232# Networking options
233#
234# CONFIG_NETDEBUG is not set
235CONFIG_PACKET=y
236# CONFIG_PACKET_MMAP is not set
237CONFIG_UNIX=y
238CONFIG_XFRM=y
239# CONFIG_XFRM_USER is not set
240# CONFIG_NET_KEY is not set
241CONFIG_INET=y
242# CONFIG_IP_MULTICAST is not set
243# CONFIG_IP_ADVANCED_ROUTER is not set
244CONFIG_IP_FIB_HASH=y
245CONFIG_IP_PNP=y
246# CONFIG_IP_PNP_DHCP is not set
247CONFIG_IP_PNP_BOOTP=y
248# CONFIG_IP_PNP_RARP is not set
249# CONFIG_NET_IPIP is not set
250# CONFIG_NET_IPGRE is not set
251# CONFIG_ARPD is not set
252# CONFIG_SYN_COOKIES is not set
253# CONFIG_INET_AH is not set
254# CONFIG_INET_ESP is not set
255# CONFIG_INET_IPCOMP is not set
256# CONFIG_INET_XFRM_TUNNEL is not set
257# CONFIG_INET_TUNNEL is not set
258CONFIG_INET_XFRM_MODE_TRANSPORT=y
259CONFIG_INET_XFRM_MODE_TUNNEL=y
260CONFIG_INET_DIAG=y
261CONFIG_INET_TCP_DIAG=y
262# CONFIG_TCP_CONG_ADVANCED is not set
263CONFIG_TCP_CONG_BIC=y
264# CONFIG_IPV6 is not set
265# CONFIG_INET6_XFRM_TUNNEL is not set
266# CONFIG_INET6_TUNNEL is not set
267# CONFIG_NETWORK_SECMARK is not set
268# CONFIG_NETFILTER is not set
269
270#
271# DCCP Configuration (EXPERIMENTAL)
272#
273# CONFIG_IP_DCCP is not set
274
275#
276# SCTP Configuration (EXPERIMENTAL)
277#
278# CONFIG_IP_SCTP is not set
279
280#
281# TIPC Configuration (EXPERIMENTAL)
282#
283# CONFIG_TIPC is not set
284# CONFIG_ATM is not set
285# CONFIG_BRIDGE is not set
286# CONFIG_VLAN_8021Q is not set
287# CONFIG_DECNET is not set
288# CONFIG_LLC2 is not set
289# CONFIG_IPX is not set
290# CONFIG_ATALK is not set
291# CONFIG_X25 is not set
292# CONFIG_LAPB is not set
293# CONFIG_NET_DIVERT is not set
294# CONFIG_ECONET is not set
295# CONFIG_WAN_ROUTER is not set
296
297#
298# QoS and/or fair queueing
299#
300# CONFIG_NET_SCHED is not set
301
302#
303# Network testing
304#
305# CONFIG_NET_PKTGEN is not set
306# CONFIG_HAMRADIO is not set
307# CONFIG_IRDA is not set
308# CONFIG_BT is not set
309# CONFIG_IEEE80211 is not set
310
311#
312# Device Drivers
313#
314
315#
316# Generic Driver Options
317#
318CONFIG_STANDALONE=y
319CONFIG_PREVENT_FIRMWARE_BUILD=y
320CONFIG_FW_LOADER=y
321# CONFIG_DEBUG_DRIVER is not set
322# CONFIG_SYS_HYPERVISOR is not set
323
324#
325# Connector - unified userspace <-> kernelspace linker
326#
327# CONFIG_CONNECTOR is not set
328
329#
330# Memory Technology Devices (MTD)
331#
332CONFIG_MTD=y
333# CONFIG_MTD_DEBUG is not set
334# CONFIG_MTD_CONCAT is not set
335CONFIG_MTD_PARTITIONS=y
336# CONFIG_MTD_REDBOOT_PARTS is not set
337CONFIG_MTD_CMDLINE_PARTS=y
338# CONFIG_MTD_AFS_PARTS is not set
339
340#
341# User Modules And Translation Layers
342#
343CONFIG_MTD_CHAR=y
344CONFIG_MTD_BLOCK=y
345# CONFIG_FTL is not set
346# CONFIG_NFTL is not set
347# CONFIG_INFTL is not set
348# CONFIG_RFD_FTL is not set
349
350#
351# RAM/ROM/Flash chip drivers
352#
353CONFIG_MTD_CFI=y
354CONFIG_MTD_JEDECPROBE=y
355CONFIG_MTD_GEN_PROBE=y
356# CONFIG_MTD_CFI_ADV_OPTIONS is not set
357CONFIG_MTD_MAP_BANK_WIDTH_1=y
358CONFIG_MTD_MAP_BANK_WIDTH_2=y
359CONFIG_MTD_MAP_BANK_WIDTH_4=y
360# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
361# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
362# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
363CONFIG_MTD_CFI_I1=y
364CONFIG_MTD_CFI_I2=y
365# CONFIG_MTD_CFI_I4 is not set
366# CONFIG_MTD_CFI_I8 is not set
367# CONFIG_MTD_CFI_INTELEXT is not set
368CONFIG_MTD_CFI_AMDSTD=y
369# CONFIG_MTD_CFI_STAA is not set
370CONFIG_MTD_CFI_UTIL=y
371# CONFIG_MTD_RAM is not set
372# CONFIG_MTD_ROM is not set
373# CONFIG_MTD_ABSENT is not set
374# CONFIG_MTD_OBSOLETE_CHIPS is not set
375
376#
377# Mapping drivers for chip access
378#
379# CONFIG_MTD_COMPLEX_MAPPINGS is not set
380CONFIG_MTD_PHYSMAP=y
381CONFIG_MTD_PHYSMAP_START=0x0
382CONFIG_MTD_PHYSMAP_LEN=0x0
383CONFIG_MTD_PHYSMAP_BANKWIDTH=0
384# CONFIG_MTD_ARM_INTEGRATOR is not set
385# CONFIG_MTD_IMPA7 is not set
386# CONFIG_MTD_PLATRAM is not set
387
388#
389# Self-contained MTD device drivers
390#
391# CONFIG_MTD_SLRAM is not set
392# CONFIG_MTD_PHRAM is not set
393# CONFIG_MTD_MTDRAM is not set
394# CONFIG_MTD_BLOCK2MTD is not set
395
396#
397# Disk-On-Chip Device Drivers
398#
399# CONFIG_MTD_DOC2000 is not set
400# CONFIG_MTD_DOC2001 is not set
401# CONFIG_MTD_DOC2001PLUS is not set
402
403#
404# NAND Flash Device Drivers
405#
406# CONFIG_MTD_NAND is not set
407
408#
409# OneNAND Flash Device Drivers
410#
411# CONFIG_MTD_ONENAND is not set
412
413#
414# Parallel port support
415#
416# CONFIG_PARPORT is not set
417
418#
419# Plug and Play support
420#
421
422#
423# Block devices
424#
425# CONFIG_BLK_DEV_COW_COMMON is not set
426# CONFIG_BLK_DEV_LOOP is not set
427# CONFIG_BLK_DEV_NBD is not set
428# CONFIG_BLK_DEV_UB is not set
429CONFIG_BLK_DEV_RAM=y
430CONFIG_BLK_DEV_RAM_COUNT=16
431CONFIG_BLK_DEV_RAM_SIZE=8192
432CONFIG_BLK_DEV_INITRD=y
433# CONFIG_CDROM_PKTCDVD is not set
434# CONFIG_ATA_OVER_ETH is not set
435
436#
437# ATA/ATAPI/MFM/RLL support
438#
439# CONFIG_IDE is not set
440
441#
442# SCSI device support
443#
444# CONFIG_RAID_ATTRS is not set
445# CONFIG_SCSI is not set
446
447#
448# Multi-device support (RAID and LVM)
449#
450# CONFIG_MD is not set
451
452#
453# Fusion MPT device support
454#
455# CONFIG_FUSION is not set
456
457#
458# IEEE 1394 (FireWire) support
459#
460
461#
462# I2O device support
463#
464
465#
466# Network device support
467#
468CONFIG_NETDEVICES=y
469# CONFIG_DUMMY is not set
470# CONFIG_BONDING is not set
471# CONFIG_EQUALIZER is not set
472# CONFIG_TUN is not set
473
474#
475# PHY device support
476#
477# CONFIG_PHYLIB is not set
478
479#
480# Ethernet (10 or 100Mbit)
481#
482CONFIG_NET_ETHERNET=y
483CONFIG_MII=y
484CONFIG_ARM_AT91_ETHER=y
485# CONFIG_SMC91X is not set
486# CONFIG_DM9000 is not set
487
488#
489# Ethernet (1000 Mbit)
490#
491
492#
493# Ethernet (10000 Mbit)
494#
495
496#
497# Token Ring devices
498#
499
500#
501# Wireless LAN (non-hamradio)
502#
503# CONFIG_NET_RADIO is not set
504
505#
506# PCMCIA network device support
507#
508# CONFIG_NET_PCMCIA is not set
509
510#
511# Wan interfaces
512#
513# CONFIG_WAN is not set
514# CONFIG_PPP is not set
515# CONFIG_SLIP is not set
516# CONFIG_SHAPER is not set
517# CONFIG_NETCONSOLE is not set
518# CONFIG_NETPOLL is not set
519# CONFIG_NET_POLL_CONTROLLER is not set
520
521#
522# ISDN subsystem
523#
524# CONFIG_ISDN is not set
525
526#
527# Input device support
528#
529CONFIG_INPUT=y
530
531#
532# Userland interfaces
533#
534CONFIG_INPUT_MOUSEDEV=y
535# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
536CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
537CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
538# CONFIG_INPUT_JOYDEV is not set
539# CONFIG_INPUT_TSDEV is not set
540# CONFIG_INPUT_EVDEV is not set
541# CONFIG_INPUT_EVBUG is not set
542
543#
544# Input Device Drivers
545#
546# CONFIG_INPUT_KEYBOARD is not set
547# CONFIG_INPUT_MOUSE is not set
548# CONFIG_INPUT_JOYSTICK is not set
549# CONFIG_INPUT_TOUCHSCREEN is not set
550# CONFIG_INPUT_MISC is not set
551
552#
553# Hardware I/O ports
554#
555# CONFIG_SERIO is not set
556# CONFIG_GAMEPORT is not set
557
558#
559# Character devices
560#
561# CONFIG_VT is not set
562# CONFIG_SERIAL_NONSTANDARD is not set
563
564#
565# Serial drivers
566#
567# CONFIG_SERIAL_8250 is not set
568
569#
570# Non-8250 serial port support
571#
572CONFIG_SERIAL_AT91=y
573CONFIG_SERIAL_AT91_CONSOLE=y
574# CONFIG_SERIAL_AT91_TTYAT is not set
575CONFIG_SERIAL_CORE=y
576CONFIG_SERIAL_CORE_CONSOLE=y
577CONFIG_UNIX98_PTYS=y
578CONFIG_LEGACY_PTYS=y
579CONFIG_LEGACY_PTY_COUNT=256
580
581#
582# IPMI
583#
584# CONFIG_IPMI_HANDLER is not set
585
586#
587# Watchdog Cards
588#
589CONFIG_WATCHDOG=y
590CONFIG_WATCHDOG_NOWAYOUT=y
591
592#
593# Watchdog Device Drivers
594#
595# CONFIG_SOFT_WATCHDOG is not set
596CONFIG_AT91_WATCHDOG=y
597
598#
599# USB-based Watchdog Cards
600#
601# CONFIG_USBPCWATCHDOG is not set
602# CONFIG_NVRAM is not set
603# CONFIG_DTLK is not set
604# CONFIG_R3964 is not set
605
606#
607# Ftape, the floppy tape device driver
608#
609
610#
611# PCMCIA character devices
612#
613# CONFIG_SYNCLINK_CS is not set
614# CONFIG_CARDMAN_4000 is not set
615# CONFIG_CARDMAN_4040 is not set
616# CONFIG_RAW_DRIVER is not set
617
618#
619# TPM devices
620#
621# CONFIG_TCG_TPM is not set
622# CONFIG_TELCLOCK is not set
623
624#
625# I2C support
626#
627CONFIG_I2C=y
628CONFIG_I2C_CHARDEV=y
629
630#
631# I2C Algorithms
632#
633# CONFIG_I2C_ALGOBIT is not set
634# CONFIG_I2C_ALGOPCF is not set
635# CONFIG_I2C_ALGOPCA is not set
636
637#
638# I2C Hardware Bus support
639#
640# CONFIG_I2C_OCORES is not set
641# CONFIG_I2C_PARPORT_LIGHT is not set
642# CONFIG_I2C_STUB is not set
643# CONFIG_I2C_PCA_ISA is not set
644
645#
646# Miscellaneous I2C Chip support
647#
648# CONFIG_SENSORS_DS1337 is not set
649# CONFIG_SENSORS_DS1374 is not set
650# CONFIG_SENSORS_EEPROM is not set
651# CONFIG_SENSORS_PCF8574 is not set
652# CONFIG_SENSORS_PCA9539 is not set
653# CONFIG_SENSORS_PCF8591 is not set
654# CONFIG_SENSORS_MAX6875 is not set
655# CONFIG_I2C_DEBUG_CORE is not set
656# CONFIG_I2C_DEBUG_ALGO is not set
657# CONFIG_I2C_DEBUG_BUS is not set
658# CONFIG_I2C_DEBUG_CHIP is not set
659
660#
661# SPI support
662#
663# CONFIG_SPI is not set
664# CONFIG_SPI_MASTER is not set
665
666#
667# Dallas's 1-wire bus
668#
669
670#
671# Hardware Monitoring support
672#
673CONFIG_HWMON=y
674# CONFIG_HWMON_VID is not set
675# CONFIG_SENSORS_ABITUGURU is not set
676# CONFIG_SENSORS_ADM1021 is not set
677# CONFIG_SENSORS_ADM1025 is not set
678# CONFIG_SENSORS_ADM1026 is not set
679# CONFIG_SENSORS_ADM1031 is not set
680# CONFIG_SENSORS_ADM9240 is not set
681# CONFIG_SENSORS_ASB100 is not set
682# CONFIG_SENSORS_ATXP1 is not set
683# CONFIG_SENSORS_DS1621 is not set
684# CONFIG_SENSORS_F71805F is not set
685# CONFIG_SENSORS_FSCHER is not set
686# CONFIG_SENSORS_FSCPOS is not set
687# CONFIG_SENSORS_GL518SM is not set
688# CONFIG_SENSORS_GL520SM is not set
689# CONFIG_SENSORS_IT87 is not set
690# CONFIG_SENSORS_LM63 is not set
691# CONFIG_SENSORS_LM75 is not set
692# CONFIG_SENSORS_LM77 is not set
693# CONFIG_SENSORS_LM78 is not set
694# CONFIG_SENSORS_LM80 is not set
695# CONFIG_SENSORS_LM83 is not set
696# CONFIG_SENSORS_LM85 is not set
697# CONFIG_SENSORS_LM87 is not set
698# CONFIG_SENSORS_LM90 is not set
699# CONFIG_SENSORS_LM92 is not set
700# CONFIG_SENSORS_MAX1619 is not set
701# CONFIG_SENSORS_PC87360 is not set
702# CONFIG_SENSORS_SMSC47M1 is not set
703# CONFIG_SENSORS_SMSC47M192 is not set
704# CONFIG_SENSORS_SMSC47B397 is not set
705# CONFIG_SENSORS_W83781D is not set
706# CONFIG_SENSORS_W83791D is not set
707# CONFIG_SENSORS_W83792D is not set
708# CONFIG_SENSORS_W83L785TS is not set
709# CONFIG_SENSORS_W83627HF is not set
710# CONFIG_SENSORS_W83627EHF is not set
711# CONFIG_HWMON_DEBUG_CHIP is not set
712
713#
714# Misc devices
715#
716
717#
718# LED devices
719#
720# CONFIG_NEW_LEDS is not set
721
722#
723# LED drivers
724#
725
726#
727# LED Triggers
728#
729
730#
731# Multimedia devices
732#
733# CONFIG_VIDEO_DEV is not set
734CONFIG_VIDEO_V4L2=y
735
736#
737# Digital Video Broadcasting Devices
738#
739# CONFIG_DVB is not set
740# CONFIG_USB_DABUSB is not set
741
742#
743# Graphics support
744#
745# CONFIG_FB is not set
746
747#
748# Sound
749#
750# CONFIG_SOUND is not set
751
752#
753# USB support
754#
755CONFIG_USB_ARCH_HAS_HCD=y
756CONFIG_USB_ARCH_HAS_OHCI=y
757# CONFIG_USB_ARCH_HAS_EHCI is not set
758CONFIG_USB=y
759CONFIG_USB_DEBUG=y
760
761#
762# Miscellaneous USB options
763#
764CONFIG_USB_DEVICEFS=y
765# CONFIG_USB_BANDWIDTH is not set
766# CONFIG_USB_DYNAMIC_MINORS is not set
767# CONFIG_USB_OTG is not set
768
769#
770# USB Host Controller Drivers
771#
772# CONFIG_USB_ISP116X_HCD is not set
773CONFIG_USB_OHCI_HCD=y
774# CONFIG_USB_OHCI_BIG_ENDIAN is not set
775CONFIG_USB_OHCI_LITTLE_ENDIAN=y
776# CONFIG_USB_SL811_HCD is not set
777
778#
779# USB Device Class drivers
780#
781# CONFIG_USB_ACM is not set
782# CONFIG_USB_PRINTER is not set
783
784#
785# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
786#
787
788#
789# may also be needed; see USB_STORAGE Help for more information
790#
791# CONFIG_USB_STORAGE is not set
792# CONFIG_USB_LIBUSUAL is not set
793
794#
795# USB Input Devices
796#
797# CONFIG_USB_HID is not set
798
799#
800# USB HID Boot Protocol drivers
801#
802# CONFIG_USB_KBD is not set
803# CONFIG_USB_MOUSE is not set
804# CONFIG_USB_AIPTEK is not set
805# CONFIG_USB_WACOM is not set
806# CONFIG_USB_ACECAD is not set
807# CONFIG_USB_KBTAB is not set
808# CONFIG_USB_POWERMATE is not set
809# CONFIG_USB_TOUCHSCREEN is not set
810# CONFIG_USB_YEALINK is not set
811# CONFIG_USB_XPAD is not set
812# CONFIG_USB_ATI_REMOTE is not set
813# CONFIG_USB_ATI_REMOTE2 is not set
814# CONFIG_USB_KEYSPAN_REMOTE is not set
815# CONFIG_USB_APPLETOUCH is not set
816
817#
818# USB Imaging devices
819#
820# CONFIG_USB_MDC800 is not set
821
822#
823# USB Network Adapters
824#
825# CONFIG_USB_CATC is not set
826# CONFIG_USB_KAWETH is not set
827# CONFIG_USB_PEGASUS is not set
828# CONFIG_USB_RTL8150 is not set
829# CONFIG_USB_USBNET is not set
830CONFIG_USB_MON=y
831
832#
833# USB port drivers
834#
835
836#
837# USB Serial Converter support
838#
839# CONFIG_USB_SERIAL is not set
840
841#
842# USB Miscellaneous drivers
843#
844# CONFIG_USB_EMI62 is not set
845# CONFIG_USB_EMI26 is not set
846# CONFIG_USB_AUERSWALD is not set
847# CONFIG_USB_RIO500 is not set
848# CONFIG_USB_LEGOTOWER is not set
849# CONFIG_USB_LCD is not set
850# CONFIG_USB_LED is not set
851# CONFIG_USB_CY7C63 is not set
852# CONFIG_USB_CYTHERM is not set
853# CONFIG_USB_PHIDGETKIT is not set
854# CONFIG_USB_PHIDGETSERVO is not set
855# CONFIG_USB_IDMOUSE is not set
856# CONFIG_USB_APPLEDISPLAY is not set
857# CONFIG_USB_LD is not set
858# CONFIG_USB_TEST is not set
859
860#
861# USB DSL modem support
862#
863
864#
865# USB Gadget Support
866#
867CONFIG_USB_GADGET=y
868# CONFIG_USB_GADGET_DEBUG_FILES is not set
869CONFIG_USB_GADGET_SELECTED=y
870# CONFIG_USB_GADGET_NET2280 is not set
871# CONFIG_USB_GADGET_PXA2XX is not set
872# CONFIG_USB_GADGET_GOKU is not set
873# CONFIG_USB_GADGET_LH7A40X is not set
874# CONFIG_USB_GADGET_OMAP is not set
875CONFIG_USB_GADGET_AT91=y
876CONFIG_USB_AT91=y
877# CONFIG_USB_GADGET_DUMMY_HCD is not set
878# CONFIG_USB_GADGET_DUALSPEED is not set
879# CONFIG_USB_ZERO is not set
880# CONFIG_USB_ETH is not set
881# CONFIG_USB_GADGETFS is not set
882# CONFIG_USB_FILE_STORAGE is not set
883# CONFIG_USB_G_SERIAL is not set
884
885#
886# MMC/SD Card support
887#
888CONFIG_MMC=y
889# CONFIG_MMC_DEBUG is not set
890CONFIG_MMC_BLOCK=y
891CONFIG_MMC_AT91RM9200=y
892
893#
894# Real Time Clock
895#
896CONFIG_RTC_LIB=y
897# CONFIG_RTC_CLASS is not set
898
899#
900# File systems
901#
902CONFIG_EXT2_FS=y
903# CONFIG_EXT2_FS_XATTR is not set
904# CONFIG_EXT2_FS_XIP is not set
905# CONFIG_EXT3_FS is not set
906# CONFIG_REISERFS_FS is not set
907# CONFIG_JFS_FS is not set
908CONFIG_FS_POSIX_ACL=y
909# CONFIG_XFS_FS is not set
910# CONFIG_OCFS2_FS is not set
911# CONFIG_MINIX_FS is not set
912# CONFIG_ROMFS_FS is not set
913CONFIG_INOTIFY=y
914CONFIG_INOTIFY_USER=y
915# CONFIG_QUOTA is not set
916CONFIG_DNOTIFY=y
917# CONFIG_AUTOFS_FS is not set
918# CONFIG_AUTOFS4_FS is not set
919# CONFIG_FUSE_FS is not set
920
921#
922# CD-ROM/DVD Filesystems
923#
924# CONFIG_ISO9660_FS is not set
925# CONFIG_UDF_FS is not set
926
927#
928# DOS/FAT/NT Filesystems
929#
930# CONFIG_MSDOS_FS is not set
931# CONFIG_VFAT_FS is not set
932# CONFIG_NTFS_FS is not set
933
934#
935# Pseudo filesystems
936#
937CONFIG_PROC_FS=y
938CONFIG_SYSFS=y
939CONFIG_TMPFS=y
940# CONFIG_HUGETLB_PAGE is not set
941CONFIG_RAMFS=y
942# CONFIG_CONFIGFS_FS is not set
943
944#
945# Miscellaneous filesystems
946#
947# CONFIG_ADFS_FS is not set
948# CONFIG_AFFS_FS is not set
949# CONFIG_HFS_FS is not set
950# CONFIG_HFSPLUS_FS is not set
951# CONFIG_BEFS_FS is not set
952# CONFIG_BFS_FS is not set
953# CONFIG_EFS_FS is not set
954# CONFIG_JFFS_FS is not set
955# CONFIG_JFFS2_FS is not set
956CONFIG_CRAMFS=y
957# CONFIG_VXFS_FS is not set
958# CONFIG_HPFS_FS is not set
959# CONFIG_QNX4FS_FS is not set
960# CONFIG_SYSV_FS is not set
961# CONFIG_UFS_FS is not set
962
963#
964# Network File Systems
965#
966CONFIG_NFS_FS=y
967CONFIG_NFS_V3=y
968CONFIG_NFS_V3_ACL=y
969# CONFIG_NFS_V4 is not set
970# CONFIG_NFS_DIRECTIO is not set
971# CONFIG_NFSD is not set
972CONFIG_ROOT_NFS=y
973CONFIG_LOCKD=y
974CONFIG_LOCKD_V4=y
975CONFIG_NFS_ACL_SUPPORT=y
976CONFIG_NFS_COMMON=y
977CONFIG_SUNRPC=y
978# CONFIG_RPCSEC_GSS_KRB5 is not set
979# CONFIG_RPCSEC_GSS_SPKM3 is not set
980# CONFIG_SMB_FS is not set
981# CONFIG_CIFS is not set
982# CONFIG_NCP_FS is not set
983# CONFIG_CODA_FS is not set
984# CONFIG_AFS_FS is not set
985# CONFIG_9P_FS is not set
986
987#
988# Partition Types
989#
990# CONFIG_PARTITION_ADVANCED is not set
991CONFIG_MSDOS_PARTITION=y
992
993#
994# Native Language Support
995#
996# CONFIG_NLS is not set
997
998#
999# Profiling support
1000#
1001# CONFIG_PROFILING is not set
1002
1003#
1004# Kernel hacking
1005#
1006# CONFIG_PRINTK_TIME is not set
1007# CONFIG_MAGIC_SYSRQ is not set
1008CONFIG_DEBUG_KERNEL=y
1009CONFIG_LOG_BUF_SHIFT=14
1010CONFIG_DETECT_SOFTLOCKUP=y
1011# CONFIG_SCHEDSTATS is not set
1012# CONFIG_DEBUG_SLAB is not set
1013# CONFIG_DEBUG_MUTEXES is not set
1014# CONFIG_DEBUG_SPINLOCK is not set
1015# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1016# CONFIG_DEBUG_KOBJECT is not set
1017CONFIG_DEBUG_BUGVERBOSE=y
1018# CONFIG_DEBUG_INFO is not set
1019# CONFIG_DEBUG_FS is not set
1020# CONFIG_DEBUG_VM is not set
1021CONFIG_FRAME_POINTER=y
1022# CONFIG_UNWIND_INFO is not set
1023CONFIG_FORCED_INLINING=y
1024# CONFIG_RCU_TORTURE_TEST is not set
1025CONFIG_DEBUG_USER=y
1026# CONFIG_DEBUG_WAITQ is not set
1027# CONFIG_DEBUG_ERRORS is not set
1028CONFIG_DEBUG_LL=y
1029# CONFIG_DEBUG_ICEDCC is not set
1030
1031#
1032# Security options
1033#
1034# CONFIG_KEYS is not set
1035# CONFIG_SECURITY is not set
1036
1037#
1038# Cryptographic options
1039#
1040# CONFIG_CRYPTO is not set
1041
1042#
1043# Hardware crypto devices
1044#
1045
1046#
1047# Library routines
1048#
1049# CONFIG_CRC_CCITT is not set
1050# CONFIG_CRC16 is not set
1051CONFIG_CRC32=y
1052# CONFIG_LIBCRC32C is not set
1053CONFIG_ZLIB_INFLATE=y
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index e17661380096..f20814e6f497 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -1,7 +1,7 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.17 3# Linux kernel version: 2.6.17-git9
4# Tue Jun 20 18:57:01 2006 4# Sun Jun 25 23:56:32 2006
5# 5#
6CONFIG_ARM=y 6CONFIG_ARM=y
7CONFIG_MMU=y 7CONFIG_MMU=y
@@ -49,7 +49,6 @@ CONFIG_SLAB=y
49# CONFIG_TINY_SHMEM is not set 49# CONFIG_TINY_SHMEM is not set
50CONFIG_BASE_SMALL=0 50CONFIG_BASE_SMALL=0
51# CONFIG_SLOB is not set 51# CONFIG_SLOB is not set
52CONFIG_OBSOLETE_INTERMODULE=y
53 52
54# 53#
55# Loadable module support 54# Loadable module support
@@ -81,18 +80,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory"
81# 80#
82# System Type 81# System Type
83# 82#
83# CONFIG_ARCH_AAEC2000 is not set
84# CONFIG_ARCH_INTEGRATOR is not set
85# CONFIG_ARCH_REALVIEW is not set
86# CONFIG_ARCH_VERSATILE is not set
87# CONFIG_ARCH_AT91RM9200 is not set
84# CONFIG_ARCH_CLPS7500 is not set 88# CONFIG_ARCH_CLPS7500 is not set
85# CONFIG_ARCH_CLPS711X is not set 89# CONFIG_ARCH_CLPS711X is not set
86# CONFIG_ARCH_CO285 is not set 90# CONFIG_ARCH_CO285 is not set
87# CONFIG_ARCH_EBSA110 is not set 91# CONFIG_ARCH_EBSA110 is not set
88# CONFIG_ARCH_EP93XX is not set 92# CONFIG_ARCH_EP93XX is not set
89# CONFIG_ARCH_FOOTBRIDGE is not set 93# CONFIG_ARCH_FOOTBRIDGE is not set
90# CONFIG_ARCH_INTEGRATOR is not set 94# CONFIG_ARCH_NETX is not set
95# CONFIG_ARCH_H720X is not set
96# CONFIG_ARCH_IMX is not set
91# CONFIG_ARCH_IOP3XX is not set 97# CONFIG_ARCH_IOP3XX is not set
92# CONFIG_ARCH_IXP4XX is not set 98# CONFIG_ARCH_IXP4XX is not set
93# CONFIG_ARCH_IXP2000 is not set 99# CONFIG_ARCH_IXP2000 is not set
94# CONFIG_ARCH_IXP23XX is not set 100# CONFIG_ARCH_IXP23XX is not set
95# CONFIG_ARCH_L7200 is not set 101# CONFIG_ARCH_L7200 is not set
102# CONFIG_ARCH_PNX4008 is not set
96# CONFIG_ARCH_PXA is not set 103# CONFIG_ARCH_PXA is not set
97# CONFIG_ARCH_RPC is not set 104# CONFIG_ARCH_RPC is not set
98# CONFIG_ARCH_SA1100 is not set 105# CONFIG_ARCH_SA1100 is not set
@@ -100,14 +107,6 @@ CONFIG_ARCH_S3C2410=y
100# CONFIG_ARCH_SHARK is not set 107# CONFIG_ARCH_SHARK is not set
101# CONFIG_ARCH_LH7A40X is not set 108# CONFIG_ARCH_LH7A40X is not set
102# CONFIG_ARCH_OMAP is not set 109# CONFIG_ARCH_OMAP is not set
103# CONFIG_ARCH_VERSATILE is not set
104# CONFIG_ARCH_REALVIEW is not set
105# CONFIG_ARCH_IMX is not set
106# CONFIG_ARCH_H720X is not set
107# CONFIG_ARCH_AAEC2000 is not set
108# CONFIG_ARCH_AT91RM9200 is not set
109# CONFIG_ARCH_PNX4008 is not set
110# CONFIG_ARCH_NETX is not set
111 110
112# 111#
113# S3C24XX Implementations 112# S3C24XX Implementations
@@ -123,11 +122,14 @@ CONFIG_ARCH_SMDK2410=y
123CONFIG_ARCH_S3C2440=y 122CONFIG_ARCH_S3C2440=y
124CONFIG_SMDK2440_CPU2440=y 123CONFIG_SMDK2440_CPU2440=y
125CONFIG_SMDK2440_CPU2442=y 124CONFIG_SMDK2440_CPU2442=y
125CONFIG_MACH_SMDK2413=y
126CONFIG_MACH_VR1000=y 126CONFIG_MACH_VR1000=y
127CONFIG_MACH_RX3715=y 127CONFIG_MACH_RX3715=y
128CONFIG_MACH_OTOM=y 128CONFIG_MACH_OTOM=y
129CONFIG_MACH_NEXCODER_2440=y 129CONFIG_MACH_NEXCODER_2440=y
130CONFIG_S3C2410_CLOCK=y
130CONFIG_CPU_S3C2410=y 131CONFIG_CPU_S3C2410=y
132CONFIG_CPU_S3C2412=y
131CONFIG_CPU_S3C244X=y 133CONFIG_CPU_S3C244X=y
132CONFIG_CPU_S3C2440=y 134CONFIG_CPU_S3C2440=y
133CONFIG_CPU_S3C2442=y 135CONFIG_CPU_S3C2442=y
@@ -153,8 +155,11 @@ CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
153# 155#
154CONFIG_CPU_32=y 156CONFIG_CPU_32=y
155CONFIG_CPU_ARM920T=y 157CONFIG_CPU_ARM920T=y
158CONFIG_CPU_ARM926T=y
156CONFIG_CPU_32v4=y 159CONFIG_CPU_32v4=y
160CONFIG_CPU_32v5=y
157CONFIG_CPU_ABRT_EV4T=y 161CONFIG_CPU_ABRT_EV4T=y
162CONFIG_CPU_ABRT_EV5TJ=y
158CONFIG_CPU_CACHE_V4WT=y 163CONFIG_CPU_CACHE_V4WT=y
159CONFIG_CPU_CACHE_VIVT=y 164CONFIG_CPU_CACHE_VIVT=y
160CONFIG_CPU_COPY_V4WB=y 165CONFIG_CPU_COPY_V4WB=y
@@ -167,6 +172,7 @@ CONFIG_CPU_TLB_V4WBI=y
167# CONFIG_CPU_ICACHE_DISABLE is not set 172# CONFIG_CPU_ICACHE_DISABLE is not set
168# CONFIG_CPU_DCACHE_DISABLE is not set 173# CONFIG_CPU_DCACHE_DISABLE is not set
169# CONFIG_CPU_DCACHE_WRITETHROUGH is not set 174# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
175# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
170 176
171# 177#
172# Bus support 178# Bus support
@@ -214,6 +220,7 @@ CONFIG_CMDLINE="root=/dev/hda1 ro init=/bin/bash console=ttySAC0"
214CONFIG_FPE_NWFPE=y 220CONFIG_FPE_NWFPE=y
215# CONFIG_FPE_NWFPE_XP is not set 221# CONFIG_FPE_NWFPE_XP is not set
216# CONFIG_FPE_FASTFPE is not set 222# CONFIG_FPE_FASTFPE is not set
223# CONFIG_VFP is not set
217 224
218# 225#
219# Userspace binary formats 226# Userspace binary formats
@@ -242,6 +249,8 @@ CONFIG_NET=y
242# CONFIG_NETDEBUG is not set 249# CONFIG_NETDEBUG is not set
243# CONFIG_PACKET is not set 250# CONFIG_PACKET is not set
244CONFIG_UNIX=y 251CONFIG_UNIX=y
252CONFIG_XFRM=y
253# CONFIG_XFRM_USER is not set
245# CONFIG_NET_KEY is not set 254# CONFIG_NET_KEY is not set
246CONFIG_INET=y 255CONFIG_INET=y
247# CONFIG_IP_MULTICAST is not set 256# CONFIG_IP_MULTICAST is not set
@@ -260,6 +269,8 @@ CONFIG_IP_PNP_BOOTP=y
260# CONFIG_INET_IPCOMP is not set 269# CONFIG_INET_IPCOMP is not set
261# CONFIG_INET_XFRM_TUNNEL is not set 270# CONFIG_INET_XFRM_TUNNEL is not set
262# CONFIG_INET_TUNNEL is not set 271# CONFIG_INET_TUNNEL is not set
272CONFIG_INET_XFRM_MODE_TRANSPORT=y
273CONFIG_INET_XFRM_MODE_TUNNEL=y
263CONFIG_INET_DIAG=y 274CONFIG_INET_DIAG=y
264CONFIG_INET_TCP_DIAG=y 275CONFIG_INET_TCP_DIAG=y
265# CONFIG_TCP_CONG_ADVANCED is not set 276# CONFIG_TCP_CONG_ADVANCED is not set
@@ -267,6 +278,7 @@ CONFIG_TCP_CONG_BIC=y
267# CONFIG_IPV6 is not set 278# CONFIG_IPV6 is not set
268# CONFIG_INET6_XFRM_TUNNEL is not set 279# CONFIG_INET6_XFRM_TUNNEL is not set
269# CONFIG_INET6_TUNNEL is not set 280# CONFIG_INET6_TUNNEL is not set
281# CONFIG_NETWORK_SECMARK is not set
270# CONFIG_NETFILTER is not set 282# CONFIG_NETFILTER is not set
271 283
272# 284#
@@ -321,6 +333,7 @@ CONFIG_STANDALONE=y
321CONFIG_PREVENT_FIRMWARE_BUILD=y 333CONFIG_PREVENT_FIRMWARE_BUILD=y
322# CONFIG_FW_LOADER is not set 334# CONFIG_FW_LOADER is not set
323# CONFIG_DEBUG_DRIVER is not set 335# CONFIG_DEBUG_DRIVER is not set
336# CONFIG_SYS_HYPERVISOR is not set
324 337
325# 338#
326# Connector - unified userspace <-> kernelspace linker 339# Connector - unified userspace <-> kernelspace linker
@@ -408,10 +421,12 @@ CONFIG_MTD_BAST_MAXSIZE=4
408# 421#
409CONFIG_MTD_NAND=y 422CONFIG_MTD_NAND=y
410# CONFIG_MTD_NAND_VERIFY_WRITE is not set 423# CONFIG_MTD_NAND_VERIFY_WRITE is not set
424# CONFIG_MTD_NAND_ECC_SMC is not set
411CONFIG_MTD_NAND_IDS=y 425CONFIG_MTD_NAND_IDS=y
412CONFIG_MTD_NAND_S3C2410=y 426CONFIG_MTD_NAND_S3C2410=y
413# CONFIG_MTD_NAND_S3C2410_DEBUG is not set 427# CONFIG_MTD_NAND_S3C2410_DEBUG is not set
414# CONFIG_MTD_NAND_S3C2410_HWECC is not set 428# CONFIG_MTD_NAND_S3C2410_HWECC is not set
429# CONFIG_MTD_NAND_S3C2410_CLKSTOP is not set
415# CONFIG_MTD_NAND_DISKONCHIP is not set 430# CONFIG_MTD_NAND_DISKONCHIP is not set
416# CONFIG_MTD_NAND_NANDSIM is not set 431# CONFIG_MTD_NAND_NANDSIM is not set
417 432
@@ -425,8 +440,8 @@ CONFIG_MTD_NAND_S3C2410=y
425# 440#
426CONFIG_PARPORT=y 441CONFIG_PARPORT=y
427# CONFIG_PARPORT_PC is not set 442# CONFIG_PARPORT_PC is not set
428# CONFIG_PARPORT_ARC is not set
429# CONFIG_PARPORT_GSC is not set 443# CONFIG_PARPORT_GSC is not set
444# CONFIG_PARPORT_AX88796 is not set
430CONFIG_PARPORT_1284=y 445CONFIG_PARPORT_1284=y
431 446
432# 447#
@@ -735,6 +750,7 @@ CONFIG_I2C_ALGOBIT=m
735# 750#
736# CONFIG_I2C_ELEKTOR is not set 751# CONFIG_I2C_ELEKTOR is not set
737CONFIG_I2C_ISA=m 752CONFIG_I2C_ISA=m
753# CONFIG_I2C_OCORES is not set
738# CONFIG_I2C_PARPORT is not set 754# CONFIG_I2C_PARPORT is not set
739# CONFIG_I2C_PARPORT_LIGHT is not set 755# CONFIG_I2C_PARPORT_LIGHT is not set
740CONFIG_I2C_S3C2410=y 756CONFIG_I2C_S3C2410=y
@@ -765,13 +781,13 @@ CONFIG_SENSORS_EEPROM=m
765# 781#
766# Dallas's 1-wire bus 782# Dallas's 1-wire bus
767# 783#
768# CONFIG_W1 is not set
769 784
770# 785#
771# Hardware Monitoring support 786# Hardware Monitoring support
772# 787#
773CONFIG_HWMON=y 788CONFIG_HWMON=y
774CONFIG_HWMON_VID=m 789CONFIG_HWMON_VID=m
790# CONFIG_SENSORS_ABITUGURU is not set
775# CONFIG_SENSORS_ADM1021 is not set 791# CONFIG_SENSORS_ADM1021 is not set
776# CONFIG_SENSORS_ADM1025 is not set 792# CONFIG_SENSORS_ADM1025 is not set
777# CONFIG_SENSORS_ADM1026 is not set 793# CONFIG_SENSORS_ADM1026 is not set
@@ -799,8 +815,10 @@ CONFIG_SENSORS_LM85=m
799# CONFIG_SENSORS_MAX1619 is not set 815# CONFIG_SENSORS_MAX1619 is not set
800# CONFIG_SENSORS_PC87360 is not set 816# CONFIG_SENSORS_PC87360 is not set
801# CONFIG_SENSORS_SMSC47M1 is not set 817# CONFIG_SENSORS_SMSC47M1 is not set
818# CONFIG_SENSORS_SMSC47M192 is not set
802# CONFIG_SENSORS_SMSC47B397 is not set 819# CONFIG_SENSORS_SMSC47B397 is not set
803# CONFIG_SENSORS_W83781D is not set 820# CONFIG_SENSORS_W83781D is not set
821# CONFIG_SENSORS_W83791D is not set
804# CONFIG_SENSORS_W83792D is not set 822# CONFIG_SENSORS_W83792D is not set
805# CONFIG_SENSORS_W83L785TS is not set 823# CONFIG_SENSORS_W83L785TS is not set
806# CONFIG_SENSORS_W83627HF is not set 824# CONFIG_SENSORS_W83627HF is not set
@@ -845,6 +863,7 @@ CONFIG_FB_CFB_COPYAREA=y
845CONFIG_FB_CFB_IMAGEBLIT=y 863CONFIG_FB_CFB_IMAGEBLIT=y
846# CONFIG_FB_MACMODES is not set 864# CONFIG_FB_MACMODES is not set
847CONFIG_FB_FIRMWARE_EDID=y 865CONFIG_FB_FIRMWARE_EDID=y
866# CONFIG_FB_BACKLIGHT is not set
848CONFIG_FB_MODE_HELPERS=y 867CONFIG_FB_MODE_HELPERS=y
849# CONFIG_FB_TILEBLITTING is not set 868# CONFIG_FB_TILEBLITTING is not set
850# CONFIG_FB_S1D13XXX is not set 869# CONFIG_FB_S1D13XXX is not set
@@ -976,10 +995,12 @@ CONFIG_USB_MON=y
976# CONFIG_USB_LEGOTOWER is not set 995# CONFIG_USB_LEGOTOWER is not set
977# CONFIG_USB_LCD is not set 996# CONFIG_USB_LCD is not set
978# CONFIG_USB_LED is not set 997# CONFIG_USB_LED is not set
998# CONFIG_USB_CY7C63 is not set
979# CONFIG_USB_CYTHERM is not set 999# CONFIG_USB_CYTHERM is not set
980# CONFIG_USB_PHIDGETKIT is not set 1000# CONFIG_USB_PHIDGETKIT is not set
981# CONFIG_USB_PHIDGETSERVO is not set 1001# CONFIG_USB_PHIDGETSERVO is not set
982# CONFIG_USB_IDMOUSE is not set 1002# CONFIG_USB_IDMOUSE is not set
1003# CONFIG_USB_APPLEDISPLAY is not set
983# CONFIG_USB_LD is not set 1004# CONFIG_USB_LD is not set
984# CONFIG_USB_TEST is not set 1005# CONFIG_USB_TEST is not set
985 1006
@@ -1024,6 +1045,7 @@ CONFIG_FS_MBCACHE=y
1024# CONFIG_MINIX_FS is not set 1045# CONFIG_MINIX_FS is not set
1025CONFIG_ROMFS_FS=y 1046CONFIG_ROMFS_FS=y
1026CONFIG_INOTIFY=y 1047CONFIG_INOTIFY=y
1048CONFIG_INOTIFY_USER=y
1027# CONFIG_QUOTA is not set 1049# CONFIG_QUOTA is not set
1028CONFIG_DNOTIFY=y 1050CONFIG_DNOTIFY=y
1029# CONFIG_AUTOFS_FS is not set 1051# CONFIG_AUTOFS_FS is not set
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index b5bcebca1cd6..75af6d6e2f28 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -340,7 +340,7 @@ sys_mmap2:
340 streq r5, [sp, #4] 340 streq r5, [sp, #4]
341 beq do_mmap2 341 beq do_mmap2
342 mov r0, #-EINVAL 342 mov r0, #-EINVAL
343 RETINSTR(mov,pc, lr) 343 mov pc, lr
344#else 344#else
345 str r5, [sp, #4] 345 str r5, [sp, #4]
346 b do_mmap2 346 b do_mmap2
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S
index adf62e5eaad7..2af7e44218af 100644
--- a/arch/arm/kernel/head-nommu.S
+++ b/arch/arm/kernel/head-nommu.S
@@ -39,7 +39,7 @@
39 __INIT 39 __INIT
40 .type stext, %function 40 .type stext, %function
41ENTRY(stext) 41ENTRY(stext)
42 msr cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC @ ensure svc mode 42 msr cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode
43 @ and irqs disabled 43 @ and irqs disabled
44 mrc p15, 0, r9, c0, c0 @ get processor id 44 mrc p15, 0, r9, c0, c0 @ get processor id
45 bl __lookup_processor_type @ r5=procinfo r9=cpuid 45 bl __lookup_processor_type @ r5=procinfo r9=cpuid
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 04f7344e356a..330b9476c398 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -71,7 +71,7 @@
71 __INIT 71 __INIT
72 .type stext, %function 72 .type stext, %function
73ENTRY(stext) 73ENTRY(stext)
74 msr cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC @ ensure svc mode 74 msr cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE @ ensure svc mode
75 @ and irqs disabled 75 @ and irqs disabled
76 mrc p15, 0, r9, c0, c0 @ get processor id 76 mrc p15, 0, r9, c0, c0 @ get processor id
77 bl __lookup_processor_type @ r5=procinfo r9=cpuid 77 bl __lookup_processor_type @ r5=procinfo r9=cpuid
@@ -104,7 +104,7 @@ ENTRY(secondary_startup)
104 * the processor type - there is no need to check the machine type 104 * the processor type - there is no need to check the machine type
105 * as it has already been validated by the primary processor. 105 * as it has already been validated by the primary processor.
106 */ 106 */
107 msr cpsr_c, #PSR_F_BIT | PSR_I_BIT | MODE_SVC 107 msr cpsr_c, #PSR_F_BIT | PSR_I_BIT | SVC_MODE
108 mrc p15, 0, r9, c0, c0 @ get processor id 108 mrc p15, 0, r9, c0, c0 @ get processor id
109 bl __lookup_processor_type 109 bl __lookup_processor_type
110 movs r10, r5 @ invalid processor? 110 movs r10, r5 @ invalid processor?
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S
index 16153c86c3f8..058b80d72aa1 100644
--- a/arch/arm/lib/backtrace.S
+++ b/arch/arm/lib/backtrace.S
@@ -41,7 +41,7 @@ ENTRY(c_backtrace)
41 movne r0, #0 41 movne r0, #0
42 movs frame, r0 42 movs frame, r0
431: moveq r0, #-2 431: moveq r0, #-2
44 LOADREGS(eqfd, sp!, {r4 - r8, pc}) 44 ldmeqfd sp!, {r4 - r8, pc}
45 45
462: stmfd sp!, {pc} @ calculate offset of PC in STMIA instruction 462: stmfd sp!, {pc} @ calculate offset of PC in STMIA instruction
47 ldr r0, [sp], #4 47 ldr r0, [sp], #4
@@ -85,7 +85,7 @@ ENTRY(c_backtrace)
85 * A zero next framepointer means we're done. 85 * A zero next framepointer means we're done.
86 */ 86 */
87 teq next, #0 87 teq next, #0
88 LOADREGS(eqfd, sp!, {r4 - r8, pc}) 88 ldmeqfd sp!, {r4 - r8, pc}
89 89
90 /* 90 /*
91 * The next framepointer must be above the 91 * The next framepointer must be above the
@@ -104,7 +104,7 @@ ENTRY(c_backtrace)
1041007: ldr r0, =.Lbad 1041007: ldr r0, =.Lbad
105 mov r1, frame 105 mov r1, frame
106 bl printk 106 bl printk
107 LOADREGS(fd, sp!, {r4 - r8, pc}) 107 ldmfd sp!, {r4 - r8, pc}
108 .ltorg 108 .ltorg
109 .previous 109 .previous
110 110
@@ -145,7 +145,7 @@ ENTRY(c_backtrace)
145 adrne r0, .Lcr 145 adrne r0, .Lcr
146 blne printk 146 blne printk
147 mov r0, stack 147 mov r0, stack
148 LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc}) 148 ldmfd sp!, {instr, reg, stack, r7, r8, pc}
149 149
150.Lfp: .asciz " r%d = %08X%c" 150.Lfp: .asciz " r%d = %08X%c"
151.Lcr: .asciz "\n" 151.Lcr: .asciz "\n"
diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
index 7ff9f831b3f9..ea435ae2e4a5 100644
--- a/arch/arm/lib/clear_user.S
+++ b/arch/arm/lib/clear_user.S
@@ -43,10 +43,10 @@ USER( strnebt r2, [r0], #1)
43 tst r1, #1 @ x1 x0 x1 x0 x1 x0 x1 43 tst r1, #1 @ x1 x0 x1 x0 x1 x0 x1
44USER( strnebt r2, [r0], #1) 44USER( strnebt r2, [r0], #1)
45 mov r0, #0 45 mov r0, #0
46 LOADREGS(fd,sp!, {r1, pc}) 46 ldmfd sp!, {r1, pc}
47 47
48 .section .fixup,"ax" 48 .section .fixup,"ax"
49 .align 0 49 .align 0
509001: LOADREGS(fd,sp!, {r0, pc}) 509001: ldmfd sp!, {r0, pc}
51 .previous 51 .previous
52 52
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
index 68117968482b..666c99cc0744 100644
--- a/arch/arm/lib/copy_page.S
+++ b/arch/arm/lib/copy_page.S
@@ -43,4 +43,4 @@ ENTRY(copy_page)
43 bgt 1b @ 1 43 bgt 1b @ 1
44 PLD( ldmeqia r1!, {r3, r4, ip, lr} ) 44 PLD( ldmeqia r1!, {r3, r4, ip, lr} )
45 PLD( beq 2b ) 45 PLD( beq 2b )
46 LOADREGS(fd, sp!, {r4, pc}) @ 3 46 ldmfd sp!, {r4, pc} @ 3
diff --git a/arch/arm/lib/csumipv6.S b/arch/arm/lib/csumipv6.S
index 7065a20ee8ad..9621469beec1 100644
--- a/arch/arm/lib/csumipv6.S
+++ b/arch/arm/lib/csumipv6.S
@@ -28,5 +28,5 @@ ENTRY(__csum_ipv6_magic)
28 adcs r0, r0, r3 28 adcs r0, r0, r3
29 adcs r0, r0, r2 29 adcs r0, r0, r2
30 adcs r0, r0, #0 30 adcs r0, r0, #0
31 LOADREGS(fd, sp!, {pc}) 31 ldmfd sp!, {pc}
32 32
diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S
index 9183b06c0e2f..930a70259220 100644
--- a/arch/arm/lib/delay.S
+++ b/arch/arm/lib/delay.S
@@ -31,7 +31,7 @@ ENTRY(__const_udelay) @ 0 <= r0 <= 0x7fffff06
31 mov r2, r2, lsr #10 @ max = 0x00007fff 31 mov r2, r2, lsr #10 @ max = 0x00007fff
32 mul r0, r2, r0 @ max = 2^32-1 32 mul r0, r2, r0 @ max = 2^32-1
33 movs r0, r0, lsr #6 33 movs r0, r0, lsr #6
34 RETINSTR(moveq,pc,lr) 34 moveq pc, lr
35 35
36/* 36/*
37 * loops = r0 * HZ * loops_per_jiffy / 1000000 37 * loops = r0 * HZ * loops_per_jiffy / 1000000
@@ -43,20 +43,20 @@ ENTRY(__const_udelay) @ 0 <= r0 <= 0x7fffff06
43ENTRY(__delay) 43ENTRY(__delay)
44 subs r0, r0, #1 44 subs r0, r0, #1
45#if 0 45#if 0
46 RETINSTR(movls,pc,lr) 46 movls pc, lr
47 subs r0, r0, #1 47 subs r0, r0, #1
48 RETINSTR(movls,pc,lr) 48 movls pc, lr
49 subs r0, r0, #1 49 subs r0, r0, #1
50 RETINSTR(movls,pc,lr) 50 movls pc, lr
51 subs r0, r0, #1 51 subs r0, r0, #1
52 RETINSTR(movls,pc,lr) 52 movls pc, lr
53 subs r0, r0, #1 53 subs r0, r0, #1
54 RETINSTR(movls,pc,lr) 54 movls pc, lr
55 subs r0, r0, #1 55 subs r0, r0, #1
56 RETINSTR(movls,pc,lr) 56 movls pc, lr
57 subs r0, r0, #1 57 subs r0, r0, #1
58 RETINSTR(movls,pc,lr) 58 movls pc, lr
59 subs r0, r0, #1 59 subs r0, r0, #1
60#endif 60#endif
61 bhi __delay 61 bhi __delay
62 RETINSTR(mov,pc,lr) 62 mov pc, lr
diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S
index fb7b602a6f76..c55aaa2a2088 100644
--- a/arch/arm/lib/ecard.S
+++ b/arch/arm/lib/ecard.S
@@ -29,7 +29,7 @@ ENTRY(ecard_loader_read)
29 CPSR2SPSR(r0) 29 CPSR2SPSR(r0)
30 mov lr, pc 30 mov lr, pc
31 mov pc, r2 31 mov pc, r2
32 LOADREGS(fd, sp!, {r4 - r12, pc}) 32 ldmfd sp!, {r4 - r12, pc}
33 33
34@ Purpose: call an expansion card loader to reset the card 34@ Purpose: call an expansion card loader to reset the card
35@ Proto : void read_loader(int card_base, char *loader); 35@ Proto : void read_loader(int card_base, char *loader);
@@ -41,5 +41,5 @@ ENTRY(ecard_loader_reset)
41 CPSR2SPSR(r0) 41 CPSR2SPSR(r0)
42 mov lr, pc 42 mov lr, pc
43 add pc, r1, #8 43 add pc, r1, #8
44 LOADREGS(fd, sp!, {r4 - r12, pc}) 44 ldmfd sp!, {r4 - r12, pc}
45 45
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
index 6f8e27a58c78..a5ca0248aa4e 100644
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
@@ -32,7 +32,7 @@ ENTRY(_find_first_zero_bit_le)
322: cmp r2, r1 @ any more? 322: cmp r2, r1 @ any more?
33 blo 1b 33 blo 1b
343: mov r0, r1 @ no free bits 343: mov r0, r1 @ no free bits
35 RETINSTR(mov,pc,lr) 35 mov pc, lr
36 36
37/* 37/*
38 * Purpose : Find next 'zero' bit 38 * Purpose : Find next 'zero' bit
@@ -66,7 +66,7 @@ ENTRY(_find_first_bit_le)
662: cmp r2, r1 @ any more? 662: cmp r2, r1 @ any more?
67 blo 1b 67 blo 1b
683: mov r0, r1 @ no free bits 683: mov r0, r1 @ no free bits
69 RETINSTR(mov,pc,lr) 69 mov pc, lr
70 70
71/* 71/*
72 * Purpose : Find next 'one' bit 72 * Purpose : Find next 'one' bit
@@ -98,7 +98,7 @@ ENTRY(_find_first_zero_bit_be)
982: cmp r2, r1 @ any more? 982: cmp r2, r1 @ any more?
99 blo 1b 99 blo 1b
1003: mov r0, r1 @ no free bits 1003: mov r0, r1 @ no free bits
101 RETINSTR(mov,pc,lr) 101 mov pc, lr
102 102
103ENTRY(_find_next_zero_bit_be) 103ENTRY(_find_next_zero_bit_be)
104 teq r1, #0 104 teq r1, #0
@@ -126,7 +126,7 @@ ENTRY(_find_first_bit_be)
1262: cmp r2, r1 @ any more? 1262: cmp r2, r1 @ any more?
127 blo 1b 127 blo 1b
1283: mov r0, r1 @ no free bits 1283: mov r0, r1 @ no free bits
129 RETINSTR(mov,pc,lr) 129 mov pc, lr
130 130
131ENTRY(_find_next_bit_be) 131ENTRY(_find_next_bit_be)
132 teq r1, #0 132 teq r1, #0
@@ -164,5 +164,5 @@ ENTRY(_find_next_bit_be)
164 addeq r2, r2, #1 164 addeq r2, r2, #1
165 mov r0, r2 165 mov r0, r2
166#endif 166#endif
167 RETINSTR(mov,pc,lr) 167 mov pc, lr
168 168
diff --git a/arch/arm/lib/io-readsb.S b/arch/arm/lib/io-readsb.S
index d3d8de71a2c8..fb966ad0276f 100644
--- a/arch/arm/lib/io-readsb.S
+++ b/arch/arm/lib/io-readsb.S
@@ -72,7 +72,7 @@ ENTRY(__raw_readsb)
72 bpl .Linsb_16_lp 72 bpl .Linsb_16_lp
73 73
74 tst r2, #15 74 tst r2, #15
75 LOADREGS(eqfd, sp!, {r4 - r6, pc}) 75 ldmeqfd sp!, {r4 - r6, pc}
76 76
77.Linsb_no_16: tst r2, #8 77.Linsb_no_16: tst r2, #8
78 beq .Linsb_no_8 78 beq .Linsb_no_8
@@ -109,7 +109,7 @@ ENTRY(__raw_readsb)
109 str r3, [r1], #4 109 str r3, [r1], #4
110 110
111.Linsb_no_4: ands r2, r2, #3 111.Linsb_no_4: ands r2, r2, #3
112 LOADREGS(eqfd, sp!, {r4 - r6, pc}) 112 ldmeqfd sp!, {r4 - r6, pc}
113 113
114 cmp r2, #2 114 cmp r2, #2
115 ldrb r3, [r0] 115 ldrb r3, [r0]
@@ -119,4 +119,4 @@ ENTRY(__raw_readsb)
119 ldrgtb r3, [r0] 119 ldrgtb r3, [r0]
120 strgtb r3, [r1] 120 strgtb r3, [r1]
121 121
122 LOADREGS(fd, sp!, {r4 - r6, pc}) 122 ldmfd sp!, {r4 - r6, pc}
diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S
index 146d47c15455..4ef904185142 100644
--- a/arch/arm/lib/io-readsw-armv3.S
+++ b/arch/arm/lib/io-readsw-armv3.S
@@ -28,7 +28,7 @@
28 strb r3, [r1], #1 28 strb r3, [r1], #1
29 29
30 subs r2, r2, #1 30 subs r2, r2, #1
31 RETINSTR(moveq, pc, lr) 31 moveq pc, lr
32 32
33ENTRY(__raw_readsw) 33ENTRY(__raw_readsw)
34 teq r2, #0 @ do we have to check for the zero len? 34 teq r2, #0 @ do we have to check for the zero len?
@@ -69,7 +69,7 @@ ENTRY(__raw_readsw)
69 bpl .Linsw_8_lp 69 bpl .Linsw_8_lp
70 70
71 tst r2, #7 71 tst r2, #7
72 LOADREGS(eqfd, sp!, {r4, r5, r6, pc}) 72 ldmeqfd sp!, {r4, r5, r6, pc}
73 73
74.Lno_insw_8: tst r2, #4 74.Lno_insw_8: tst r2, #4
75 beq .Lno_insw_4 75 beq .Lno_insw_4
@@ -102,6 +102,6 @@ ENTRY(__raw_readsw)
102 movne r3, r3, lsr #8 102 movne r3, r3, lsr #8
103 strneb r3, [r1] 103 strneb r3, [r1]
104 104
105 LOADREGS(fd, sp!, {r4, r5, r6, pc}) 105 ldmfd sp!, {r4, r5, r6, pc}
106 106
107 107
diff --git a/arch/arm/lib/io-writesb.S b/arch/arm/lib/io-writesb.S
index 08209fc640ea..7eba2b6cc69f 100644
--- a/arch/arm/lib/io-writesb.S
+++ b/arch/arm/lib/io-writesb.S
@@ -64,7 +64,7 @@ ENTRY(__raw_writesb)
64 bpl .Loutsb_16_lp 64 bpl .Loutsb_16_lp
65 65
66 tst r2, #15 66 tst r2, #15
67 LOADREGS(eqfd, sp!, {r4, r5, pc}) 67 ldmeqfd sp!, {r4, r5, pc}
68 68
69.Loutsb_no_16: tst r2, #8 69.Loutsb_no_16: tst r2, #8
70 beq .Loutsb_no_8 70 beq .Loutsb_no_8
@@ -80,7 +80,7 @@ ENTRY(__raw_writesb)
80 outword r3 80 outword r3
81 81
82.Loutsb_no_4: ands r2, r2, #3 82.Loutsb_no_4: ands r2, r2, #3
83 LOADREGS(eqfd, sp!, {r4, r5, pc}) 83 ldmeqfd sp!, {r4, r5, pc}
84 84
85 cmp r2, #2 85 cmp r2, #2
86 ldrb r3, [r1], #1 86 ldrb r3, [r1], #1
@@ -90,4 +90,4 @@ ENTRY(__raw_writesb)
90 ldrgtb r3, [r1] 90 ldrgtb r3, [r1]
91 strgtb r3, [r0] 91 strgtb r3, [r0]
92 92
93 LOADREGS(fd, sp!, {r4, r5, pc}) 93 ldmfd sp!, {r4, r5, pc}
diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S
index 52d62b481295..1607a29f49b7 100644
--- a/arch/arm/lib/io-writesw-armv3.S
+++ b/arch/arm/lib/io-writesw-armv3.S
@@ -29,7 +29,7 @@
29 orr r3, r3, r3, lsl #16 29 orr r3, r3, r3, lsl #16
30 str r3, [r0] 30 str r3, [r0]
31 subs r2, r2, #1 31 subs r2, r2, #1
32 RETINSTR(moveq, pc, lr) 32 moveq pc, lr
33 33
34ENTRY(__raw_writesw) 34ENTRY(__raw_writesw)
35 teq r2, #0 @ do we have to check for the zero len? 35 teq r2, #0 @ do we have to check for the zero len?
@@ -80,7 +80,7 @@ ENTRY(__raw_writesw)
80 bpl .Loutsw_8_lp 80 bpl .Loutsw_8_lp
81 81
82 tst r2, #7 82 tst r2, #7
83 LOADREGS(eqfd, sp!, {r4, r5, r6, pc}) 83 ldmeqfd sp!, {r4, r5, r6, pc}
84 84
85.Lno_outsw_8: tst r2, #4 85.Lno_outsw_8: tst r2, #4
86 beq .Lno_outsw_4 86 beq .Lno_outsw_4
@@ -124,4 +124,4 @@ ENTRY(__raw_writesw)
124 orrne ip, ip, ip, lsr #16 124 orrne ip, ip, ip, lsr #16
125 strne ip, [r0] 125 strne ip, [r0]
126 126
127 LOADREGS(fd, sp!, {r4, r5, r6, pc}) 127 ldmfd sp!, {r4, r5, r6, pc}
diff --git a/arch/arm/lib/memchr.S b/arch/arm/lib/memchr.S
index ac34fe55d21a..e7ab1ea8ebaa 100644
--- a/arch/arm/lib/memchr.S
+++ b/arch/arm/lib/memchr.S
@@ -22,4 +22,4 @@ ENTRY(memchr)
22 bne 1b 22 bne 1b
23 sub r0, r0, #1 23 sub r0, r0, #1
242: movne r0, #0 242: movne r0, #0
25 RETINSTR(mov,pc,lr) 25 mov pc, lr
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
index a1795f599937..95b110b07a89 100644
--- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S
@@ -53,7 +53,7 @@ ENTRY(memset)
53 stmgeia r0!, {r1, r3, ip, lr} 53 stmgeia r0!, {r1, r3, ip, lr}
54 stmgeia r0!, {r1, r3, ip, lr} 54 stmgeia r0!, {r1, r3, ip, lr}
55 bgt 2b 55 bgt 2b
56 LOADREGS(eqfd, sp!, {pc}) @ Now <64 bytes to go. 56 ldmeqfd sp!, {pc} @ Now <64 bytes to go.
57/* 57/*
58 * No need to correct the count; we're only testing bits from now on 58 * No need to correct the count; we're only testing bits from now on
59 */ 59 */
@@ -77,4 +77,4 @@ ENTRY(memset)
77 strneb r1, [r0], #1 77 strneb r1, [r0], #1
78 tst r2, #1 78 tst r2, #1
79 strneb r1, [r0], #1 79 strneb r1, [r0], #1
80 RETINSTR(mov,pc,lr) 80 mov pc, lr
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S
index 51ccc60160fd..abf2508e8221 100644
--- a/arch/arm/lib/memzero.S
+++ b/arch/arm/lib/memzero.S
@@ -53,7 +53,7 @@ ENTRY(__memzero)
53 stmgeia r0!, {r2, r3, ip, lr} @ 4 53 stmgeia r0!, {r2, r3, ip, lr} @ 4
54 stmgeia r0!, {r2, r3, ip, lr} @ 4 54 stmgeia r0!, {r2, r3, ip, lr} @ 4
55 bgt 3b @ 1 55 bgt 3b @ 1
56 LOADREGS(eqfd, sp!, {pc}) @ 1/2 quick exit 56 ldmeqfd sp!, {pc} @ 1/2 quick exit
57/* 57/*
58 * No need to correct the count; we're only testing bits from now on 58 * No need to correct the count; we're only testing bits from now on
59 */ 59 */
@@ -77,4 +77,4 @@ ENTRY(__memzero)
77 strneb r2, [r0], #1 @ 1 77 strneb r2, [r0], #1 @ 1
78 tst r1, #1 @ 1 a byte left over 78 tst r1, #1 @ 1 a byte left over
79 strneb r2, [r0], #1 @ 1 79 strneb r2, [r0], #1 @ 1
80 RETINSTR(mov,pc,lr) @ 1 80 mov pc, lr @ 1
diff --git a/arch/arm/lib/strchr.S b/arch/arm/lib/strchr.S
index 5b9b493733fc..9f18d6fdee6a 100644
--- a/arch/arm/lib/strchr.S
+++ b/arch/arm/lib/strchr.S
@@ -23,4 +23,4 @@ ENTRY(strchr)
23 teq r2, r1 23 teq r2, r1
24 movne r0, #0 24 movne r0, #0
25 subeq r0, r0, #1 25 subeq r0, r0, #1
26 RETINSTR(mov,pc,lr) 26 mov pc, lr
diff --git a/arch/arm/lib/strncpy_from_user.S b/arch/arm/lib/strncpy_from_user.S
index 629cc8775276..35649f04fcac 100644
--- a/arch/arm/lib/strncpy_from_user.S
+++ b/arch/arm/lib/strncpy_from_user.S
@@ -21,7 +21,6 @@
21 * -EFAULT on exception, or "len" if we fill the whole buffer 21 * -EFAULT on exception, or "len" if we fill the whole buffer
22 */ 22 */
23ENTRY(__arch_strncpy_from_user) 23ENTRY(__arch_strncpy_from_user)
24 save_lr
25 mov ip, r1 24 mov ip, r1
261: subs r2, r2, #1 251: subs r2, r2, #1
27USER( ldrplbt r3, [r1], #1) 26USER( ldrplbt r3, [r1], #1)
@@ -31,13 +30,13 @@ USER( ldrplbt r3, [r1], #1)
31 bne 1b 30 bne 1b
32 sub r1, r1, #1 @ take NUL character out of count 31 sub r1, r1, #1 @ take NUL character out of count
332: sub r0, r1, ip 322: sub r0, r1, ip
34 restore_pc 33 mov pc, lr
35 34
36 .section .fixup,"ax" 35 .section .fixup,"ax"
37 .align 0 36 .align 0
389001: mov r3, #0 379001: mov r3, #0
39 strb r3, [r0, #0] @ null terminate 38 strb r3, [r0, #0] @ null terminate
40 mov r0, #-EFAULT 39 mov r0, #-EFAULT
41 restore_pc 40 mov pc, lr
42 .previous 41 .previous
43 42
diff --git a/arch/arm/lib/strnlen_user.S b/arch/arm/lib/strnlen_user.S
index 67bcd8268128..3668a15991ef 100644
--- a/arch/arm/lib/strnlen_user.S
+++ b/arch/arm/lib/strnlen_user.S
@@ -21,7 +21,6 @@
21 * or zero on exception, or n + 1 if too long 21 * or zero on exception, or n + 1 if too long
22 */ 22 */
23ENTRY(__arch_strnlen_user) 23ENTRY(__arch_strnlen_user)
24 save_lr
25 mov r2, r0 24 mov r2, r0
261: 251:
27USER( ldrbt r3, [r0], #1) 26USER( ldrbt r3, [r0], #1)
@@ -31,10 +30,10 @@ USER( ldrbt r3, [r0], #1)
31 bne 1b 30 bne 1b
32 add r0, r0, #1 31 add r0, r0, #1
332: sub r0, r0, r2 322: sub r0, r0, r2
34 restore_pc 33 mov pc, lr
35 34
36 .section .fixup,"ax" 35 .section .fixup,"ax"
37 .align 0 36 .align 0
389001: mov r0, #0 379001: mov r0, #0
39 restore_pc 38 mov pc, lr
40 .previous 39 .previous
diff --git a/arch/arm/lib/strrchr.S b/arch/arm/lib/strrchr.S
index fa923f026f15..538df220aa48 100644
--- a/arch/arm/lib/strrchr.S
+++ b/arch/arm/lib/strrchr.S
@@ -22,4 +22,4 @@ ENTRY(strrchr)
22 teq r2, #0 22 teq r2, #0
23 bne 1b 23 bne 1b
24 mov r0, r3 24 mov r0, r3
25 RETINSTR(mov,pc,lr) 25 mov pc, lr
diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
index 0cc450f863b6..1f1545d737be 100644
--- a/arch/arm/lib/uaccess.S
+++ b/arch/arm/lib/uaccess.S
@@ -105,7 +105,7 @@ USER( strgtbt r3, [r0], #1) @ May fault
105 movs ip, r2 105 movs ip, r2
106 bne .Lc2u_nowords 106 bne .Lc2u_nowords
107.Lc2u_finished: mov r0, #0 107.Lc2u_finished: mov r0, #0
108 LOADREGS(fd,sp!,{r2, r4 - r7, pc}) 108 ldmfd sp!, {r2, r4 - r7, pc}
109 109
110.Lc2u_src_not_aligned: 110.Lc2u_src_not_aligned:
111 bic r1, r1, #3 111 bic r1, r1, #3
@@ -280,7 +280,7 @@ USER( strgtbt r3, [r0], #1) @ May fault
280 280
281 .section .fixup,"ax" 281 .section .fixup,"ax"
282 .align 0 282 .align 0
2839001: LOADREGS(fd,sp!, {r0, r4 - r7, pc}) 2839001: ldmfd sp!, {r0, r4 - r7, pc}
284 .previous 284 .previous
285 285
286/* Prototype: unsigned long __arch_copy_from_user(void *to,const void *from,unsigned long n); 286/* Prototype: unsigned long __arch_copy_from_user(void *to,const void *from,unsigned long n);
@@ -369,7 +369,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fault
369 bne .Lcfu_nowords 369 bne .Lcfu_nowords
370.Lcfu_finished: mov r0, #0 370.Lcfu_finished: mov r0, #0
371 add sp, sp, #8 371 add sp, sp, #8
372 LOADREGS(fd,sp!,{r4 - r7, pc}) 372 ldmfd sp!, {r4 - r7, pc}
373 373
374.Lcfu_src_not_aligned: 374.Lcfu_src_not_aligned:
375 bic r1, r1, #3 375 bic r1, r1, #3
@@ -556,6 +556,6 @@ USER( ldrgtbt r3, [r1], #1) @ May fault
556 movne r1, r4 556 movne r1, r4
557 blne __memzero 557 blne __memzero
558 mov r0, r4 558 mov r0, r4
559 LOADREGS(fd,sp!, {r4 - r7, pc}) 559 ldmfd sp!, {r4 - r7, pc}
560 .previous 560 .previous
561 561
diff --git a/arch/arm/mach-at91rm9200/Kconfig b/arch/arm/mach-at91rm9200/Kconfig
index 1ab5b7828318..70d402f76ce5 100644
--- a/arch/arm/mach-at91rm9200/Kconfig
+++ b/arch/arm/mach-at91rm9200/Kconfig
@@ -4,6 +4,12 @@ menu "AT91RM9200 Implementations"
4 4
5comment "AT91RM9200 Board Type" 5comment "AT91RM9200 Board Type"
6 6
7config MACH_ONEARM
8 bool "Ajeco 1ARM Single Board Computer"
9 depends on ARCH_AT91RM9200
10 help
11 Select this if you are using Ajeco's 1ARM Single Board Computer
12
7config ARCH_AT91RM9200DK 13config ARCH_AT91RM9200DK
8 bool "Atmel AT91RM9200-DK Development board" 14 bool "Atmel AT91RM9200-DK Development board"
9 depends on ARCH_AT91RM9200 15 depends on ARCH_AT91RM9200
diff --git a/arch/arm/mach-at91rm9200/Makefile b/arch/arm/mach-at91rm9200/Makefile
index 81ebc6684ad2..82db957322df 100644
--- a/arch/arm/mach-at91rm9200/Makefile
+++ b/arch/arm/mach-at91rm9200/Makefile
@@ -10,6 +10,7 @@ obj- :=
10obj-$(CONFIG_PM) += pm.o 10obj-$(CONFIG_PM) += pm.o
11 11
12# Board-specific support 12# Board-specific support
13obj-$(CONFIG_MACH_ONEARM) += board-1arm.o
13obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o 14obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o
14obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o 15obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o
15obj-$(CONFIG_MACH_CSB337) += board-csb337.o 16obj-$(CONFIG_MACH_CSB337) += board-csb337.o
diff --git a/arch/arm/mach-at91rm9200/board-1arm.c b/arch/arm/mach-at91rm9200/board-1arm.c
new file mode 100644
index 000000000000..dc79e0992af7
--- /dev/null
+++ b/arch/arm/mach-at91rm9200/board-1arm.c
@@ -0,0 +1,109 @@
1/*
2 * linux/arch/arm/mach-at91rm9200/board-1arm.c
3 *
4 * Copyright (C) 2005 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 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details.
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 */
20
21#include <linux/config.h>
22#include <linux/types.h>
23#include <linux/init.h>
24#include <linux/mm.h>
25#include <linux/module.h>
26#include <linux/platform_device.h>
27
28#include <asm/hardware.h>
29#include <asm/setup.h>
30#include <asm/mach-types.h>
31#include <asm/irq.h>
32
33#include <asm/mach/arch.h>
34#include <asm/mach/map.h>
35#include <asm/mach/irq.h>
36
37#include <asm/hardware.h>
38#include <asm/arch/board.h>
39#include <asm/arch/gpio.h>
40
41#include "generic.h"
42
43static void __init onearm_init_irq(void)
44{
45 /* Initialize AIC controller */
46 at91rm9200_init_irq(NULL);
47
48 /* Set up the GPIO interrupts */
49 at91_gpio_irq_setup(PQFP_GPIO_BANKS);
50}
51
52/*
53 * Serial port configuration.
54 * 0 .. 3 = USART0 .. USART3
55 * 4 = DBGU
56 */
57static struct at91_uart_config __initdata onearm_uart_config = {
58 .console_tty = 0, /* ttyS0 */
59 .nr_tty = 3,
60 .tty_map = { 4, 0, 1, -1, -1 }, /* ttyS0, ..., ttyS4 */
61};
62
63static void __init onearm_map_io(void)
64{
65 at91rm9200_map_io();
66
67 /* Initialize clocks: 18.432 MHz crystal */
68 at91_clock_init(18432000);
69
70 /* Setup the serial ports and console */
71 at91_init_serial(&onearm_uart_config);
72}
73
74static struct at91_eth_data __initdata onearm_eth_data = {
75 .phy_irq_pin = AT91_PIN_PC4,
76 .is_rmii = 1,
77};
78
79static struct at91_usbh_data __initdata onearm_usbh_data = {
80 .ports = 1,
81};
82
83static struct at91_udc_data __initdata onearm_udc_data = {
84 .vbus_pin = AT91_PIN_PC2,
85 .pullup_pin = AT91_PIN_PC3,
86};
87
88static void __init onearm_board_init(void)
89{
90 /* Serial */
91 at91_add_device_serial();
92 /* Ethernet */
93 at91_add_device_eth(&onearm_eth_data);
94 /* USB Host */
95 at91_add_device_usbh(&onearm_usbh_data);
96 /* USB Device */
97 at91_add_device_udc(&onearm_udc_data);
98}
99
100MACHINE_START(ONEARM, "Ajeco 1ARM single board computer")
101 /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
102 .phys_io = AT91_BASE_SYS,
103 .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
104 .boot_params = AT91_SDRAM_BASE + 0x100,
105 .timer = &at91rm9200_timer,
106 .map_io = onearm_map_io,
107 .init_irq = onearm_init_irq,
108 .init_machine = onearm_board_init,
109MACHINE_END
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index 3b23f43cb160..57f23b465392 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -35,7 +35,6 @@ config ARCH_ADI_COYOTE
35 35
36config ARCH_IXDP425 36config ARCH_IXDP425
37 bool "IXDP425" 37 bool "IXDP425"
38 select PCI
39 help 38 help
40 Say 'Y' here if you want your kernel to support Intel's 39 Say 'Y' here if you want your kernel to support Intel's
41 IXDP425 Development Platform (Also known as Richfield). 40 IXDP425 Development Platform (Also known as Richfield).
@@ -43,7 +42,6 @@ config ARCH_IXDP425
43 42
44config MACH_IXDPG425 43config MACH_IXDPG425
45 bool "IXDPG425" 44 bool "IXDPG425"
46 select PCI
47 help 45 help
48 Say 'Y' here if you want your kernel to support Intel's 46 Say 'Y' here if you want your kernel to support Intel's
49 IXDPG425 Development Platform (Also known as Montajade). 47 IXDPG425 Development Platform (Also known as Montajade).
@@ -51,7 +49,6 @@ config MACH_IXDPG425
51 49
52config MACH_IXDP465 50config MACH_IXDP465
53 bool "IXDP465" 51 bool "IXDP465"
54 select PCI
55 help 52 help
56 Say 'Y' here if you want your kernel to support Intel's 53 Say 'Y' here if you want your kernel to support Intel's
57 IXDP465 Development Platform (Also known as BMP). 54 IXDP465 Development Platform (Also known as BMP).
diff --git a/arch/arm/mach-ixp4xx/Makefile b/arch/arm/mach-ixp4xx/Makefile
index 5a4aaa0e0a09..640315d8b96a 100644
--- a/arch/arm/mach-ixp4xx/Makefile
+++ b/arch/arm/mach-ixp4xx/Makefile
@@ -2,13 +2,23 @@
2# Makefile for the linux kernel. 2# Makefile for the linux kernel.
3# 3#
4 4
5obj-pci-y :=
6obj-pci-n :=
7
8obj-pci-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o
9obj-pci-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o
10obj-pci-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o
11obj-pci-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o
12obj-pci-$(CONFIG_MACH_NSLU2) += nslu2-pci.o
13obj-pci-$(CONFIG_MACH_NAS100D) += nas100d-pci.o
14
5obj-y += common.o 15obj-y += common.o
6 16
7obj-$(CONFIG_PCI) += common-pci.o 17obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-setup.o
8obj-$(CONFIG_ARCH_IXDP4XX) += ixdp425-pci.o ixdp425-setup.o 18obj-$(CONFIG_MACH_IXDPG425) += coyote-setup.o
9obj-$(CONFIG_MACH_IXDPG425) += ixdpg425-pci.o coyote-setup.o 19obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-setup.o
10obj-$(CONFIG_ARCH_ADI_COYOTE) += coyote-pci.o coyote-setup.o 20obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-setup.o
11obj-$(CONFIG_MACH_GTWX5715) += gtwx5715-pci.o gtwx5715-setup.o 21obj-$(CONFIG_MACH_NSLU2) += nslu2-setup.o nslu2-power.o
12obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o 22obj-$(CONFIG_MACH_NAS100D) += nas100d-setup.o nas100d-power.o
13obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o
14 23
24obj-$(CONFIG_PCI) += $(obj-pci-$(CONFIG_PCI)) common-pci.o
diff --git a/arch/arm/mach-pxa/sleep.S b/arch/arm/mach-pxa/sleep.S
index c9862688ff3d..0650bed3b96e 100644
--- a/arch/arm/mach-pxa/sleep.S
+++ b/arch/arm/mach-pxa/sleep.S
@@ -189,7 +189,7 @@ ENTRY(pxa_cpu_suspend)
189 .data 189 .data
190 .align 5 190 .align 5
191ENTRY(pxa_cpu_resume) 191ENTRY(pxa_cpu_resume)
192 mov r0, #PSR_I_BIT | PSR_F_BIT | MODE_SVC @ set SVC, irqs off 192 mov r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE @ set SVC, irqs off
193 msr cpsr_c, r0 193 msr cpsr_c, r0
194 194
195 ldr r0, sleep_save_sp @ stack phys addr 195 ldr r0, sleep_save_sp @ stack phys addr
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index f5d9cd498a5f..b4171dd43df0 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -71,13 +71,13 @@ config ARCH_S3C2440
71 Say Y here if you are using the SMDK2440. 71 Say Y here if you are using the SMDK2440.
72 72
73config SMDK2440_CPU2440 73config SMDK2440_CPU2440
74 bool "SMDK2440 with S3C2440 cpu module" 74 bool "SMDK2440 with S3C2440 CPU module"
75 depends on ARCH_S3C2440 75 depends on ARCH_S3C2440
76 default y if ARCH_S3C2440 76 default y if ARCH_S3C2440
77 select CPU_S3C2440 77 select CPU_S3C2440
78 78
79config SMDK2440_CPU2442 79config SMDK2440_CPU2442
80 bool "SMDM2440 with S3C2442 cpu module" 80 bool "SMDM2440 with S3C2442 CPU module"
81 depends on ARCH_S3C2440 81 depends on ARCH_S3C2440
82 select CPU_S3C2442 82 select CPU_S3C2442
83 83
diff --git a/arch/arm/mach-s3c2410/sleep.S b/arch/arm/mach-s3c2410/sleep.S
index 5f6761ed96b2..dc27167f4d59 100644
--- a/arch/arm/mach-s3c2410/sleep.S
+++ b/arch/arm/mach-s3c2410/sleep.S
@@ -128,7 +128,7 @@ s3c2410_sleep_save_phys:
128 */ 128 */
129 129
130ENTRY(s3c2410_cpu_resume) 130ENTRY(s3c2410_cpu_resume)
131 mov r0, #PSR_I_BIT | PSR_F_BIT | MODE_SVC 131 mov r0, #PSR_I_BIT | PSR_F_BIT | SVC_MODE
132 msr cpsr_c, r0 132 msr cpsr_c, r0
133 133
134 @@ load UART to allow us to print the two characters for 134 @@ load UART to allow us to print the two characters for
diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S
index 2fa1e289d177..5a84062f92af 100644
--- a/arch/arm/mach-sa1100/sleep.S
+++ b/arch/arm/mach-sa1100/sleep.S
@@ -177,7 +177,7 @@ sa1110_sdram_controller_fix:
177 .data 177 .data
178 .align 5 178 .align 5
179ENTRY(sa1100_cpu_resume) 179ENTRY(sa1100_cpu_resume)
180 mov r0, #PSR_F_BIT | PSR_I_BIT | MODE_SVC 180 mov r0, #PSR_F_BIT | PSR_I_BIT | SVC_MODE
181 msr cpsr_c, r0 @ set SVC, irqs off 181 msr cpsr_c, r0 @ set SVC, irqs off
182 182
183 ldr r0, sleep_save_sp @ stack phys addr 183 ldr r0, sleep_save_sp @ stack phys addr
diff --git a/arch/arm/mm/copypage-v3.S b/arch/arm/mm/copypage-v3.S
index 3c58ebbf0359..2ee394b11bcb 100644
--- a/arch/arm/mm/copypage-v3.S
+++ b/arch/arm/mm/copypage-v3.S
@@ -35,7 +35,7 @@ ENTRY(v3_copy_user_page)
35 stmia r0!, {r3, r4, ip, lr} @ 4 35 stmia r0!, {r3, r4, ip, lr} @ 4
36 ldmneia r1!, {r3, r4, ip, lr} @ 4 36 ldmneia r1!, {r3, r4, ip, lr} @ 4
37 bne 1b @ 1 37 bne 1b @ 1
38 LOADREGS(fd, sp!, {r4, pc}) @ 3 38 ldmfd sp!, {r4, pc} @ 3
39 39
40 .align 5 40 .align 5
41/* 41/*
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index ee6f15298735..09b1a41a6de8 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -29,38 +29,6 @@
29#define TTB_RGN_WT (2 << 3) 29#define TTB_RGN_WT (2 << 3)
30#define TTB_RGN_WB (3 << 3) 30#define TTB_RGN_WB (3 << 3)
31 31
32 .macro cpsie, flags
33 .ifc \flags, f
34 .long 0xf1080040
35 .exitm
36 .endif
37 .ifc \flags, i
38 .long 0xf1080080
39 .exitm
40 .endif
41 .ifc \flags, if
42 .long 0xf10800c0
43 .exitm
44 .endif
45 .err
46 .endm
47
48 .macro cpsid, flags
49 .ifc \flags, f
50 .long 0xf10c0040
51 .exitm
52 .endif
53 .ifc \flags, i
54 .long 0xf10c0080
55 .exitm
56 .endif
57 .ifc \flags, if
58 .long 0xf10c00c0
59 .exitm
60 .endif
61 .err
62 .endm
63
64ENTRY(cpu_v6_proc_init) 32ENTRY(cpu_v6_proc_init)
65 mov pc, lr 33 mov pc, lr
66 34
diff --git a/arch/arm/nwfpe/entry26.S b/arch/arm/nwfpe/entry26.S
index 51940a96d6a6..3e6fb5d21d64 100644
--- a/arch/arm/nwfpe/entry26.S
+++ b/arch/arm/nwfpe/entry26.S
@@ -26,7 +26,7 @@
26It is called from the kernel with code similar to this: 26It is called from the kernel with code similar to this:
27 27
28 mov fp, #0 28 mov fp, #0
29 teqp pc, #PSR_I_BIT | MODE_SVC 29 teqp pc, #PSR_I_BIT | SVC_MODE
30 ldr r4, .LC2 30 ldr r4, .LC2
31 ldr pc, [r4] @ Call FP module USR entry point 31 ldr pc, [r4] @ Call FP module USR entry point
32 32
diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index 6d7de9c0412f..e1372a25311d 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
12# 12#
13# http://www.arm.linux.org.uk/developer/machines/?action=new 13# http://www.arm.linux.org.uk/developer/machines/?action=new
14# 14#
15# Last update: Mon May 8 20:11:05 2006 15# Last update: Mon Jun 26 22:26:08 2006
16# 16#
17# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number 17# machine_is_xxx CONFIG_xxxx MACH_TYPE_xxx number
18# 18#
@@ -566,8 +566,8 @@ switchgrass MACH_SWITCHGRASS SWITCHGRASS 549
566ens_cmu MACH_ENS_CMU ENS_CMU 550 566ens_cmu MACH_ENS_CMU ENS_CMU 550
567mm6_sdb MACH_MM6_SDB MM6_SDB 551 567mm6_sdb MACH_MM6_SDB MM6_SDB 551
568saturn MACH_SATURN SATURN 552 568saturn MACH_SATURN SATURN 552
569i30030evb MACH_ARGONPLUSEVB ARGONPLUSEVB 553 569i30030evb MACH_I30030EVB I30030EVB 553
570mxc27530evb MACH_SCMA11EVB SCMA11EVB 554 570mxc27530evb MACH_MXC27530EVB MXC27530EVB 554
571smdk2800 MACH_SMDK2800 SMDK2800 555 571smdk2800 MACH_SMDK2800 SMDK2800 555
572mtwilson MACH_MTWILSON MTWILSON 556 572mtwilson MACH_MTWILSON MTWILSON 556
573ziti MACH_ZITI ZITI 557 573ziti MACH_ZITI ZITI 557
@@ -647,7 +647,7 @@ sendt MACH_SENDT SENDT 630
647mx2jazz MACH_MX2JAZZ MX2JAZZ 631 647mx2jazz MACH_MX2JAZZ MX2JAZZ 631
648multiio MACH_MULTIIO MULTIIO 632 648multiio MACH_MULTIIO MULTIIO 632
649hrdisplay MACH_HRDISPLAY HRDISPLAY 633 649hrdisplay MACH_HRDISPLAY HRDISPLAY 633
650mxc27530ads MACH_SCMA11BB SCMA11BB 634 650mxc27530ads MACH_MXC27530ADS MXC27530ADS 634
651trizeps3 MACH_TRIZEPS3 TRIZEPS3 635 651trizeps3 MACH_TRIZEPS3 TRIZEPS3 635
652zefeerdza MACH_ZEFEERDZA ZEFEERDZA 636 652zefeerdza MACH_ZEFEERDZA ZEFEERDZA 636
653zefeerdzb MACH_ZEFEERDZB ZEFEERDZB 637 653zefeerdzb MACH_ZEFEERDZB ZEFEERDZB 637
@@ -721,7 +721,7 @@ gp32 MACH_GP32 GP32 706
721gem MACH_GEM GEM 707 721gem MACH_GEM GEM 707
722i858 MACH_I858 I858 708 722i858 MACH_I858 I858 708
723hx2750 MACH_HX2750 HX2750 709 723hx2750 MACH_HX2750 HX2750 709
724mxc91131evb MACH_ZEUSEVB ZEUSEVB 710 724mxc91131evb MACH_MXC91131EVB MXC91131EVB 710
725p700 MACH_P700 P700 711 725p700 MACH_P700 P700 711
726cpe MACH_CPE CPE 712 726cpe MACH_CPE CPE 712
727spitz MACH_SPITZ SPITZ 713 727spitz MACH_SPITZ SPITZ 713
@@ -802,7 +802,7 @@ cpuat91 MACH_CPUAT91 CPUAT91 787
802rea9200 MACH_REA9200 REA9200 788 802rea9200 MACH_REA9200 REA9200 788
803acts_pune_sa1110 MACH_ACTS_PUNE_SA1110 ACTS_PUNE_SA1110 789 803acts_pune_sa1110 MACH_ACTS_PUNE_SA1110 ACTS_PUNE_SA1110 789
804ixp425 MACH_IXP425 IXP425 790 804ixp425 MACH_IXP425 IXP425 790
805i30030ads MACH_ARGONPLUSODYSSEY ARGONPLUSODYSSEY 791 805i30030ads MACH_I30030ADS I30030ADS 791
806perch MACH_PERCH PERCH 792 806perch MACH_PERCH PERCH 792
807eis05r1 MACH_EIS05R1 EIS05R1 793 807eis05r1 MACH_EIS05R1 EIS05R1 793
808pepperpad MACH_PEPPERPAD PEPPERPAD 794 808pepperpad MACH_PEPPERPAD PEPPERPAD 794
@@ -930,7 +930,7 @@ netclient MACH_NETCLIENT NETCLIENT 916
930xscale_palmtt5 MACH_XSCALE_PALMTT5 XSCALE_PALMTT5 917 930xscale_palmtt5 MACH_XSCALE_PALMTT5 XSCALE_PALMTT5 917
931xscale_palmtc MACH_OMAP_PALMTC OMAP_PALMTC 918 931xscale_palmtc MACH_OMAP_PALMTC OMAP_PALMTC 918
932omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919 932omap_apollon MACH_OMAP_APOLLON OMAP_APOLLON 919
933mxc30030evb MACH_ARGONLVEVB ARGONLVEVB 920 933mxc30030evb MACH_MXC30030EVB MXC30030EVB 920
934rea_2d MACH_REA_2D REA_2D 921 934rea_2d MACH_REA_2D REA_2D 921
935eti3e524 MACH_TI3E524 TI3E524 922 935eti3e524 MACH_TI3E524 TI3E524 922
936ateb9200 MACH_ATEB9200 ATEB9200 923 936ateb9200 MACH_ATEB9200 ATEB9200 923
@@ -986,7 +986,7 @@ redfox MACH_REDFOX REDFOX 972
986mysh_ep9315_1 MACH_MYSH_EP9315_1 MYSH_EP9315_1 973 986mysh_ep9315_1 MACH_MYSH_EP9315_1 MYSH_EP9315_1 973
987tpf106 MACH_TPF106 TPF106 974 987tpf106 MACH_TPF106 TPF106 974
988at91rm9200kg MACH_AT91RM9200KG AT91RM9200KG 975 988at91rm9200kg MACH_AT91RM9200KG AT91RM9200KG 975
989racemt2 MACH_SLEDB SLEDB 976 989rcmt2 MACH_SLEDB SLEDB 976
990ontrack MACH_ONTRACK ONTRACK 977 990ontrack MACH_ONTRACK ONTRACK 977
991pm1200 MACH_PM1200 PM1200 978 991pm1200 MACH_PM1200 PM1200 978
992ess24562 MACH_ESS24XXX ESS24XXX 979 992ess24562 MACH_ESS24XXX ESS24XXX 979
@@ -1022,7 +1022,7 @@ smdk2440 MACH_SMDK2440 SMDK2440 1008
1022smdk2412 MACH_SMDK2412 SMDK2412 1009 1022smdk2412 MACH_SMDK2412 SMDK2412 1009
1023webbox MACH_WEBBOX WEBBOX 1010 1023webbox MACH_WEBBOX WEBBOX 1010
1024cwwndp MACH_CWWNDP CWWNDP 1011 1024cwwndp MACH_CWWNDP CWWNDP 1011
1025dragon MACH_DRAGON DRAGON 1012 1025i839 MACH_DRAGON DRAGON 1012
1026opendo_cpu_board MACH_OPENDO_CPU_BOARD OPENDO_CPU_BOARD 1013 1026opendo_cpu_board MACH_OPENDO_CPU_BOARD OPENDO_CPU_BOARD 1013
1027ccm2200 MACH_CCM2200 CCM2200 1014 1027ccm2200 MACH_CCM2200 CCM2200 1014
1028etwarm MACH_ETWARM ETWARM 1015 1028etwarm MACH_ETWARM ETWARM 1015
@@ -1040,3 +1040,56 @@ edg79524 MACH_EDG79524 EDG79524 1026
1040ai2410 MACH_AI2410 AI2410 1027 1040ai2410 MACH_AI2410 AI2410 1027
1041ixp465 MACH_IXP465 IXP465 1028 1041ixp465 MACH_IXP465 IXP465 1028
1042balloon3 MACH_BALLOON3 BALLOON3 1029 1042balloon3 MACH_BALLOON3 BALLOON3 1029
1043heins MACH_HEINS HEINS 1030
1044mpluseva MACH_MPLUSEVA MPLUSEVA 1031
1045rt042 MACH_RT042 RT042 1032
1046cwiem MACH_CWIEM CWIEM 1033
1047cm_x270 MACH_CM_X270 CM_X270 1034
1048cm_x255 MACH_CM_X255 CM_X255 1035
1049esh_at91 MACH_ESH_AT91 ESH_AT91 1036
1050sandgate3 MACH_SANDGATE3 SANDGATE3 1037
1051primo MACH_PRIMO PRIMO 1038
1052gemstone MACH_GEMSTONE GEMSTONE 1039
1053pronghorn_metro MACH_PRONGHORNMETRO PRONGHORNMETRO 1040
1054sidewinder MACH_SIDEWINDER SIDEWINDER 1041
1055picomod1 MACH_PICOMOD1 PICOMOD1 1042
1056sg590 MACH_SG590 SG590 1043
1057akai9307 MACH_AKAI9307 AKAI9307 1044
1058fontaine MACH_FONTAINE FONTAINE 1045
1059wombat MACH_WOMBAT WOMBAT 1046
1060acq300 MACH_ACQ300 ACQ300 1047
1061mod_270 MACH_MOD_270 MOD_270 1048
1062vmc_vc0820 MACH_VC0820 VC0820 1049
1063ani_aim MACH_ANI_AIM ANI_AIM 1050
1064jellyfish MACH_JELLYFISH JELLYFISH 1051
1065amanita MACH_AMANITA AMANITA 1052
1066vlink MACH_VLINK VLINK 1053
1067dexflex MACH_DEXFLEX DEXFLEX 1054
1068eigen_ttq MACH_EIGEN_TTQ EIGEN_TTQ 1055
1069arcom_titan MACH_ARCOM_TITAN ARCOM_TITAN 1056
1070tabla MACH_TABLA TABLA 1057
1071mdirac3 MACH_MDIRAC3 MDIRAC3 1058
1072mrhfbp2 MACH_MRHFBP2 MRHFBP2 1059
1073at91rm9200rb MACH_AT91RM9200RB AT91RM9200RB 1060
1074ani_apm MACH_ANI_APM ANI_APM 1061
1075ella1 MACH_ELLA1 ELLA1 1062
1076inhand_pxa27x MACH_INHAND_PXA27X INHAND_PXA27X 1063
1077inhand_pxa25x MACH_INHAND_PXA25X INHAND_PXA25X 1064
1078empos_xm MACH_EMPOS_XM EMPOS_XM 1065
1079empos MACH_EMPOS EMPOS 1066
1080empos_tiny MACH_EMPOS_TINY EMPOS_TINY 1067
1081empos_sm MACH_EMPOS_SM EMPOS_SM 1068
1082egret MACH_EGRET EGRET 1069
1083ostrich MACH_OSTRICH OSTRICH 1070
1084n50 MACH_N50 N50 1071
1085ecbat91 MACH_ECBAT91 ECBAT91 1072
1086stareast MACH_STAREAST STAREAST 1073
1087dspg_dw MACH_DSPG_DW DSPG_DW 1074
1088onearm MACH_ONEARM ONEARM 1075
1089mrg110_6 MACH_MRG110_6 MRG110_6 1076
1090wrt300nv2 MACH_WRT300NV2 WRT300NV2 1077
1091xm_bulverde MACH_XM_BULVERDE XM_BULVERDE 1078
1092msm6100 MACH_MSM6100 MSM6100 1079
1093eti_b1 MACH_ETI_B1 ETI_B1 1080
1094za9l_series MACH_ZILOG_ZA9L ZILOG_ZA9L 1081
1095bit2440 MACH_BIT2440 BIT2440 1082
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-20 06:11:43 -0500