16ab784881adb0fd8e1df34234f98bae6d78f679
[openwrt/svn-archive/archive.git] / target / linux / at91 / patches-2.6.22 / 000-at91.patch
1 diff -urN linux-2.6.22-rc5/arch/arm/boot/compressed/head-at91rm9200.S linux-2.6.22-rc5.new/arch/arm/boot/compressed/head-at91rm9200.S
2 --- linux-2.6.22-rc5/arch/arm/boot/compressed/head-at91rm9200.S 2007-06-17 04:09:12.000000000 +0200
3 +++ linux-2.6.22-rc5.new/arch/arm/boot/compressed/head-at91rm9200.S 2007-07-29 05:23:04.000000000 +0200
4 @@ -73,6 +73,12 @@
5 cmp r7, r3
6 beq 99f
7
8 + @ Promwad Chub : 1181
9 + mov r3, #(MACH_TYPE_CHUB & 0xff)
10 + orr r3, r3, #(MACH_TYPE_CHUB & 0xff00)
11 + cmp r7, r3
12 + beq 99f
13 +
14 @ Unknown board, use the AT91RM9200DK board
15 @ mov r7, #MACH_TYPE_AT91RM9200
16 mov r7, #(MACH_TYPE_AT91RM9200DK & 0xff)
17 diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9260ek_defconfig
18 --- linux-2.6.22-rc5/arch/arm/configs/at91sam9260ek_defconfig 2007-06-17 04:09:12.000000000 +0200
19 +++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9260ek_defconfig 2007-07-29 05:23:04.000000000 +0200
20 @@ -1,18 +1,24 @@
21 #
22 # Automatically generated make config: don't edit
23 -# Linux kernel version: 2.6.19-rc6
24 -# Fri Nov 17 18:42:21 2006
25 +# Linux kernel version: 2.6.21
26 +# Mon May 7 11:42:02 2007
27 #
28 CONFIG_ARM=y
29 +CONFIG_SYS_SUPPORTS_APM_EMULATION=y
30 +CONFIG_GENERIC_GPIO=y
31 # CONFIG_GENERIC_TIME is not set
32 CONFIG_MMU=y
33 +# CONFIG_NO_IOPORT is not set
34 CONFIG_GENERIC_HARDIRQS=y
35 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
36 CONFIG_HARDIRQS_SW_RESEND=y
37 CONFIG_GENERIC_IRQ_PROBE=y
38 CONFIG_RWSEM_GENERIC_SPINLOCK=y
39 +# CONFIG_ARCH_HAS_ILOG2_U32 is not set
40 +# CONFIG_ARCH_HAS_ILOG2_U64 is not set
41 CONFIG_GENERIC_HWEIGHT=y
42 CONFIG_GENERIC_CALIBRATE_DELAY=y
43 +CONFIG_ZONE_DMA=y
44 CONFIG_VECTORS_BASE=0xffff0000
45 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
46
47 @@ -31,13 +37,16 @@
48 # CONFIG_SWAP is not set
49 CONFIG_SYSVIPC=y
50 # CONFIG_IPC_NS is not set
51 +CONFIG_SYSVIPC_SYSCTL=y
52 # CONFIG_POSIX_MQUEUE is not set
53 # CONFIG_BSD_PROCESS_ACCT is not set
54 # CONFIG_TASKSTATS is not set
55 # CONFIG_UTS_NS is not set
56 # CONFIG_AUDIT is not set
57 # CONFIG_IKCONFIG is not set
58 +CONFIG_SYSFS_DEPRECATED=y
59 # CONFIG_RELAY is not set
60 +CONFIG_BLK_DEV_INITRD=y
61 CONFIG_INITRAMFS_SOURCE=""
62 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
63 CONFIG_SYSCTL=y
64 @@ -76,7 +85,9 @@
65 # Block layer
66 #
67 CONFIG_BLOCK=y
68 +# CONFIG_LBD is not set
69 # CONFIG_BLK_DEV_IO_TRACE is not set
70 +# CONFIG_LSF is not set
71
72 #
73 # IO Schedulers
74 @@ -110,10 +121,12 @@
75 # CONFIG_ARCH_IMX is not set
76 # CONFIG_ARCH_IOP32X is not set
77 # CONFIG_ARCH_IOP33X is not set
78 +# CONFIG_ARCH_IOP13XX is not set
79 # CONFIG_ARCH_IXP4XX is not set
80 # CONFIG_ARCH_IXP2000 is not set
81 # CONFIG_ARCH_IXP23XX is not set
82 # CONFIG_ARCH_L7200 is not set
83 +# CONFIG_ARCH_NS9XXX is not set
84 # CONFIG_ARCH_PNX4008 is not set
85 # CONFIG_ARCH_PXA is not set
86 # CONFIG_ARCH_RPC is not set
87 @@ -129,21 +142,29 @@
88 # CONFIG_ARCH_AT91RM9200 is not set
89 CONFIG_ARCH_AT91SAM9260=y
90 # CONFIG_ARCH_AT91SAM9261 is not set
91 +# CONFIG_ARCH_AT91SAM9263 is not set
92 +
93 +#
94 +# AT91SAM9260 Variants
95 +#
96 +# CONFIG_ARCH_AT91SAM9260_SAM9XE is not set
97
98 #
99 -# AT91SAM9260 Board Type
100 +# AT91SAM9260 / AT91SAM9XE Board Type
101 #
102 CONFIG_MACH_AT91SAM9260EK=y
103
104 #
105 # AT91 Board Options
106 #
107 +# CONFIG_MTD_AT91_DATAFLASH_CARD is not set
108 # CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set
109
110 #
111 # AT91 Feature Selections
112 #
113 # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
114 +# CONFIG_ATMEL_TCLIB is not set
115
116 #
117 # Processor Type
118 @@ -166,6 +187,7 @@
119 # CONFIG_CPU_DCACHE_DISABLE is not set
120 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
121 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
122 +# CONFIG_OUTER_CACHE is not set
123
124 #
125 # Bus support
126 @@ -193,6 +215,7 @@
127 # CONFIG_SPARSEMEM_STATIC is not set
128 CONFIG_SPLIT_PTLOCK_CPUS=4096
129 # CONFIG_RESOURCES_64BIT is not set
130 +CONFIG_ZONE_DMA_FLAG=1
131 # CONFIG_LEDS is not set
132 CONFIG_ALIGNMENT_TRAP=y
133
134 @@ -203,6 +226,7 @@
135 CONFIG_ZBOOT_ROM_BSS=0x0
136 CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
137 # CONFIG_XIP_KERNEL is not set
138 +# CONFIG_KEXEC is not set
139
140 #
141 # Floating point emulation
142 @@ -228,7 +252,6 @@
143 # Power management options
144 #
145 # CONFIG_PM is not set
146 -# CONFIG_APM is not set
147
148 #
149 # Networking
150 @@ -242,9 +265,6 @@
151 CONFIG_PACKET=y
152 # CONFIG_PACKET_MMAP is not set
153 CONFIG_UNIX=y
154 -CONFIG_XFRM=y
155 -# CONFIG_XFRM_USER is not set
156 -# CONFIG_XFRM_SUB_POLICY is not set
157 # CONFIG_NET_KEY is not set
158 CONFIG_INET=y
159 # CONFIG_IP_MULTICAST is not set
160 @@ -263,14 +283,15 @@
161 # CONFIG_INET_IPCOMP is not set
162 # CONFIG_INET_XFRM_TUNNEL is not set
163 # CONFIG_INET_TUNNEL is not set
164 -CONFIG_INET_XFRM_MODE_TRANSPORT=y
165 -CONFIG_INET_XFRM_MODE_TUNNEL=y
166 -CONFIG_INET_XFRM_MODE_BEET=y
167 +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
168 +# CONFIG_INET_XFRM_MODE_TUNNEL is not set
169 +# CONFIG_INET_XFRM_MODE_BEET is not set
170 CONFIG_INET_DIAG=y
171 CONFIG_INET_TCP_DIAG=y
172 # CONFIG_TCP_CONG_ADVANCED is not set
173 CONFIG_TCP_CONG_CUBIC=y
174 CONFIG_DEFAULT_TCP_CONG="cubic"
175 +# CONFIG_TCP_MD5SIG is not set
176 # CONFIG_IPV6 is not set
177 # CONFIG_INET6_XFRM_TUNNEL is not set
178 # CONFIG_INET6_TUNNEL is not set
179 @@ -328,6 +349,7 @@
180 CONFIG_PREVENT_FIRMWARE_BUILD=y
181 # CONFIG_FW_LOADER is not set
182 # CONFIG_DEBUG_DRIVER is not set
183 +# CONFIG_DEBUG_DEVRES is not set
184 # CONFIG_SYS_HYPERVISOR is not set
185
186 #
187 @@ -348,6 +370,7 @@
188 #
189 # Plug and Play support
190 #
191 +# CONFIG_PNPACPI is not set
192
193 #
194 # Block devices
195 @@ -360,7 +383,6 @@
196 CONFIG_BLK_DEV_RAM_COUNT=16
197 CONFIG_BLK_DEV_RAM_SIZE=8192
198 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
199 -CONFIG_BLK_DEV_INITRD=y
200 # CONFIG_CDROM_PKTCDVD is not set
201 # CONFIG_ATA_OVER_ETH is not set
202
203 @@ -369,6 +391,7 @@
204 #
205 # CONFIG_RAID_ATTRS is not set
206 CONFIG_SCSI=y
207 +# CONFIG_SCSI_TGT is not set
208 # CONFIG_SCSI_NETLINK is not set
209 CONFIG_SCSI_PROC_FS=y
210
211 @@ -388,6 +411,7 @@
212 CONFIG_SCSI_MULTI_LUN=y
213 # CONFIG_SCSI_CONSTANTS is not set
214 # CONFIG_SCSI_LOGGING is not set
215 +# CONFIG_SCSI_SCAN_ASYNC is not set
216
217 #
218 # SCSI Transports
219 @@ -405,6 +429,11 @@
220 # CONFIG_SCSI_DEBUG is not set
221
222 #
223 +# Serial ATA (prod) and Parallel ATA (experimental) drivers
224 +#
225 +# CONFIG_ATA is not set
226 +
227 +#
228 # Multi-device support (RAID and LVM)
229 #
230 # CONFIG_MD is not set
231 @@ -425,7 +454,51 @@
232 #
233 # Network device support
234 #
235 -# CONFIG_NETDEVICES is not set
236 +CONFIG_NETDEVICES=y
237 +# CONFIG_DUMMY is not set
238 +# CONFIG_BONDING is not set
239 +# CONFIG_EQUALIZER is not set
240 +# CONFIG_TUN is not set
241 +
242 +#
243 +# PHY device support
244 +#
245 +# CONFIG_PHYLIB is not set
246 +
247 +#
248 +# Ethernet (10 or 100Mbit)
249 +#
250 +CONFIG_NET_ETHERNET=y
251 +CONFIG_MII=y
252 +CONFIG_MACB=y
253 +# CONFIG_SMC91X is not set
254 +# CONFIG_DM9000 is not set
255 +
256 +#
257 +# Ethernet (1000 Mbit)
258 +#
259 +
260 +#
261 +# Ethernet (10000 Mbit)
262 +#
263 +
264 +#
265 +# Token Ring devices
266 +#
267 +
268 +#
269 +# Wireless LAN (non-hamradio)
270 +#
271 +# CONFIG_NET_RADIO is not set
272 +
273 +#
274 +# Wan interfaces
275 +#
276 +# CONFIG_WAN is not set
277 +# CONFIG_PPP is not set
278 +# CONFIG_SLIP is not set
279 +# CONFIG_SHAPER is not set
280 +# CONFIG_NETCONSOLE is not set
281 # CONFIG_NETPOLL is not set
282 # CONFIG_NET_POLL_CONTROLLER is not set
283
284 @@ -517,10 +590,6 @@
285 # CONFIG_NVRAM is not set
286 # CONFIG_DTLK is not set
287 # CONFIG_R3964 is not set
288 -
289 -#
290 -# Ftape, the floppy tape device driver
291 -#
292 # CONFIG_RAW_DRIVER is not set
293
294 #
295 @@ -553,7 +622,11 @@
296 #
297 # Misc devices
298 #
299 -# CONFIG_TIFM_CORE is not set
300 +
301 +#
302 +# Multifunction device drivers
303 +#
304 +# CONFIG_MFD_SM501 is not set
305
306 #
307 # LED devices
308 @@ -582,7 +655,7 @@
309 #
310 # Graphics support
311 #
312 -# CONFIG_FIRMWARE_EDID is not set
313 +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
314 # CONFIG_FB is not set
315
316 #
317 @@ -590,7 +663,6 @@
318 #
319 # CONFIG_VGA_CONSOLE is not set
320 CONFIG_DUMMY_CONSOLE=y
321 -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
322
323 #
324 # Sound
325 @@ -598,6 +670,12 @@
326 # CONFIG_SOUND is not set
327
328 #
329 +# HID Devices
330 +#
331 +CONFIG_HID=y
332 +# CONFIG_HID_DEBUG is not set
333 +
334 +#
335 # USB support
336 #
337 CONFIG_USB_ARCH_HAS_HCD=y
338 @@ -610,7 +688,6 @@
339 # Miscellaneous USB options
340 #
341 CONFIG_USB_DEVICEFS=y
342 -# CONFIG_USB_BANDWIDTH is not set
343 # CONFIG_USB_DYNAMIC_MINORS is not set
344 # CONFIG_USB_OTG is not set
345
346 @@ -619,7 +696,8 @@
347 #
348 # CONFIG_USB_ISP116X_HCD is not set
349 CONFIG_USB_OHCI_HCD=y
350 -# CONFIG_USB_OHCI_BIG_ENDIAN is not set
351 +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
352 +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
353 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
354 # CONFIG_USB_SL811_HCD is not set
355
356 @@ -671,6 +749,7 @@
357 # CONFIG_USB_ATI_REMOTE2 is not set
358 # CONFIG_USB_KEYSPAN_REMOTE is not set
359 # CONFIG_USB_APPLETOUCH is not set
360 +# CONFIG_USB_GTCO is not set
361
362 #
363 # USB Imaging devices
364 @@ -708,6 +787,7 @@
365 # CONFIG_USB_RIO500 is not set
366 # CONFIG_USB_LEGOTOWER is not set
367 # CONFIG_USB_LCD is not set
368 +# CONFIG_USB_BERRY_CHARGE is not set
369 # CONFIG_USB_LED is not set
370 # CONFIG_USB_CYPRESS_CY7C63 is not set
371 # CONFIG_USB_CYTHERM is not set
372 @@ -717,6 +797,7 @@
373 # CONFIG_USB_APPLEDISPLAY is not set
374 # CONFIG_USB_LD is not set
375 # CONFIG_USB_TRANCEVIBRATOR is not set
376 +# CONFIG_USB_IOWARRIOR is not set
377 # CONFIG_USB_TEST is not set
378
379 #
380 @@ -889,6 +970,11 @@
381 # CONFIG_NLS_UTF8 is not set
382
383 #
384 +# Distributed Lock Manager
385 +#
386 +# CONFIG_DLM is not set
387 +
388 +#
389 # Profiling support
390 #
391 # CONFIG_PROFILING is not set
392 @@ -900,28 +986,30 @@
393 CONFIG_ENABLE_MUST_CHECK=y
394 # CONFIG_MAGIC_SYSRQ is not set
395 # CONFIG_UNUSED_SYMBOLS is not set
396 +# CONFIG_DEBUG_FS is not set
397 +# CONFIG_HEADERS_CHECK is not set
398 CONFIG_DEBUG_KERNEL=y
399 +# CONFIG_DEBUG_SHIRQ is not set
400 CONFIG_LOG_BUF_SHIFT=14
401 CONFIG_DETECT_SOFTLOCKUP=y
402 # CONFIG_SCHEDSTATS is not set
403 +# CONFIG_TIMER_STATS is not set
404 # CONFIG_DEBUG_SLAB is not set
405 # CONFIG_DEBUG_RT_MUTEXES is not set
406 # CONFIG_RT_MUTEX_TESTER is not set
407 # CONFIG_DEBUG_SPINLOCK is not set
408 # CONFIG_DEBUG_MUTEXES is not set
409 -# CONFIG_DEBUG_RWSEMS is not set
410 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
411 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
412 # CONFIG_DEBUG_KOBJECT is not set
413 CONFIG_DEBUG_BUGVERBOSE=y
414 # CONFIG_DEBUG_INFO is not set
415 -# CONFIG_DEBUG_FS is not set
416 # CONFIG_DEBUG_VM is not set
417 # CONFIG_DEBUG_LIST is not set
418 CONFIG_FRAME_POINTER=y
419 CONFIG_FORCED_INLINING=y
420 -# CONFIG_HEADERS_CHECK is not set
421 # CONFIG_RCU_TORTURE_TEST is not set
422 +# CONFIG_FAULT_INJECTION is not set
423 CONFIG_DEBUG_USER=y
424 # CONFIG_DEBUG_ERRORS is not set
425 CONFIG_DEBUG_LL=y
426 @@ -941,9 +1029,12 @@
427 #
428 # Library routines
429 #
430 +CONFIG_BITREVERSE=y
431 # CONFIG_CRC_CCITT is not set
432 # CONFIG_CRC16 is not set
433 CONFIG_CRC32=y
434 # CONFIG_LIBCRC32C is not set
435 CONFIG_ZLIB_INFLATE=y
436 CONFIG_PLIST=y
437 +CONFIG_HAS_IOMEM=y
438 +CONFIG_HAS_IOPORT=y
439 diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9261ek_defconfig
440 --- linux-2.6.22-rc5/arch/arm/configs/at91sam9261ek_defconfig 2007-06-17 04:09:12.000000000 +0200
441 +++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9261ek_defconfig 2007-07-29 05:23:04.000000000 +0200
442 @@ -1,18 +1,24 @@
443 #
444 # Automatically generated make config: don't edit
445 -# Linux kernel version: 2.6.19-rc6
446 -# Fri Nov 17 18:00:38 2006
447 +# Linux kernel version: 2.6.21
448 +# Mon May 7 11:42:30 2007
449 #
450 CONFIG_ARM=y
451 +CONFIG_SYS_SUPPORTS_APM_EMULATION=y
452 +CONFIG_GENERIC_GPIO=y
453 # CONFIG_GENERIC_TIME is not set
454 CONFIG_MMU=y
455 +# CONFIG_NO_IOPORT is not set
456 CONFIG_GENERIC_HARDIRQS=y
457 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
458 CONFIG_HARDIRQS_SW_RESEND=y
459 CONFIG_GENERIC_IRQ_PROBE=y
460 CONFIG_RWSEM_GENERIC_SPINLOCK=y
461 +# CONFIG_ARCH_HAS_ILOG2_U32 is not set
462 +# CONFIG_ARCH_HAS_ILOG2_U64 is not set
463 CONFIG_GENERIC_HWEIGHT=y
464 CONFIG_GENERIC_CALIBRATE_DELAY=y
465 +CONFIG_ZONE_DMA=y
466 CONFIG_VECTORS_BASE=0xffff0000
467 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
468
469 @@ -31,13 +37,16 @@
470 # CONFIG_SWAP is not set
471 CONFIG_SYSVIPC=y
472 # CONFIG_IPC_NS is not set
473 +CONFIG_SYSVIPC_SYSCTL=y
474 # CONFIG_POSIX_MQUEUE is not set
475 # CONFIG_BSD_PROCESS_ACCT is not set
476 # CONFIG_TASKSTATS is not set
477 # CONFIG_UTS_NS is not set
478 # CONFIG_AUDIT is not set
479 # CONFIG_IKCONFIG is not set
480 +CONFIG_SYSFS_DEPRECATED=y
481 # CONFIG_RELAY is not set
482 +CONFIG_BLK_DEV_INITRD=y
483 CONFIG_INITRAMFS_SOURCE=""
484 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
485 CONFIG_SYSCTL=y
486 @@ -76,7 +85,9 @@
487 # Block layer
488 #
489 CONFIG_BLOCK=y
490 +# CONFIG_LBD is not set
491 # CONFIG_BLK_DEV_IO_TRACE is not set
492 +# CONFIG_LSF is not set
493
494 #
495 # IO Schedulers
496 @@ -110,10 +121,12 @@
497 # CONFIG_ARCH_IMX is not set
498 # CONFIG_ARCH_IOP32X is not set
499 # CONFIG_ARCH_IOP33X is not set
500 +# CONFIG_ARCH_IOP13XX is not set
501 # CONFIG_ARCH_IXP4XX is not set
502 # CONFIG_ARCH_IXP2000 is not set
503 # CONFIG_ARCH_IXP23XX is not set
504 # CONFIG_ARCH_L7200 is not set
505 +# CONFIG_ARCH_NS9XXX is not set
506 # CONFIG_ARCH_PNX4008 is not set
507 # CONFIG_ARCH_PXA is not set
508 # CONFIG_ARCH_RPC is not set
509 @@ -129,6 +142,7 @@
510 # CONFIG_ARCH_AT91RM9200 is not set
511 # CONFIG_ARCH_AT91SAM9260 is not set
512 CONFIG_ARCH_AT91SAM9261=y
513 +# CONFIG_ARCH_AT91SAM9263 is not set
514
515 #
516 # AT91SAM9261 Board Type
517 @@ -138,12 +152,14 @@
518 #
519 # AT91 Board Options
520 #
521 +# CONFIG_MTD_AT91_DATAFLASH_CARD is not set
522 # CONFIG_MTD_NAND_AT91_BUSWIDTH_16 is not set
523
524 #
525 # AT91 Feature Selections
526 #
527 # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
528 +# CONFIG_ATMEL_TCLIB is not set
529
530 #
531 # Processor Type
532 @@ -166,6 +182,7 @@
533 # CONFIG_CPU_DCACHE_DISABLE is not set
534 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
535 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
536 +# CONFIG_OUTER_CACHE is not set
537
538 #
539 # Bus support
540 @@ -193,6 +210,7 @@
541 # CONFIG_SPARSEMEM_STATIC is not set
542 CONFIG_SPLIT_PTLOCK_CPUS=4096
543 # CONFIG_RESOURCES_64BIT is not set
544 +CONFIG_ZONE_DMA_FLAG=1
545 # CONFIG_LEDS is not set
546 CONFIG_ALIGNMENT_TRAP=y
547
548 @@ -203,6 +221,7 @@
549 CONFIG_ZBOOT_ROM_BSS=0x0
550 CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
551 # CONFIG_XIP_KERNEL is not set
552 +# CONFIG_KEXEC is not set
553
554 #
555 # Floating point emulation
556 @@ -228,7 +247,6 @@
557 # Power management options
558 #
559 # CONFIG_PM is not set
560 -# CONFIG_APM is not set
561
562 #
563 # Networking
564 @@ -245,6 +263,7 @@
565 CONFIG_XFRM=y
566 # CONFIG_XFRM_USER is not set
567 # CONFIG_XFRM_SUB_POLICY is not set
568 +# CONFIG_XFRM_MIGRATE is not set
569 # CONFIG_NET_KEY is not set
570 CONFIG_INET=y
571 # CONFIG_IP_MULTICAST is not set
572 @@ -271,6 +290,7 @@
573 # CONFIG_TCP_CONG_ADVANCED is not set
574 CONFIG_TCP_CONG_CUBIC=y
575 CONFIG_DEFAULT_TCP_CONG="cubic"
576 +# CONFIG_TCP_MD5SIG is not set
577 # CONFIG_IPV6 is not set
578 # CONFIG_INET6_XFRM_TUNNEL is not set
579 # CONFIG_INET6_TUNNEL is not set
580 @@ -328,6 +348,7 @@
581 CONFIG_PREVENT_FIRMWARE_BUILD=y
582 # CONFIG_FW_LOADER is not set
583 # CONFIG_DEBUG_DRIVER is not set
584 +# CONFIG_DEBUG_DEVRES is not set
585 # CONFIG_SYS_HYPERVISOR is not set
586
587 #
588 @@ -350,6 +371,7 @@
589 # User Modules And Translation Layers
590 #
591 # CONFIG_MTD_CHAR is not set
592 +CONFIG_MTD_BLKDEVS=y
593 CONFIG_MTD_BLOCK=y
594 # CONFIG_FTL is not set
595 # CONFIG_NFTL is not set
596 @@ -386,6 +408,8 @@
597 #
598 # Self-contained MTD device drivers
599 #
600 +# CONFIG_MTD_DATAFLASH is not set
601 +# CONFIG_MTD_M25P80 is not set
602 # CONFIG_MTD_SLRAM is not set
603 # CONFIG_MTD_PHRAM is not set
604 # CONFIG_MTD_MTDRAM is not set
605 @@ -422,6 +446,7 @@
606 #
607 # Plug and Play support
608 #
609 +# CONFIG_PNPACPI is not set
610
611 #
612 # Block devices
613 @@ -434,7 +459,6 @@
614 CONFIG_BLK_DEV_RAM_COUNT=16
615 CONFIG_BLK_DEV_RAM_SIZE=8192
616 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
617 -CONFIG_BLK_DEV_INITRD=y
618 # CONFIG_CDROM_PKTCDVD is not set
619 # CONFIG_ATA_OVER_ETH is not set
620
621 @@ -443,6 +467,7 @@
622 #
623 # CONFIG_RAID_ATTRS is not set
624 CONFIG_SCSI=y
625 +# CONFIG_SCSI_TGT is not set
626 # CONFIG_SCSI_NETLINK is not set
627 CONFIG_SCSI_PROC_FS=y
628
629 @@ -462,6 +487,7 @@
630 CONFIG_SCSI_MULTI_LUN=y
631 # CONFIG_SCSI_CONSTANTS is not set
632 # CONFIG_SCSI_LOGGING is not set
633 +# CONFIG_SCSI_SCAN_ASYNC is not set
634
635 #
636 # SCSI Transports
637 @@ -479,6 +505,11 @@
638 # CONFIG_SCSI_DEBUG is not set
639
640 #
641 +# Serial ATA (prod) and Parallel ATA (experimental) drivers
642 +#
643 +# CONFIG_ATA is not set
644 +
645 +#
646 # Multi-device support (RAID and LVM)
647 #
648 # CONFIG_MD is not set
649 @@ -575,7 +606,16 @@
650 # CONFIG_INPUT_KEYBOARD is not set
651 # CONFIG_INPUT_MOUSE is not set
652 # CONFIG_INPUT_JOYSTICK is not set
653 -# CONFIG_INPUT_TOUCHSCREEN is not set
654 +CONFIG_INPUT_TOUCHSCREEN=y
655 +CONFIG_TOUCHSCREEN_ADS7846=y
656 +# CONFIG_TOUCHSCREEN_GUNZE is not set
657 +# CONFIG_TOUCHSCREEN_ELO is not set
658 +# CONFIG_TOUCHSCREEN_MTOUCH is not set
659 +# CONFIG_TOUCHSCREEN_MK712 is not set
660 +# CONFIG_TOUCHSCREEN_PENMOUNT is not set
661 +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
662 +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
663 +# CONFIG_TOUCHSCREEN_UCB1400 is not set
664 # CONFIG_INPUT_MISC is not set
665
666 #
667 @@ -634,10 +674,6 @@
668 # CONFIG_NVRAM is not set
669 # CONFIG_DTLK is not set
670 # CONFIG_R3964 is not set
671 -
672 -#
673 -# Ftape, the floppy tape device driver
674 -#
675 # CONFIG_RAW_DRIVER is not set
676
677 #
678 @@ -662,6 +698,7 @@
679 # I2C Hardware Bus support
680 #
681 CONFIG_I2C_AT91=y
682 +CONFIG_I2C_AT91_CLOCKRATE=100000
683 # CONFIG_I2C_OCORES is not set
684 # CONFIG_I2C_PARPORT_LIGHT is not set
685 # CONFIG_I2C_STUB is not set
686 @@ -686,8 +723,20 @@
687 #
688 # SPI support
689 #
690 -# CONFIG_SPI is not set
691 -# CONFIG_SPI_MASTER is not set
692 +CONFIG_SPI=y
693 +# CONFIG_SPI_DEBUG is not set
694 +CONFIG_SPI_MASTER=y
695 +
696 +#
697 +# SPI Master Controller Drivers
698 +#
699 +CONFIG_SPI_ATMEL=y
700 +# CONFIG_SPI_BITBANG is not set
701 +
702 +#
703 +# SPI Protocol Masters
704 +#
705 +# CONFIG_SPI_AT25 is not set
706
707 #
708 # Dallas's 1-wire bus
709 @@ -703,7 +752,11 @@
710 #
711 # Misc devices
712 #
713 -# CONFIG_TIFM_CORE is not set
714 +
715 +#
716 +# Multifunction device drivers
717 +#
718 +# CONFIG_MFD_SM501 is not set
719
720 #
721 # LED devices
722 @@ -732,7 +785,7 @@
723 #
724 # Graphics support
725 #
726 -# CONFIG_FIRMWARE_EDID is not set
727 +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
728 # CONFIG_FB is not set
729
730 #
731 @@ -740,7 +793,6 @@
732 #
733 # CONFIG_VGA_CONSOLE is not set
734 CONFIG_DUMMY_CONSOLE=y
735 -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
736
737 #
738 # Sound
739 @@ -748,6 +800,12 @@
740 # CONFIG_SOUND is not set
741
742 #
743 +# HID Devices
744 +#
745 +CONFIG_HID=y
746 +# CONFIG_HID_DEBUG is not set
747 +
748 +#
749 # USB support
750 #
751 CONFIG_USB_ARCH_HAS_HCD=y
752 @@ -760,7 +818,6 @@
753 # Miscellaneous USB options
754 #
755 CONFIG_USB_DEVICEFS=y
756 -# CONFIG_USB_BANDWIDTH is not set
757 # CONFIG_USB_DYNAMIC_MINORS is not set
758 # CONFIG_USB_OTG is not set
759
760 @@ -769,7 +826,8 @@
761 #
762 # CONFIG_USB_ISP116X_HCD is not set
763 CONFIG_USB_OHCI_HCD=y
764 -# CONFIG_USB_OHCI_BIG_ENDIAN is not set
765 +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
766 +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
767 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
768 # CONFIG_USB_SL811_HCD is not set
769
770 @@ -821,6 +879,7 @@
771 # CONFIG_USB_ATI_REMOTE2 is not set
772 # CONFIG_USB_KEYSPAN_REMOTE is not set
773 # CONFIG_USB_APPLETOUCH is not set
774 +# CONFIG_USB_GTCO is not set
775
776 #
777 # USB Imaging devices
778 @@ -858,6 +917,7 @@
779 # CONFIG_USB_RIO500 is not set
780 # CONFIG_USB_LEGOTOWER is not set
781 # CONFIG_USB_LCD is not set
782 +# CONFIG_USB_BERRY_CHARGE is not set
783 # CONFIG_USB_LED is not set
784 # CONFIG_USB_CYPRESS_CY7C63 is not set
785 # CONFIG_USB_CYTHERM is not set
786 @@ -867,6 +927,7 @@
787 # CONFIG_USB_APPLEDISPLAY is not set
788 # CONFIG_USB_LD is not set
789 # CONFIG_USB_TRANCEVIBRATOR is not set
790 +# CONFIG_USB_IOWARRIOR is not set
791 # CONFIG_USB_TEST is not set
792
793 #
794 @@ -903,7 +964,6 @@
795 # CONFIG_MMC_DEBUG is not set
796 CONFIG_MMC_BLOCK=y
797 CONFIG_MMC_AT91=m
798 -# CONFIG_MMC_TIFM_SD is not set
799
800 #
801 # Real Time Clock
802 @@ -973,7 +1033,6 @@
803 # CONFIG_BEFS_FS is not set
804 # CONFIG_BFS_FS is not set
805 # CONFIG_EFS_FS is not set
806 -# CONFIG_JFFS_FS is not set
807 # CONFIG_JFFS2_FS is not set
808 CONFIG_CRAMFS=y
809 # CONFIG_VXFS_FS is not set
810 @@ -1045,6 +1104,11 @@
811 # CONFIG_NLS_UTF8 is not set
812
813 #
814 +# Distributed Lock Manager
815 +#
816 +# CONFIG_DLM is not set
817 +
818 +#
819 # Profiling support
820 #
821 # CONFIG_PROFILING is not set
822 @@ -1056,28 +1120,30 @@
823 CONFIG_ENABLE_MUST_CHECK=y
824 # CONFIG_MAGIC_SYSRQ is not set
825 # CONFIG_UNUSED_SYMBOLS is not set
826 +# CONFIG_DEBUG_FS is not set
827 +# CONFIG_HEADERS_CHECK is not set
828 CONFIG_DEBUG_KERNEL=y
829 +# CONFIG_DEBUG_SHIRQ is not set
830 CONFIG_LOG_BUF_SHIFT=14
831 CONFIG_DETECT_SOFTLOCKUP=y
832 # CONFIG_SCHEDSTATS is not set
833 +# CONFIG_TIMER_STATS is not set
834 # CONFIG_DEBUG_SLAB is not set
835 # CONFIG_DEBUG_RT_MUTEXES is not set
836 # CONFIG_RT_MUTEX_TESTER is not set
837 # CONFIG_DEBUG_SPINLOCK is not set
838 # CONFIG_DEBUG_MUTEXES is not set
839 -# CONFIG_DEBUG_RWSEMS is not set
840 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
841 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
842 # CONFIG_DEBUG_KOBJECT is not set
843 CONFIG_DEBUG_BUGVERBOSE=y
844 # CONFIG_DEBUG_INFO is not set
845 -# CONFIG_DEBUG_FS is not set
846 # CONFIG_DEBUG_VM is not set
847 # CONFIG_DEBUG_LIST is not set
848 CONFIG_FRAME_POINTER=y
849 CONFIG_FORCED_INLINING=y
850 -# CONFIG_HEADERS_CHECK is not set
851 # CONFIG_RCU_TORTURE_TEST is not set
852 +# CONFIG_FAULT_INJECTION is not set
853 CONFIG_DEBUG_USER=y
854 # CONFIG_DEBUG_ERRORS is not set
855 CONFIG_DEBUG_LL=y
856 @@ -1097,9 +1163,12 @@
857 #
858 # Library routines
859 #
860 +CONFIG_BITREVERSE=y
861 # CONFIG_CRC_CCITT is not set
862 # CONFIG_CRC16 is not set
863 CONFIG_CRC32=y
864 # CONFIG_LIBCRC32C is not set
865 CONFIG_ZLIB_INFLATE=y
866 CONFIG_PLIST=y
867 +CONFIG_HAS_IOMEM=y
868 +CONFIG_HAS_IOPORT=y
869 diff -urN linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig linux-2.6.22-rc5.new/arch/arm/configs/at91sam9263ek_defconfig
870 --- linux-2.6.22-rc5/arch/arm/configs/at91sam9263ek_defconfig 2007-06-17 04:09:12.000000000 +0200
871 +++ linux-2.6.22-rc5.new/arch/arm/configs/at91sam9263ek_defconfig 2007-07-29 05:23:04.000000000 +0200
872 @@ -1,11 +1,14 @@
873 #
874 # Automatically generated make config: don't edit
875 -# Linux kernel version: 2.6.20-rc1
876 -# Mon Jan 8 16:06:54 2007
877 +# Linux kernel version: 2.6.21
878 +# Mon May 7 11:42:49 2007
879 #
880 CONFIG_ARM=y
881 +CONFIG_SYS_SUPPORTS_APM_EMULATION=y
882 +CONFIG_GENERIC_GPIO=y
883 # CONFIG_GENERIC_TIME is not set
884 CONFIG_MMU=y
885 +# CONFIG_NO_IOPORT is not set
886 CONFIG_GENERIC_HARDIRQS=y
887 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
888 CONFIG_HARDIRQS_SW_RESEND=y
889 @@ -15,6 +18,7 @@
890 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
891 CONFIG_GENERIC_HWEIGHT=y
892 CONFIG_GENERIC_CALIBRATE_DELAY=y
893 +CONFIG_ZONE_DMA=y
894 CONFIG_VECTORS_BASE=0xffff0000
895 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
896
897 @@ -33,6 +37,7 @@
898 # CONFIG_SWAP is not set
899 CONFIG_SYSVIPC=y
900 # CONFIG_IPC_NS is not set
901 +CONFIG_SYSVIPC_SYSCTL=y
902 # CONFIG_POSIX_MQUEUE is not set
903 # CONFIG_BSD_PROCESS_ACCT is not set
904 # CONFIG_TASKSTATS is not set
905 @@ -41,6 +46,7 @@
906 # CONFIG_IKCONFIG is not set
907 CONFIG_SYSFS_DEPRECATED=y
908 # CONFIG_RELAY is not set
909 +CONFIG_BLK_DEV_INITRD=y
910 CONFIG_INITRAMFS_SOURCE=""
911 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
912 CONFIG_SYSCTL=y
913 @@ -120,6 +126,7 @@
914 # CONFIG_ARCH_IXP2000 is not set
915 # CONFIG_ARCH_IXP23XX is not set
916 # CONFIG_ARCH_L7200 is not set
917 +# CONFIG_ARCH_NS9XXX is not set
918 # CONFIG_ARCH_PNX4008 is not set
919 # CONFIG_ARCH_PXA is not set
920 # CONFIG_ARCH_RPC is not set
921 @@ -152,6 +159,7 @@
922 # AT91 Feature Selections
923 #
924 # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
925 +# CONFIG_ATMEL_TCLIB is not set
926
927 #
928 # Processor Type
929 @@ -174,6 +182,7 @@
930 # CONFIG_CPU_DCACHE_DISABLE is not set
931 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
932 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
933 +# CONFIG_OUTER_CACHE is not set
934
935 #
936 # Bus support
937 @@ -201,6 +210,7 @@
938 # CONFIG_SPARSEMEM_STATIC is not set
939 CONFIG_SPLIT_PTLOCK_CPUS=4096
940 # CONFIG_RESOURCES_64BIT is not set
941 +CONFIG_ZONE_DMA_FLAG=1
942 # CONFIG_LEDS is not set
943 CONFIG_ALIGNMENT_TRAP=y
944
945 @@ -211,6 +221,7 @@
946 CONFIG_ZBOOT_ROM_BSS=0x0
947 CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
948 # CONFIG_XIP_KERNEL is not set
949 +# CONFIG_KEXEC is not set
950
951 #
952 # Floating point emulation
953 @@ -236,7 +247,6 @@
954 # Power management options
955 #
956 # CONFIG_PM is not set
957 -# CONFIG_APM is not set
958
959 #
960 # Networking
961 @@ -333,6 +343,7 @@
962 CONFIG_PREVENT_FIRMWARE_BUILD=y
963 # CONFIG_FW_LOADER is not set
964 # CONFIG_DEBUG_DRIVER is not set
965 +# CONFIG_DEBUG_DEVRES is not set
966 # CONFIG_SYS_HYPERVISOR is not set
967
968 #
969 @@ -430,6 +441,7 @@
970 #
971 # Plug and Play support
972 #
973 +# CONFIG_PNPACPI is not set
974
975 #
976 # Block devices
977 @@ -443,7 +455,6 @@
978 CONFIG_BLK_DEV_RAM_COUNT=16
979 CONFIG_BLK_DEV_RAM_SIZE=8192
980 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
981 -CONFIG_BLK_DEV_INITRD=y
982 # CONFIG_CDROM_PKTCDVD is not set
983 # CONFIG_ATA_OVER_ETH is not set
984
985 @@ -531,6 +542,7 @@
986 #
987 CONFIG_NET_ETHERNET=y
988 CONFIG_MII=y
989 +CONFIG_MACB=y
990 # CONFIG_SMC91X is not set
991 # CONFIG_DM9000 is not set
992
993 @@ -685,6 +697,7 @@
994 # I2C Hardware Bus support
995 #
996 CONFIG_I2C_AT91=y
997 +CONFIG_I2C_AT91_CLOCKRATE=100000
998 # CONFIG_I2C_OCORES is not set
999 # CONFIG_I2C_PARPORT_LIGHT is not set
1000 # CONFIG_I2C_STUB is not set
1001 @@ -722,6 +735,7 @@
1002 #
1003 # SPI Protocol Masters
1004 #
1005 +# CONFIG_SPI_AT25 is not set
1006
1007 #
1008 # Dallas's 1-wire bus
1009 @@ -737,7 +751,11 @@
1010 #
1011 # Misc devices
1012 #
1013 -# CONFIG_TIFM_CORE is not set
1014 +
1015 +#
1016 +# Multifunction device drivers
1017 +#
1018 +# CONFIG_MFD_SM501 is not set
1019
1020 #
1021 # LED devices
1022 @@ -766,15 +784,23 @@
1023 #
1024 # Graphics support
1025 #
1026 -# CONFIG_FIRMWARE_EDID is not set
1027 +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1028 CONFIG_FB=y
1029 +# CONFIG_FIRMWARE_EDID is not set
1030 +# CONFIG_FB_DDC is not set
1031 # CONFIG_FB_CFB_FILLRECT is not set
1032 # CONFIG_FB_CFB_COPYAREA is not set
1033 # CONFIG_FB_CFB_IMAGEBLIT is not set
1034 +# CONFIG_FB_SVGALIB is not set
1035 # CONFIG_FB_MACMODES is not set
1036 # CONFIG_FB_BACKLIGHT is not set
1037 # CONFIG_FB_MODE_HELPERS is not set
1038 # CONFIG_FB_TILEBLITTING is not set
1039 +
1040 +#
1041 +# Frame buffer hardware drivers
1042 +#
1043 +# CONFIG_FB_S1D15605 is not set
1044 # CONFIG_FB_S1D13XXX is not set
1045 # CONFIG_FB_VIRTUAL is not set
1046
1047 @@ -789,7 +815,6 @@
1048 # Logo configuration
1049 #
1050 # CONFIG_LOGO is not set
1051 -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1052
1053 #
1054 # Sound
1055 @@ -800,6 +825,7 @@
1056 # HID Devices
1057 #
1058 CONFIG_HID=y
1059 +# CONFIG_HID_DEBUG is not set
1060
1061 #
1062 # USB support
1063 @@ -814,9 +840,7 @@
1064 # Miscellaneous USB options
1065 #
1066 CONFIG_USB_DEVICEFS=y
1067 -# CONFIG_USB_BANDWIDTH is not set
1068 # CONFIG_USB_DYNAMIC_MINORS is not set
1069 -# CONFIG_USB_MULTITHREAD_PROBE is not set
1070 # CONFIG_USB_OTG is not set
1071
1072 #
1073 @@ -824,7 +848,8 @@
1074 #
1075 # CONFIG_USB_ISP116X_HCD is not set
1076 CONFIG_USB_OHCI_HCD=y
1077 -# CONFIG_USB_OHCI_BIG_ENDIAN is not set
1078 +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
1079 +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
1080 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
1081 # CONFIG_USB_SL811_HCD is not set
1082
1083 @@ -877,6 +902,7 @@
1084 # CONFIG_USB_ATI_REMOTE2 is not set
1085 # CONFIG_USB_KEYSPAN_REMOTE is not set
1086 # CONFIG_USB_APPLETOUCH is not set
1087 +# CONFIG_USB_GTCO is not set
1088
1089 #
1090 # USB Imaging devices
1091 @@ -914,6 +940,7 @@
1092 # CONFIG_USB_RIO500 is not set
1093 # CONFIG_USB_LEGOTOWER is not set
1094 # CONFIG_USB_LCD is not set
1095 +# CONFIG_USB_BERRY_CHARGE is not set
1096 # CONFIG_USB_LED is not set
1097 # CONFIG_USB_CYPRESS_CY7C63 is not set
1098 # CONFIG_USB_CYTHERM is not set
1099 @@ -923,6 +950,7 @@
1100 # CONFIG_USB_APPLEDISPLAY is not set
1101 # CONFIG_USB_LD is not set
1102 # CONFIG_USB_TRANCEVIBRATOR is not set
1103 +# CONFIG_USB_IOWARRIOR is not set
1104 # CONFIG_USB_TEST is not set
1105
1106 #
1107 @@ -959,7 +987,6 @@
1108 # CONFIG_MMC_DEBUG is not set
1109 CONFIG_MMC_BLOCK=y
1110 CONFIG_MMC_AT91=m
1111 -# CONFIG_MMC_TIFM_SD is not set
1112
1113 #
1114 # Real Time Clock
1115 @@ -1136,15 +1163,16 @@
1116 # CONFIG_DEBUG_FS is not set
1117 # CONFIG_HEADERS_CHECK is not set
1118 CONFIG_DEBUG_KERNEL=y
1119 +# CONFIG_DEBUG_SHIRQ is not set
1120 CONFIG_LOG_BUF_SHIFT=14
1121 CONFIG_DETECT_SOFTLOCKUP=y
1122 # CONFIG_SCHEDSTATS is not set
1123 +# CONFIG_TIMER_STATS is not set
1124 # CONFIG_DEBUG_SLAB is not set
1125 # CONFIG_DEBUG_RT_MUTEXES is not set
1126 # CONFIG_RT_MUTEX_TESTER is not set
1127 # CONFIG_DEBUG_SPINLOCK is not set
1128 # CONFIG_DEBUG_MUTEXES is not set
1129 -# CONFIG_DEBUG_RWSEMS is not set
1130 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set
1131 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
1132 # CONFIG_DEBUG_KOBJECT is not set
1133 @@ -1155,6 +1183,7 @@
1134 CONFIG_FRAME_POINTER=y
1135 CONFIG_FORCED_INLINING=y
1136 # CONFIG_RCU_TORTURE_TEST is not set
1137 +# CONFIG_FAULT_INJECTION is not set
1138 CONFIG_DEBUG_USER=y
1139 # CONFIG_DEBUG_ERRORS is not set
1140 CONFIG_DEBUG_LL=y
1141 @@ -1180,5 +1209,7 @@
1142 CONFIG_CRC32=y
1143 # CONFIG_LIBCRC32C is not set
1144 CONFIG_ZLIB_INFLATE=y
1145 +CONFIG_ZLIB_DEFLATE=y
1146 CONFIG_PLIST=y
1147 -CONFIG_IOMAP_COPY=y
1148 +CONFIG_HAS_IOMEM=y
1149 +CONFIG_HAS_IOPORT=y
1150 diff -urN linux-2.6.22-rc5/arch/arm/configs/cam60_defconfig linux-2.6.22-rc5.new/arch/arm/configs/cam60_defconfig
1151 --- linux-2.6.22-rc5/arch/arm/configs/cam60_defconfig 1970-01-01 01:00:00.000000000 +0100
1152 +++ linux-2.6.22-rc5.new/arch/arm/configs/cam60_defconfig 2007-07-29 05:23:04.000000000 +0200
1153 @@ -0,0 +1,954 @@
1154 +#
1155 +# Automatically generated make config: don't edit
1156 +# Linux kernel version: 2.6.20
1157 +# Tue May 1 21:06:33 2007
1158 +#
1159 +CONFIG_ARM=y
1160 +# CONFIG_GENERIC_TIME is not set
1161 +CONFIG_MMU=y
1162 +CONFIG_GENERIC_HARDIRQS=y
1163 +CONFIG_TRACE_IRQFLAGS_SUPPORT=y
1164 +CONFIG_HARDIRQS_SW_RESEND=y
1165 +CONFIG_GENERIC_IRQ_PROBE=y
1166 +CONFIG_RWSEM_GENERIC_SPINLOCK=y
1167 +# CONFIG_ARCH_HAS_ILOG2_U32 is not set
1168 +# CONFIG_ARCH_HAS_ILOG2_U64 is not set
1169 +CONFIG_GENERIC_HWEIGHT=y
1170 +CONFIG_GENERIC_CALIBRATE_DELAY=y
1171 +CONFIG_VECTORS_BASE=0xffff0000
1172 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
1173 +
1174 +#
1175 +# Code maturity level options
1176 +#
1177 +CONFIG_EXPERIMENTAL=y
1178 +CONFIG_BROKEN_ON_SMP=y
1179 +CONFIG_INIT_ENV_ARG_LIMIT=32
1180 +
1181 +#
1182 +# General setup
1183 +#
1184 +CONFIG_LOCALVERSION=""
1185 +# CONFIG_LOCALVERSION_AUTO is not set
1186 +# CONFIG_SWAP is not set
1187 +CONFIG_SYSVIPC=y
1188 +# CONFIG_IPC_NS is not set
1189 +# CONFIG_POSIX_MQUEUE is not set
1190 +# CONFIG_BSD_PROCESS_ACCT is not set
1191 +# CONFIG_TASKSTATS is not set
1192 +# CONFIG_UTS_NS is not set
1193 +# CONFIG_AUDIT is not set
1194 +CONFIG_IKCONFIG=y
1195 +CONFIG_IKCONFIG_PROC=y
1196 +CONFIG_SYSFS_DEPRECATED=y
1197 +# CONFIG_RELAY is not set
1198 +CONFIG_INITRAMFS_SOURCE=""
1199 +CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1200 +CONFIG_SYSCTL=y
1201 +# CONFIG_EMBEDDED is not set
1202 +CONFIG_UID16=y
1203 +CONFIG_SYSCTL_SYSCALL=y
1204 +CONFIG_KALLSYMS=y
1205 +# CONFIG_KALLSYMS_ALL is not set
1206 +# CONFIG_KALLSYMS_EXTRA_PASS is not set
1207 +CONFIG_HOTPLUG=y
1208 +CONFIG_PRINTK=y
1209 +CONFIG_BUG=y
1210 +CONFIG_ELF_CORE=y
1211 +CONFIG_BASE_FULL=y
1212 +CONFIG_FUTEX=y
1213 +CONFIG_EPOLL=y
1214 +CONFIG_SHMEM=y
1215 +CONFIG_SLAB=y
1216 +CONFIG_VM_EVENT_COUNTERS=y
1217 +CONFIG_RT_MUTEXES=y
1218 +# CONFIG_TINY_SHMEM is not set
1219 +CONFIG_BASE_SMALL=0
1220 +# CONFIG_SLOB is not set
1221 +
1222 +#
1223 +# Loadable module support
1224 +#
1225 +CONFIG_MODULES=y
1226 +CONFIG_MODULE_UNLOAD=y
1227 +CONFIG_MODULE_FORCE_UNLOAD=y
1228 +# CONFIG_MODVERSIONS is not set
1229 +# CONFIG_MODULE_SRCVERSION_ALL is not set
1230 +# CONFIG_KMOD is not set
1231 +
1232 +#
1233 +# Block layer
1234 +#
1235 +CONFIG_BLOCK=y
1236 +# CONFIG_LBD is not set
1237 +# CONFIG_BLK_DEV_IO_TRACE is not set
1238 +# CONFIG_LSF is not set
1239 +
1240 +#
1241 +# IO Schedulers
1242 +#
1243 +CONFIG_IOSCHED_NOOP=y
1244 +CONFIG_IOSCHED_AS=y
1245 +# CONFIG_IOSCHED_DEADLINE is not set
1246 +# CONFIG_IOSCHED_CFQ is not set
1247 +CONFIG_DEFAULT_AS=y
1248 +# CONFIG_DEFAULT_DEADLINE is not set
1249 +# CONFIG_DEFAULT_CFQ is not set
1250 +# CONFIG_DEFAULT_NOOP is not set
1251 +CONFIG_DEFAULT_IOSCHED="anticipatory"
1252 +
1253 +#
1254 +# System Type
1255 +#
1256 +# CONFIG_ARCH_AAEC2000 is not set
1257 +# CONFIG_ARCH_INTEGRATOR is not set
1258 +# CONFIG_ARCH_REALVIEW is not set
1259 +# CONFIG_ARCH_VERSATILE is not set
1260 +CONFIG_ARCH_AT91=y
1261 +# CONFIG_ARCH_CLPS7500 is not set
1262 +# CONFIG_ARCH_CLPS711X is not set
1263 +# CONFIG_ARCH_CO285 is not set
1264 +# CONFIG_ARCH_EBSA110 is not set
1265 +# CONFIG_ARCH_EP93XX is not set
1266 +# CONFIG_ARCH_FOOTBRIDGE is not set
1267 +# CONFIG_ARCH_NETX is not set
1268 +# CONFIG_ARCH_H720X is not set
1269 +# CONFIG_ARCH_IMX is not set
1270 +# CONFIG_ARCH_IOP32X is not set
1271 +# CONFIG_ARCH_IOP33X is not set
1272 +# CONFIG_ARCH_IOP13XX is not set
1273 +# CONFIG_ARCH_IXP4XX is not set
1274 +# CONFIG_ARCH_IXP2000 is not set
1275 +# CONFIG_ARCH_IXP23XX is not set
1276 +# CONFIG_ARCH_L7200 is not set
1277 +# CONFIG_ARCH_PNX4008 is not set
1278 +# CONFIG_ARCH_PXA is not set
1279 +# CONFIG_ARCH_RPC is not set
1280 +# CONFIG_ARCH_SA1100 is not set
1281 +# CONFIG_ARCH_S3C2410 is not set
1282 +# CONFIG_ARCH_SHARK is not set
1283 +# CONFIG_ARCH_LH7A40X is not set
1284 +# CONFIG_ARCH_OMAP is not set
1285 +
1286 +#
1287 +# Atmel AT91 System-on-Chip
1288 +#
1289 +# CONFIG_ARCH_AT91RM9200 is not set
1290 +CONFIG_ARCH_AT91SAM9260=y
1291 +# CONFIG_ARCH_AT91SAM9261 is not set
1292 +# CONFIG_ARCH_AT91SAM9263 is not set
1293 +
1294 +#
1295 +# AT91SAM9260 Board Type
1296 +#
1297 +# CONFIG_MACH_AT91SAM9260EK is not set
1298 +CONFIG_MACH_CAM60=y
1299 +
1300 +#
1301 +# AT91 Board Options
1302 +#
1303 +
1304 +#
1305 +# AT91 Feature Selections
1306 +#
1307 +# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
1308 +
1309 +#
1310 +# Processor Type
1311 +#
1312 +CONFIG_CPU_32=y
1313 +CONFIG_CPU_ARM926T=y
1314 +CONFIG_CPU_32v5=y
1315 +CONFIG_CPU_ABRT_EV5TJ=y
1316 +CONFIG_CPU_CACHE_VIVT=y
1317 +CONFIG_CPU_COPY_V4WB=y
1318 +CONFIG_CPU_TLB_V4WBI=y
1319 +CONFIG_CPU_CP15=y
1320 +CONFIG_CPU_CP15_MMU=y
1321 +
1322 +#
1323 +# Processor Features
1324 +#
1325 +# CONFIG_ARM_THUMB is not set
1326 +# CONFIG_CPU_ICACHE_DISABLE is not set
1327 +# CONFIG_CPU_DCACHE_DISABLE is not set
1328 +# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
1329 +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
1330 +
1331 +#
1332 +# Bus support
1333 +#
1334 +
1335 +#
1336 +# PCCARD (PCMCIA/CardBus) support
1337 +#
1338 +# CONFIG_PCCARD is not set
1339 +
1340 +#
1341 +# Kernel Features
1342 +#
1343 +# CONFIG_PREEMPT is not set
1344 +# CONFIG_NO_IDLE_HZ is not set
1345 +CONFIG_HZ=100
1346 +# CONFIG_AEABI is not set
1347 +# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
1348 +CONFIG_SELECT_MEMORY_MODEL=y
1349 +CONFIG_FLATMEM_MANUAL=y
1350 +# CONFIG_DISCONTIGMEM_MANUAL is not set
1351 +# CONFIG_SPARSEMEM_MANUAL is not set
1352 +CONFIG_FLATMEM=y
1353 +CONFIG_FLAT_NODE_MEM_MAP=y
1354 +# CONFIG_SPARSEMEM_STATIC is not set
1355 +CONFIG_SPLIT_PTLOCK_CPUS=4096
1356 +# CONFIG_RESOURCES_64BIT is not set
1357 +# CONFIG_LEDS is not set
1358 +CONFIG_ALIGNMENT_TRAP=y
1359 +
1360 +#
1361 +# Boot options
1362 +#
1363 +CONFIG_ZBOOT_ROM_TEXT=0x22000000
1364 +CONFIG_ZBOOT_ROM_BSS=0x20004000
1365 +# CONFIG_ZBOOT_ROM is not set
1366 +CONFIG_CMDLINE="console=ttyS0,115200 noinitrd root=/dev/mtdblock3 rootfstype=jffs2 mem=64M"
1367 +# CONFIG_XIP_KERNEL is not set
1368 +
1369 +#
1370 +# Floating point emulation
1371 +#
1372 +
1373 +#
1374 +# At least one emulation must be selected
1375 +#
1376 +CONFIG_FPE_NWFPE=y
1377 +# CONFIG_FPE_NWFPE_XP is not set
1378 +# CONFIG_FPE_FASTFPE is not set
1379 +# CONFIG_VFP is not set
1380 +
1381 +#
1382 +# Userspace binary formats
1383 +#
1384 +CONFIG_BINFMT_ELF=y
1385 +# CONFIG_BINFMT_AOUT is not set
1386 +# CONFIG_BINFMT_MISC is not set
1387 +# CONFIG_ARTHUR is not set
1388 +
1389 +#
1390 +# Power management options
1391 +#
1392 +# CONFIG_PM is not set
1393 +# CONFIG_APM is not set
1394 +
1395 +#
1396 +# Networking
1397 +#
1398 +CONFIG_NET=y
1399 +
1400 +#
1401 +# Networking options
1402 +#
1403 +# CONFIG_NETDEBUG is not set
1404 +CONFIG_PACKET=y
1405 +# CONFIG_PACKET_MMAP is not set
1406 +CONFIG_UNIX=y
1407 +CONFIG_XFRM=y
1408 +# CONFIG_XFRM_USER is not set
1409 +# CONFIG_XFRM_SUB_POLICY is not set
1410 +# CONFIG_NET_KEY is not set
1411 +CONFIG_INET=y
1412 +# CONFIG_IP_MULTICAST is not set
1413 +# CONFIG_IP_ADVANCED_ROUTER is not set
1414 +CONFIG_IP_FIB_HASH=y
1415 +CONFIG_IP_PNP=y
1416 +# CONFIG_IP_PNP_DHCP is not set
1417 +CONFIG_IP_PNP_BOOTP=y
1418 +# CONFIG_IP_PNP_RARP is not set
1419 +# CONFIG_NET_IPIP is not set
1420 +# CONFIG_NET_IPGRE is not set
1421 +# CONFIG_ARPD is not set
1422 +# CONFIG_SYN_COOKIES is not set
1423 +# CONFIG_INET_AH is not set
1424 +# CONFIG_INET_ESP is not set
1425 +# CONFIG_INET_IPCOMP is not set
1426 +# CONFIG_INET_XFRM_TUNNEL is not set
1427 +# CONFIG_INET_TUNNEL is not set
1428 +CONFIG_INET_XFRM_MODE_TRANSPORT=y
1429 +CONFIG_INET_XFRM_MODE_TUNNEL=y
1430 +CONFIG_INET_XFRM_MODE_BEET=y
1431 +CONFIG_INET_DIAG=y
1432 +CONFIG_INET_TCP_DIAG=y
1433 +# CONFIG_TCP_CONG_ADVANCED is not set
1434 +CONFIG_TCP_CONG_CUBIC=y
1435 +CONFIG_DEFAULT_TCP_CONG="cubic"
1436 +# CONFIG_TCP_MD5SIG is not set
1437 +# CONFIG_IPV6 is not set
1438 +# CONFIG_INET6_XFRM_TUNNEL is not set
1439 +# CONFIG_INET6_TUNNEL is not set
1440 +# CONFIG_NETWORK_SECMARK is not set
1441 +# CONFIG_NETFILTER is not set
1442 +
1443 +#
1444 +# DCCP Configuration (EXPERIMENTAL)
1445 +#
1446 +# CONFIG_IP_DCCP is not set
1447 +
1448 +#
1449 +# SCTP Configuration (EXPERIMENTAL)
1450 +#
1451 +# CONFIG_IP_SCTP is not set
1452 +
1453 +#
1454 +# TIPC Configuration (EXPERIMENTAL)
1455 +#
1456 +# CONFIG_TIPC is not set
1457 +# CONFIG_ATM is not set
1458 +# CONFIG_BRIDGE is not set
1459 +# CONFIG_VLAN_8021Q is not set
1460 +# CONFIG_DECNET is not set
1461 +# CONFIG_LLC2 is not set
1462 +# CONFIG_IPX is not set
1463 +# CONFIG_ATALK is not set
1464 +# CONFIG_X25 is not set
1465 +# CONFIG_LAPB is not set
1466 +# CONFIG_ECONET is not set
1467 +# CONFIG_WAN_ROUTER is not set
1468 +
1469 +#
1470 +# QoS and/or fair queueing
1471 +#
1472 +# CONFIG_NET_SCHED is not set
1473 +
1474 +#
1475 +# Network testing
1476 +#
1477 +# CONFIG_NET_PKTGEN is not set
1478 +# CONFIG_HAMRADIO is not set
1479 +# CONFIG_IRDA is not set
1480 +# CONFIG_BT is not set
1481 +# CONFIG_IEEE80211 is not set
1482 +
1483 +#
1484 +# Device Drivers
1485 +#
1486 +
1487 +#
1488 +# Generic Driver Options
1489 +#
1490 +CONFIG_STANDALONE=y
1491 +CONFIG_PREVENT_FIRMWARE_BUILD=y
1492 +# CONFIG_FW_LOADER is not set
1493 +# CONFIG_DEBUG_DRIVER is not set
1494 +# CONFIG_SYS_HYPERVISOR is not set
1495 +
1496 +#
1497 +# Connector - unified userspace <-> kernelspace linker
1498 +#
1499 +# CONFIG_CONNECTOR is not set
1500 +
1501 +#
1502 +# Memory Technology Devices (MTD)
1503 +#
1504 +CONFIG_MTD=y
1505 +# CONFIG_MTD_DEBUG is not set
1506 +CONFIG_MTD_CONCAT=y
1507 +CONFIG_MTD_PARTITIONS=y
1508 +# CONFIG_MTD_REDBOOT_PARTS is not set
1509 +CONFIG_MTD_CMDLINE_PARTS=y
1510 +# CONFIG_MTD_AFS_PARTS is not set
1511 +
1512 +#
1513 +# User Modules And Translation Layers
1514 +#
1515 +CONFIG_MTD_CHAR=y
1516 +CONFIG_MTD_BLKDEVS=y
1517 +CONFIG_MTD_BLOCK=y
1518 +# CONFIG_FTL is not set
1519 +# CONFIG_NFTL is not set
1520 +# CONFIG_INFTL is not set
1521 +# CONFIG_RFD_FTL is not set
1522 +# CONFIG_SSFDC is not set
1523 +
1524 +#
1525 +# RAM/ROM/Flash chip drivers
1526 +#
1527 +CONFIG_MTD_CFI=y
1528 +# CONFIG_MTD_JEDECPROBE is not set
1529 +CONFIG_MTD_GEN_PROBE=y
1530 +# CONFIG_MTD_CFI_ADV_OPTIONS is not set
1531 +CONFIG_MTD_MAP_BANK_WIDTH_1=y
1532 +CONFIG_MTD_MAP_BANK_WIDTH_2=y
1533 +CONFIG_MTD_MAP_BANK_WIDTH_4=y
1534 +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
1535 +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
1536 +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
1537 +CONFIG_MTD_CFI_I1=y
1538 +CONFIG_MTD_CFI_I2=y
1539 +# CONFIG_MTD_CFI_I4 is not set
1540 +# CONFIG_MTD_CFI_I8 is not set
1541 +# CONFIG_MTD_CFI_INTELEXT is not set
1542 +# CONFIG_MTD_CFI_AMDSTD is not set
1543 +# CONFIG_MTD_CFI_STAA is not set
1544 +# CONFIG_MTD_RAM is not set
1545 +# CONFIG_MTD_ROM is not set
1546 +# CONFIG_MTD_ABSENT is not set
1547 +# CONFIG_MTD_OBSOLETE_CHIPS is not set
1548 +
1549 +#
1550 +# Mapping drivers for chip access
1551 +#
1552 +CONFIG_MTD_COMPLEX_MAPPINGS=y
1553 +# CONFIG_MTD_PHYSMAP is not set
1554 +# CONFIG_MTD_ARM_INTEGRATOR is not set
1555 +# CONFIG_MTD_PLATRAM is not set
1556 +
1557 +#
1558 +# Self-contained MTD device drivers
1559 +#
1560 +CONFIG_MTD_DATAFLASH=y
1561 +# CONFIG_MTD_M25P80 is not set
1562 +# CONFIG_MTD_SLRAM is not set
1563 +# CONFIG_MTD_PHRAM is not set
1564 +# CONFIG_MTD_MTDRAM is not set
1565 +# CONFIG_MTD_BLOCK2MTD is not set
1566 +
1567 +#
1568 +# Disk-On-Chip Device Drivers
1569 +#
1570 +# CONFIG_MTD_DOC2000 is not set
1571 +# CONFIG_MTD_DOC2001 is not set
1572 +# CONFIG_MTD_DOC2001PLUS is not set
1573 +
1574 +#
1575 +# NAND Flash Device Drivers
1576 +#
1577 +# CONFIG_MTD_NAND is not set
1578 +
1579 +#
1580 +# OneNAND Flash Device Drivers
1581 +#
1582 +# CONFIG_MTD_ONENAND is not set
1583 +
1584 +#
1585 +# Parallel port support
1586 +#
1587 +# CONFIG_PARPORT is not set
1588 +
1589 +#
1590 +# Plug and Play support
1591 +#
1592 +
1593 +#
1594 +# Block devices
1595 +#
1596 +# CONFIG_BLK_DEV_COW_COMMON is not set
1597 +# CONFIG_BLK_DEV_LOOP is not set
1598 +# CONFIG_BLK_DEV_NBD is not set
1599 +CONFIG_BLK_DEV_RAM=y
1600 +CONFIG_BLK_DEV_RAM_COUNT=16
1601 +CONFIG_BLK_DEV_RAM_SIZE=8192
1602 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
1603 +CONFIG_BLK_DEV_INITRD=y
1604 +# CONFIG_CDROM_PKTCDVD is not set
1605 +# CONFIG_ATA_OVER_ETH is not set
1606 +
1607 +#
1608 +# SCSI device support
1609 +#
1610 +# CONFIG_RAID_ATTRS is not set
1611 +# CONFIG_SCSI is not set
1612 +# CONFIG_SCSI_NETLINK is not set
1613 +
1614 +#
1615 +# Serial ATA (prod) and Parallel ATA (experimental) drivers
1616 +#
1617 +# CONFIG_ATA is not set
1618 +
1619 +#
1620 +# Multi-device support (RAID and LVM)
1621 +#
1622 +# CONFIG_MD is not set
1623 +
1624 +#
1625 +# Fusion MPT device support
1626 +#
1627 +# CONFIG_FUSION is not set
1628 +
1629 +#
1630 +# IEEE 1394 (FireWire) support
1631 +#
1632 +
1633 +#
1634 +# I2O device support
1635 +#
1636 +
1637 +#
1638 +# Network device support
1639 +#
1640 +CONFIG_NETDEVICES=y
1641 +# CONFIG_DUMMY is not set
1642 +# CONFIG_BONDING is not set
1643 +# CONFIG_EQUALIZER is not set
1644 +# CONFIG_TUN is not set
1645 +
1646 +#
1647 +# PHY device support
1648 +#
1649 +# CONFIG_PHYLIB is not set
1650 +
1651 +#
1652 +# Ethernet (10 or 100Mbit)
1653 +#
1654 +CONFIG_NET_ETHERNET=y
1655 +CONFIG_MII=y
1656 +CONFIG_MACB=y
1657 +# CONFIG_SMC91X is not set
1658 +# CONFIG_DM9000 is not set
1659 +
1660 +#
1661 +# Ethernet (1000 Mbit)
1662 +#
1663 +
1664 +#
1665 +# Ethernet (10000 Mbit)
1666 +#
1667 +
1668 +#
1669 +# Token Ring devices
1670 +#
1671 +
1672 +#
1673 +# Wireless LAN (non-hamradio)
1674 +#
1675 +# CONFIG_NET_RADIO is not set
1676 +
1677 +#
1678 +# Wan interfaces
1679 +#
1680 +# CONFIG_WAN is not set
1681 +# CONFIG_PPP is not set
1682 +# CONFIG_SLIP is not set
1683 +# CONFIG_SHAPER is not set
1684 +# CONFIG_NETCONSOLE is not set
1685 +# CONFIG_NETPOLL is not set
1686 +# CONFIG_NET_POLL_CONTROLLER is not set
1687 +
1688 +#
1689 +# ISDN subsystem
1690 +#
1691 +# CONFIG_ISDN is not set
1692 +
1693 +#
1694 +# Input device support
1695 +#
1696 +CONFIG_INPUT=y
1697 +# CONFIG_INPUT_FF_MEMLESS is not set
1698 +
1699 +#
1700 +# Userland interfaces
1701 +#
1702 +CONFIG_INPUT_MOUSEDEV=y
1703 +# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
1704 +CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
1705 +CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
1706 +# CONFIG_INPUT_JOYDEV is not set
1707 +# CONFIG_INPUT_TSDEV is not set
1708 +# CONFIG_INPUT_EVDEV is not set
1709 +# CONFIG_INPUT_EVBUG is not set
1710 +
1711 +#
1712 +# Input Device Drivers
1713 +#
1714 +# CONFIG_INPUT_KEYBOARD is not set
1715 +# CONFIG_INPUT_MOUSE is not set
1716 +# CONFIG_INPUT_JOYSTICK is not set
1717 +# CONFIG_INPUT_TOUCHSCREEN is not set
1718 +# CONFIG_INPUT_MISC is not set
1719 +
1720 +#
1721 +# Hardware I/O ports
1722 +#
1723 +# CONFIG_SERIO is not set
1724 +# CONFIG_GAMEPORT is not set
1725 +
1726 +#
1727 +# Character devices
1728 +#
1729 +CONFIG_VT=y
1730 +CONFIG_VT_CONSOLE=y
1731 +CONFIG_HW_CONSOLE=y
1732 +# CONFIG_VT_HW_CONSOLE_BINDING is not set
1733 +# CONFIG_SERIAL_NONSTANDARD is not set
1734 +
1735 +#
1736 +# Serial drivers
1737 +#
1738 +# CONFIG_SERIAL_8250 is not set
1739 +
1740 +#
1741 +# Non-8250 serial port support
1742 +#
1743 +CONFIG_SERIAL_ATMEL=y
1744 +CONFIG_SERIAL_ATMEL_CONSOLE=y
1745 +# CONFIG_SERIAL_ATMEL_TTYAT is not set
1746 +CONFIG_SERIAL_CORE=y
1747 +CONFIG_SERIAL_CORE_CONSOLE=y
1748 +CONFIG_UNIX98_PTYS=y
1749 +CONFIG_LEGACY_PTYS=y
1750 +CONFIG_LEGACY_PTY_COUNT=256
1751 +
1752 +#
1753 +# IPMI
1754 +#
1755 +# CONFIG_IPMI_HANDLER is not set
1756 +
1757 +#
1758 +# Watchdog Cards
1759 +#
1760 +# CONFIG_WATCHDOG is not set
1761 +# CONFIG_HW_RANDOM is not set
1762 +# CONFIG_NVRAM is not set
1763 +# CONFIG_DTLK is not set
1764 +# CONFIG_R3964 is not set
1765 +# CONFIG_RAW_DRIVER is not set
1766 +
1767 +#
1768 +# TPM devices
1769 +#
1770 +# CONFIG_TCG_TPM is not set
1771 +
1772 +#
1773 +# I2C support
1774 +#
1775 +# CONFIG_I2C is not set
1776 +
1777 +#
1778 +# SPI support
1779 +#
1780 +CONFIG_SPI=y
1781 +# CONFIG_SPI_DEBUG is not set
1782 +CONFIG_SPI_MASTER=y
1783 +
1784 +#
1785 +# SPI Master Controller Drivers
1786 +#
1787 +CONFIG_SPI_ATMEL=y
1788 +# CONFIG_SPI_BITBANG is not set
1789 +
1790 +#
1791 +# SPI Protocol Masters
1792 +#
1793 +
1794 +#
1795 +# Dallas's 1-wire bus
1796 +#
1797 +# CONFIG_W1 is not set
1798 +
1799 +#
1800 +# Hardware Monitoring support
1801 +#
1802 +# CONFIG_HWMON is not set
1803 +# CONFIG_HWMON_VID is not set
1804 +
1805 +#
1806 +# Misc devices
1807 +#
1808 +# CONFIG_TIFM_CORE is not set
1809 +
1810 +#
1811 +# LED devices
1812 +#
1813 +# CONFIG_NEW_LEDS is not set
1814 +
1815 +#
1816 +# LED drivers
1817 +#
1818 +
1819 +#
1820 +# LED Triggers
1821 +#
1822 +
1823 +#
1824 +# Multimedia devices
1825 +#
1826 +# CONFIG_VIDEO_DEV is not set
1827 +
1828 +#
1829 +# Digital Video Broadcasting Devices
1830 +#
1831 +# CONFIG_DVB is not set
1832 +
1833 +#
1834 +# Graphics support
1835 +#
1836 +# CONFIG_FIRMWARE_EDID is not set
1837 +# CONFIG_FB is not set
1838 +
1839 +#
1840 +# Console display driver support
1841 +#
1842 +# CONFIG_VGA_CONSOLE is not set
1843 +CONFIG_DUMMY_CONSOLE=y
1844 +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
1845 +
1846 +#
1847 +# Sound
1848 +#
1849 +# CONFIG_SOUND is not set
1850 +
1851 +#
1852 +# HID Devices
1853 +#
1854 +# CONFIG_HID is not set
1855 +
1856 +#
1857 +# USB support
1858 +#
1859 +CONFIG_USB_ARCH_HAS_HCD=y
1860 +CONFIG_USB_ARCH_HAS_OHCI=y
1861 +# CONFIG_USB_ARCH_HAS_EHCI is not set
1862 +# CONFIG_USB is not set
1863 +
1864 +#
1865 +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1866 +#
1867 +
1868 +#
1869 +# USB Gadget Support
1870 +#
1871 +# CONFIG_USB_GADGET is not set
1872 +
1873 +#
1874 +# MMC/SD Card support
1875 +#
1876 +# CONFIG_MMC is not set
1877 +
1878 +#
1879 +# Real Time Clock
1880 +#
1881 +CONFIG_RTC_LIB=y
1882 +# CONFIG_RTC_CLASS is not set
1883 +
1884 +#
1885 +# File systems
1886 +#
1887 +CONFIG_EXT2_FS=y
1888 +# CONFIG_EXT2_FS_XATTR is not set
1889 +# CONFIG_EXT2_FS_XIP is not set
1890 +CONFIG_EXT3_FS=y
1891 +CONFIG_EXT3_FS_XATTR=y
1892 +# CONFIG_EXT3_FS_POSIX_ACL is not set
1893 +# CONFIG_EXT3_FS_SECURITY is not set
1894 +# CONFIG_EXT4DEV_FS is not set
1895 +CONFIG_JBD=y
1896 +# CONFIG_JBD_DEBUG is not set
1897 +CONFIG_FS_MBCACHE=y
1898 +# CONFIG_REISERFS_FS is not set
1899 +# CONFIG_JFS_FS is not set
1900 +# CONFIG_FS_POSIX_ACL is not set
1901 +# CONFIG_XFS_FS is not set
1902 +# CONFIG_GFS2_FS is not set
1903 +# CONFIG_OCFS2_FS is not set
1904 +# CONFIG_MINIX_FS is not set
1905 +# CONFIG_ROMFS_FS is not set
1906 +CONFIG_INOTIFY=y
1907 +CONFIG_INOTIFY_USER=y
1908 +# CONFIG_QUOTA is not set
1909 +CONFIG_DNOTIFY=y
1910 +# CONFIG_AUTOFS_FS is not set
1911 +CONFIG_AUTOFS4_FS=y
1912 +# CONFIG_FUSE_FS is not set
1913 +
1914 +#
1915 +# CD-ROM/DVD Filesystems
1916 +#
1917 +# CONFIG_ISO9660_FS is not set
1918 +# CONFIG_UDF_FS is not set
1919 +
1920 +#
1921 +# DOS/FAT/NT Filesystems
1922 +#
1923 +CONFIG_FAT_FS=y
1924 +# CONFIG_MSDOS_FS is not set
1925 +CONFIG_VFAT_FS=y
1926 +CONFIG_FAT_DEFAULT_CODEPAGE=437
1927 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
1928 +# CONFIG_NTFS_FS is not set
1929 +
1930 +#
1931 +# Pseudo filesystems
1932 +#
1933 +CONFIG_PROC_FS=y
1934 +CONFIG_PROC_SYSCTL=y
1935 +CONFIG_SYSFS=y
1936 +CONFIG_TMPFS=y
1937 +# CONFIG_TMPFS_POSIX_ACL is not set
1938 +# CONFIG_HUGETLB_PAGE is not set
1939 +CONFIG_RAMFS=y
1940 +# CONFIG_CONFIGFS_FS is not set
1941 +
1942 +#
1943 +# Miscellaneous filesystems
1944 +#
1945 +# CONFIG_ADFS_FS is not set
1946 +# CONFIG_AFFS_FS is not set
1947 +# CONFIG_HFS_FS is not set
1948 +# CONFIG_HFSPLUS_FS is not set
1949 +# CONFIG_BEFS_FS is not set
1950 +# CONFIG_BFS_FS is not set
1951 +# CONFIG_EFS_FS is not set
1952 +CONFIG_JFFS2_FS=y
1953 +CONFIG_JFFS2_FS_DEBUG=0
1954 +CONFIG_JFFS2_FS_WRITEBUFFER=y
1955 +# CONFIG_JFFS2_SUMMARY is not set
1956 +# CONFIG_JFFS2_FS_XATTR is not set
1957 +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1958 +CONFIG_JFFS2_ZLIB=y
1959 +CONFIG_JFFS2_RTIME=y
1960 +# CONFIG_JFFS2_RUBIN is not set
1961 +CONFIG_CRAMFS=y
1962 +# CONFIG_VXFS_FS is not set
1963 +# CONFIG_HPFS_FS is not set
1964 +# CONFIG_QNX4FS_FS is not set
1965 +# CONFIG_SYSV_FS is not set
1966 +# CONFIG_UFS_FS is not set
1967 +
1968 +#
1969 +# Network File Systems
1970 +#
1971 +CONFIG_NFS_FS=y
1972 +CONFIG_NFS_V3=y
1973 +# CONFIG_NFS_V3_ACL is not set
1974 +# CONFIG_NFS_V4 is not set
1975 +# CONFIG_NFS_DIRECTIO is not set
1976 +# CONFIG_NFSD is not set
1977 +CONFIG_ROOT_NFS=y
1978 +CONFIG_LOCKD=y
1979 +CONFIG_LOCKD_V4=y
1980 +CONFIG_NFS_COMMON=y
1981 +CONFIG_SUNRPC=y
1982 +# CONFIG_RPCSEC_GSS_KRB5 is not set
1983 +# CONFIG_RPCSEC_GSS_SPKM3 is not set
1984 +# CONFIG_SMB_FS is not set
1985 +# CONFIG_CIFS is not set
1986 +# CONFIG_NCP_FS is not set
1987 +# CONFIG_CODA_FS is not set
1988 +# CONFIG_AFS_FS is not set
1989 +# CONFIG_9P_FS is not set
1990 +
1991 +#
1992 +# Partition Types
1993 +#
1994 +# CONFIG_PARTITION_ADVANCED is not set
1995 +CONFIG_MSDOS_PARTITION=y
1996 +
1997 +#
1998 +# Native Language Support
1999 +#
2000 +CONFIG_NLS=y
2001 +CONFIG_NLS_DEFAULT="iso8859-1"
2002 +CONFIG_NLS_CODEPAGE_437=y
2003 +# CONFIG_NLS_CODEPAGE_737 is not set
2004 +# CONFIG_NLS_CODEPAGE_775 is not set
2005 +CONFIG_NLS_CODEPAGE_850=y
2006 +# CONFIG_NLS_CODEPAGE_852 is not set
2007 +# CONFIG_NLS_CODEPAGE_855 is not set
2008 +# CONFIG_NLS_CODEPAGE_857 is not set
2009 +# CONFIG_NLS_CODEPAGE_860 is not set
2010 +# CONFIG_NLS_CODEPAGE_861 is not set
2011 +# CONFIG_NLS_CODEPAGE_862 is not set
2012 +# CONFIG_NLS_CODEPAGE_863 is not set
2013 +# CONFIG_NLS_CODEPAGE_864 is not set
2014 +# CONFIG_NLS_CODEPAGE_865 is not set
2015 +# CONFIG_NLS_CODEPAGE_866 is not set
2016 +# CONFIG_NLS_CODEPAGE_869 is not set
2017 +# CONFIG_NLS_CODEPAGE_936 is not set
2018 +# CONFIG_NLS_CODEPAGE_950 is not set
2019 +# CONFIG_NLS_CODEPAGE_932 is not set
2020 +# CONFIG_NLS_CODEPAGE_949 is not set
2021 +# CONFIG_NLS_CODEPAGE_874 is not set
2022 +# CONFIG_NLS_ISO8859_8 is not set
2023 +# CONFIG_NLS_CODEPAGE_1250 is not set
2024 +# CONFIG_NLS_CODEPAGE_1251 is not set
2025 +# CONFIG_NLS_ASCII is not set
2026 +CONFIG_NLS_ISO8859_1=y
2027 +# CONFIG_NLS_ISO8859_2 is not set
2028 +# CONFIG_NLS_ISO8859_3 is not set
2029 +# CONFIG_NLS_ISO8859_4 is not set
2030 +# CONFIG_NLS_ISO8859_5 is not set
2031 +# CONFIG_NLS_ISO8859_6 is not set
2032 +# CONFIG_NLS_ISO8859_7 is not set
2033 +# CONFIG_NLS_ISO8859_9 is not set
2034 +# CONFIG_NLS_ISO8859_13 is not set
2035 +# CONFIG_NLS_ISO8859_14 is not set
2036 +# CONFIG_NLS_ISO8859_15 is not set
2037 +# CONFIG_NLS_KOI8_R is not set
2038 +# CONFIG_NLS_KOI8_U is not set
2039 +# CONFIG_NLS_UTF8 is not set
2040 +
2041 +#
2042 +# Distributed Lock Manager
2043 +#
2044 +# CONFIG_DLM is not set
2045 +
2046 +#
2047 +# Profiling support
2048 +#
2049 +# CONFIG_PROFILING is not set
2050 +
2051 +#
2052 +# Kernel hacking
2053 +#
2054 +# CONFIG_PRINTK_TIME is not set
2055 +CONFIG_ENABLE_MUST_CHECK=y
2056 +# CONFIG_MAGIC_SYSRQ is not set
2057 +# CONFIG_UNUSED_SYMBOLS is not set
2058 +# CONFIG_DEBUG_FS is not set
2059 +# CONFIG_HEADERS_CHECK is not set
2060 +CONFIG_DEBUG_KERNEL=y
2061 +CONFIG_LOG_BUF_SHIFT=14
2062 +CONFIG_DETECT_SOFTLOCKUP=y
2063 +# CONFIG_SCHEDSTATS is not set
2064 +# CONFIG_DEBUG_SLAB is not set
2065 +# CONFIG_DEBUG_RT_MUTEXES is not set
2066 +# CONFIG_RT_MUTEX_TESTER is not set
2067 +# CONFIG_DEBUG_SPINLOCK is not set
2068 +# CONFIG_DEBUG_MUTEXES is not set
2069 +# CONFIG_DEBUG_RWSEMS is not set
2070 +# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
2071 +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
2072 +# CONFIG_DEBUG_KOBJECT is not set
2073 +CONFIG_DEBUG_BUGVERBOSE=y
2074 +# CONFIG_DEBUG_INFO is not set
2075 +# CONFIG_DEBUG_VM is not set
2076 +# CONFIG_DEBUG_LIST is not set
2077 +CONFIG_FRAME_POINTER=y
2078 +CONFIG_FORCED_INLINING=y
2079 +# CONFIG_RCU_TORTURE_TEST is not set
2080 +CONFIG_DEBUG_USER=y
2081 +# CONFIG_DEBUG_ERRORS is not set
2082 +CONFIG_DEBUG_LL=y
2083 +# CONFIG_DEBUG_ICEDCC is not set
2084 +
2085 +#
2086 +# Security options
2087 +#
2088 +# CONFIG_KEYS is not set
2089 +# CONFIG_SECURITY is not set
2090 +
2091 +#
2092 +# Cryptographic options
2093 +#
2094 +# CONFIG_CRYPTO is not set
2095 +
2096 +#
2097 +# Library routines
2098 +#
2099 +CONFIG_BITREVERSE=y
2100 +# CONFIG_CRC_CCITT is not set
2101 +# CONFIG_CRC16 is not set
2102 +CONFIG_CRC32=y
2103 +# CONFIG_LIBCRC32C is not set
2104 +CONFIG_ZLIB_INFLATE=y
2105 +CONFIG_ZLIB_DEFLATE=y
2106 +CONFIG_PLIST=y
2107 +CONFIG_IOMAP_COPY=y
2108 diff -urN linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig linux-2.6.22-rc5.new/arch/arm/configs/kb9202_defconfig
2109 --- linux-2.6.22-rc5/arch/arm/configs/kb9202_defconfig 2007-06-17 04:09:12.000000000 +0200
2110 +++ linux-2.6.22-rc5.new/arch/arm/configs/kb9202_defconfig 2007-07-29 05:23:04.000000000 +0200
2111 @@ -1,19 +1,31 @@
2112 #
2113 # Automatically generated make config: don't edit
2114 -# Linux kernel version: 2.6.13-rc2
2115 -# Sun Aug 14 19:26:59 2005
2116 +# Linux kernel version: 2.6.21
2117 +# Mon May 7 11:43:14 2007
2118 #
2119 CONFIG_ARM=y
2120 +CONFIG_SYS_SUPPORTS_APM_EMULATION=y
2121 +CONFIG_GENERIC_GPIO=y
2122 +# CONFIG_GENERIC_TIME is not set
2123 CONFIG_MMU=y
2124 -CONFIG_UID16=y
2125 +# CONFIG_NO_IOPORT is not set
2126 +CONFIG_GENERIC_HARDIRQS=y
2127 +CONFIG_TRACE_IRQFLAGS_SUPPORT=y
2128 +CONFIG_HARDIRQS_SW_RESEND=y
2129 +CONFIG_GENERIC_IRQ_PROBE=y
2130 CONFIG_RWSEM_GENERIC_SPINLOCK=y
2131 +# CONFIG_ARCH_HAS_ILOG2_U32 is not set
2132 +# CONFIG_ARCH_HAS_ILOG2_U64 is not set
2133 +CONFIG_GENERIC_HWEIGHT=y
2134 CONFIG_GENERIC_CALIBRATE_DELAY=y
2135 +CONFIG_ZONE_DMA=y
2136 +CONFIG_VECTORS_BASE=0xffff0000
2137 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
2138
2139 #
2140 # Code maturity level options
2141 #
2142 -# CONFIG_EXPERIMENTAL is not set
2143 -CONFIG_CLEAN_COMPILE=y
2144 +CONFIG_EXPERIMENTAL=y
2145 CONFIG_BROKEN_ON_SMP=y
2146 CONFIG_INIT_ENV_ARG_LIMIT=32
2147
2148 @@ -21,54 +33,103 @@
2149 # General setup
2150 #
2151 CONFIG_LOCALVERSION=""
2152 -# CONFIG_SWAP is not set
2153 -# CONFIG_SYSVIPC is not set
2154 -# CONFIG_BSD_PROCESS_ACCT is not set
2155 +CONFIG_LOCALVERSION_AUTO=y
2156 +CONFIG_SWAP=y
2157 +CONFIG_SYSVIPC=y
2158 +# CONFIG_IPC_NS is not set
2159 +CONFIG_SYSVIPC_SYSCTL=y
2160 +CONFIG_POSIX_MQUEUE=y
2161 +CONFIG_BSD_PROCESS_ACCT=y
2162 +# CONFIG_BSD_PROCESS_ACCT_V3 is not set
2163 +# CONFIG_TASKSTATS is not set
2164 +# CONFIG_UTS_NS is not set
2165 +CONFIG_AUDIT=y
2166 +CONFIG_IKCONFIG=y
2167 +CONFIG_IKCONFIG_PROC=y
2168 +CONFIG_SYSFS_DEPRECATED=y
2169 +# CONFIG_RELAY is not set
2170 +CONFIG_BLK_DEV_INITRD=y
2171 +CONFIG_INITRAMFS_SOURCE=""
2172 +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
2173 CONFIG_SYSCTL=y
2174 -# CONFIG_AUDIT is not set
2175 -CONFIG_HOTPLUG=y
2176 -# CONFIG_KOBJECT_UEVENT is not set
2177 -# CONFIG_IKCONFIG is not set
2178 # CONFIG_EMBEDDED is not set
2179 +CONFIG_UID16=y
2180 +CONFIG_SYSCTL_SYSCALL=y
2181 CONFIG_KALLSYMS=y
2182 # CONFIG_KALLSYMS_ALL is not set
2183 -# CONFIG_KALLSYMS_EXTRA_PASS is not set
2184 +CONFIG_KALLSYMS_EXTRA_PASS=y
2185 +CONFIG_HOTPLUG=y
2186 CONFIG_PRINTK=y
2187 CONFIG_BUG=y
2188 +CONFIG_ELF_CORE=y
2189 CONFIG_BASE_FULL=y
2190 CONFIG_FUTEX=y
2191 CONFIG_EPOLL=y
2192 -CONFIG_CC_OPTIMIZE_FOR_SIZE=y
2193 CONFIG_SHMEM=y
2194 -CONFIG_CC_ALIGN_FUNCTIONS=0
2195 -CONFIG_CC_ALIGN_LABELS=0
2196 -CONFIG_CC_ALIGN_LOOPS=0
2197 -CONFIG_CC_ALIGN_JUMPS=0
2198 +CONFIG_SLAB=y
2199 +CONFIG_VM_EVENT_COUNTERS=y
2200 +CONFIG_RT_MUTEXES=y
2201 # CONFIG_TINY_SHMEM is not set
2202 CONFIG_BASE_SMALL=0
2203 +# CONFIG_SLOB is not set
2204
2205 #
2206 # Loadable module support
2207 #
2208 CONFIG_MODULES=y
2209 CONFIG_MODULE_UNLOAD=y
2210 -CONFIG_OBSOLETE_MODPARM=y
2211 -# CONFIG_MODULE_SRCVERSION_ALL is not set
2212 +# CONFIG_MODULE_FORCE_UNLOAD is not set
2213 +CONFIG_MODVERSIONS=y
2214 +CONFIG_MODULE_SRCVERSION_ALL=y
2215 CONFIG_KMOD=y
2216
2217 #
2218 +# Block layer
2219 +#
2220 +CONFIG_BLOCK=y
2221 +CONFIG_LBD=y
2222 +# CONFIG_BLK_DEV_IO_TRACE is not set
2223 +# CONFIG_LSF is not set
2224 +
2225 +#
2226 +# IO Schedulers
2227 +#
2228 +CONFIG_IOSCHED_NOOP=y
2229 +CONFIG_IOSCHED_AS=y
2230 +CONFIG_IOSCHED_DEADLINE=y
2231 +CONFIG_IOSCHED_CFQ=y
2232 +# CONFIG_DEFAULT_AS is not set
2233 +# CONFIG_DEFAULT_DEADLINE is not set
2234 +CONFIG_DEFAULT_CFQ=y
2235 +# CONFIG_DEFAULT_NOOP is not set
2236 +CONFIG_DEFAULT_IOSCHED="cfq"
2237 +
2238 +#
2239 # System Type
2240 #
2241 +# CONFIG_ARCH_AAEC2000 is not set
2242 +# CONFIG_ARCH_INTEGRATOR is not set
2243 +# CONFIG_ARCH_REALVIEW is not set
2244 +# CONFIG_ARCH_VERSATILE is not set
2245 +CONFIG_ARCH_AT91=y
2246 # CONFIG_ARCH_CLPS7500 is not set
2247 # CONFIG_ARCH_CLPS711X is not set
2248 # CONFIG_ARCH_CO285 is not set
2249 # CONFIG_ARCH_EBSA110 is not set
2250 +# CONFIG_ARCH_EP93XX is not set
2251 # CONFIG_ARCH_FOOTBRIDGE is not set
2252 -# CONFIG_ARCH_INTEGRATOR is not set
2253 -# CONFIG_ARCH_IOP3XX is not set
2254 +# CONFIG_ARCH_NETX is not set
2255 +# CONFIG_ARCH_H720X is not set
2256 +# CONFIG_ARCH_IMX is not set
2257 +# CONFIG_ARCH_IOP32X is not set
2258 +# CONFIG_ARCH_IOP33X is not set
2259 +# CONFIG_ARCH_IOP13XX is not set
2260 # CONFIG_ARCH_IXP4XX is not set
2261 # CONFIG_ARCH_IXP2000 is not set
2262 +# CONFIG_ARCH_IXP23XX is not set
2263 # CONFIG_ARCH_L7200 is not set
2264 +# CONFIG_ARCH_NS9XXX is not set
2265 +# CONFIG_ARCH_PNX4008 is not set
2266 # CONFIG_ARCH_PXA is not set
2267 # CONFIG_ARCH_RPC is not set
2268 # CONFIG_ARCH_SA1100 is not set
2269 @@ -76,34 +137,52 @@
2270 # CONFIG_ARCH_SHARK is not set
2271 # CONFIG_ARCH_LH7A40X is not set
2272 # CONFIG_ARCH_OMAP is not set
2273 -# CONFIG_ARCH_VERSATILE is not set
2274 -# CONFIG_ARCH_IMX is not set
2275 -# CONFIG_ARCH_H720X is not set
2276 -# CONFIG_ARCH_AAEC2000 is not set
2277 -CONFIG_ARCH_AT91=y
2278 +
2279 +#
2280 +# Atmel AT91 System-on-Chip
2281 +#
2282 CONFIG_ARCH_AT91RM9200=y
2283 +# CONFIG_ARCH_AT91SAM9260 is not set
2284 +# CONFIG_ARCH_AT91SAM9261 is not set
2285 +# CONFIG_ARCH_AT91SAM9263 is not set
2286
2287 #
2288 -# AT91RM9200 Implementations
2289 +# AT91RM9200 Board Type
2290 #
2291 +# CONFIG_MACH_ONEARM is not set
2292 # CONFIG_ARCH_AT91RM9200DK is not set
2293 # CONFIG_MACH_AT91RM9200EK is not set
2294 # CONFIG_MACH_CSB337 is not set
2295 # CONFIG_MACH_CSB637 is not set
2296 # CONFIG_MACH_CARMEVA is not set
2297 +# CONFIG_MACH_ATEB9200 is not set
2298 CONFIG_MACH_KB9200=y
2299 +# CONFIG_MACH_KAFA is not set
2300 +# CONFIG_MACH_CHUB is not set
2301 +
2302 +#
2303 +# AT91 Board Options
2304 +#
2305 +
2306 +#
2307 +# AT91 Feature Selections
2308 +#
2309 +# CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
2310 +# CONFIG_ATMEL_TCLIB is not set
2311
2312 #
2313 # Processor Type
2314 #
2315 CONFIG_CPU_32=y
2316 CONFIG_CPU_ARM920T=y
2317 -CONFIG_CPU_32v4=y
2318 +CONFIG_CPU_32v4T=y
2319 CONFIG_CPU_ABRT_EV4T=y
2320 CONFIG_CPU_CACHE_V4WT=y
2321 CONFIG_CPU_CACHE_VIVT=y
2322 CONFIG_CPU_COPY_V4WB=y
2323 CONFIG_CPU_TLB_V4WBI=y
2324 +CONFIG_CPU_CP15=y
2325 +CONFIG_CPU_CP15_MMU=y
2326
2327 #
2328 # Processor Features
2329 @@ -112,24 +191,44 @@
2330 # CONFIG_CPU_ICACHE_DISABLE is not set
2331 # CONFIG_CPU_DCACHE_DISABLE is not set
2332 # CONFIG_CPU_DCACHE_WRITETHROUGH is not set
2333 +# CONFIG_OUTER_CACHE is not set
2334
2335 #
2336 # Bus support
2337 #
2338 -CONFIG_ISA_DMA_API=y
2339
2340 #
2341 # PCCARD (PCMCIA/CardBus) support
2342 #
2343 -# CONFIG_PCCARD is not set
2344 +CONFIG_PCCARD=m
2345 +# CONFIG_PCMCIA_DEBUG is not set
2346 +CONFIG_PCMCIA=m
2347 +CONFIG_PCMCIA_LOAD_CIS=y
2348 +CONFIG_PCMCIA_IOCTL=y
2349 +
2350 +#
2351 +# PC-card bridges
2352 +#
2353 +# CONFIG_AT91_CF is not set
2354
2355 #
2356 # Kernel Features
2357 #
2358 +# CONFIG_PREEMPT is not set
2359 # CONFIG_NO_IDLE_HZ is not set
2360 +CONFIG_HZ=100
2361 +# CONFIG_AEABI is not set
2362 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
2363 +CONFIG_SELECT_MEMORY_MODEL=y
2364 +CONFIG_FLATMEM_MANUAL=y
2365 +# CONFIG_DISCONTIGMEM_MANUAL is not set
2366 +# CONFIG_SPARSEMEM_MANUAL is not set
2367 CONFIG_FLATMEM=y
2368 CONFIG_FLAT_NODE_MEM_MAP=y
2369 +# CONFIG_SPARSEMEM_STATIC is not set
2370 +CONFIG_SPLIT_PTLOCK_CPUS=4096
2371 +# CONFIG_RESOURCES_64BIT is not set
2372 +CONFIG_ZONE_DMA_FLAG=1
2373 # CONFIG_LEDS is not set
2374 CONFIG_ALIGNMENT_TRAP=y
2375
2376 @@ -138,8 +237,10 @@
2377 #
2378 CONFIG_ZBOOT_ROM_TEXT=0x10000000
2379 CONFIG_ZBOOT_ROM_BSS=0x20040000
2380 -CONFIG_ZBOOT_ROM=y
2381 -CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933"
2382 +# CONFIG_ZBOOT_ROM is not set
2383 +CONFIG_CMDLINE="noinitrd root=/dev/mtdblock0 rootfstype=jffs2 mem=64M"
2384 +# CONFIG_XIP_KERNEL is not set
2385 +# CONFIG_KEXEC is not set
2386
2387 #
2388 # Floating point emulation
2389 @@ -150,6 +251,7 @@
2390 #
2391 CONFIG_FPE_NWFPE=y
2392 # CONFIG_FPE_NWFPE_XP is not set
2393 +# CONFIG_FPE_FASTFPE is not set
2394
2395 #
2396 # Userspace binary formats
2397 @@ -165,6 +267,96 @@
2398 # CONFIG_PM is not set
2399
2400 #
2401 +# Networking
2402 +#
2403 +CONFIG_NET=y
2404 +
2405 +#
2406 +# Networking options
2407 +#
2408 +# CONFIG_NETDEBUG is not set
2409 +CONFIG_PACKET=y
2410 +# CONFIG_PACKET_MMAP is not set
2411 +CONFIG_UNIX=y
2412 +# CONFIG_NET_KEY is not set
2413 +CONFIG_INET=y
2414 +CONFIG_IP_MULTICAST=y
2415 +# CONFIG_IP_ADVANCED_ROUTER is not set
2416 +CONFIG_IP_FIB_HASH=y
2417 +CONFIG_IP_PNP=y
2418 +# CONFIG_IP_PNP_DHCP is not set
2419 +# CONFIG_IP_PNP_BOOTP is not set
2420 +# CONFIG_IP_PNP_RARP is not set
2421 +# CONFIG_NET_IPIP is not set
2422 +# CONFIG_NET_IPGRE is not set
2423 +# CONFIG_IP_MROUTE is not set
2424 +# CONFIG_ARPD is not set
2425 +# CONFIG_SYN_COOKIES is not set
2426 +# CONFIG_INET_AH is not set
2427 +# CONFIG_INET_ESP is not set
2428 +# CONFIG_INET_IPCOMP is not set
2429 +# CONFIG_INET_XFRM_TUNNEL is not set
2430 +# CONFIG_INET_TUNNEL is not set
2431 +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
2432 +# CONFIG_INET_XFRM_MODE_TUNNEL is not set
2433 +# CONFIG_INET_XFRM_MODE_BEET is not set
2434 +# CONFIG_INET_DIAG is not set
2435 +# CONFIG_TCP_CONG_ADVANCED is not set
2436 +CONFIG_TCP_CONG_CUBIC=y
2437 +CONFIG_DEFAULT_TCP_CONG="cubic"
2438 +# CONFIG_TCP_MD5SIG is not set
2439 +# CONFIG_IPV6 is not set
2440 +# CONFIG_INET6_XFRM_TUNNEL is not set
2441 +# CONFIG_INET6_TUNNEL is not set
2442 +# CONFIG_NETWORK_SECMARK is not set
2443 +# CONFIG_NETFILTER is not set
2444 +
2445 +#
2446 +# DCCP Configuration (EXPERIMENTAL)
2447 +#
2448 +# CONFIG_IP_DCCP is not set
2449 +
2450 +#
2451 +# SCTP Configuration (EXPERIMENTAL)
2452 +#
2453 +CONFIG_IP_SCTP=m
2454 +# CONFIG_SCTP_DBG_MSG is not set
2455 +# CONFIG_SCTP_DBG_OBJCNT is not set
2456 +# CONFIG_SCTP_HMAC_NONE is not set
2457 +# CONFIG_SCTP_HMAC_SHA1 is not set
2458 +CONFIG_SCTP_HMAC_MD5=y
2459 +
2460 +#
2461 +# TIPC Configuration (EXPERIMENTAL)
2462 +#
2463 +# CONFIG_TIPC is not set
2464 +# CONFIG_ATM is not set
2465 +# CONFIG_BRIDGE is not set
2466 +# CONFIG_VLAN_8021Q is not set
2467 +# CONFIG_DECNET is not set
2468 +# CONFIG_LLC2 is not set
2469 +# CONFIG_IPX is not set
2470 +# CONFIG_ATALK is not set
2471 +# CONFIG_X25 is not set
2472 +# CONFIG_LAPB is not set
2473 +# CONFIG_ECONET is not set
2474 +# CONFIG_WAN_ROUTER is not set
2475 +
2476 +#
2477 +# QoS and/or fair queueing
2478 +#
2479 +# CONFIG_NET_SCHED is not set
2480 +
2481 +#
2482 +# Network testing
2483 +#
2484 +# CONFIG_NET_PKTGEN is not set
2485 +# CONFIG_HAMRADIO is not set
2486 +# CONFIG_IRDA is not set
2487 +# CONFIG_BT is not set
2488 +# CONFIG_IEEE80211 is not set
2489 +
2490 +#
2491 # Device Drivers
2492 #
2493
2494 @@ -173,13 +365,95 @@
2495 #
2496 CONFIG_STANDALONE=y
2497 CONFIG_PREVENT_FIRMWARE_BUILD=y
2498 -# CONFIG_FW_LOADER is not set
2499 -CONFIG_DEBUG_DRIVER=y
2500 +CONFIG_FW_LOADER=y
2501 +# CONFIG_DEBUG_DRIVER is not set
2502 +# CONFIG_DEBUG_DEVRES is not set
2503 +# CONFIG_SYS_HYPERVISOR is not set
2504 +
2505 +#
2506 +# Connector - unified userspace <-> kernelspace linker
2507 +#
2508 +# CONFIG_CONNECTOR is not set
2509
2510 #
2511 # Memory Technology Devices (MTD)
2512 #
2513 -# CONFIG_MTD is not set
2514 +CONFIG_MTD=y
2515 +# CONFIG_MTD_DEBUG is not set
2516 +CONFIG_MTD_CONCAT=y
2517 +CONFIG_MTD_PARTITIONS=y
2518 +# CONFIG_MTD_REDBOOT_PARTS is not set
2519 +CONFIG_MTD_CMDLINE_PARTS=y
2520 +# CONFIG_MTD_AFS_PARTS is not set
2521 +
2522 +#
2523 +# User Modules And Translation Layers
2524 +#
2525 +CONFIG_MTD_CHAR=y
2526 +CONFIG_MTD_BLKDEVS=y
2527 +CONFIG_MTD_BLOCK=y
2528 +# CONFIG_FTL is not set
2529 +# CONFIG_NFTL is not set
2530 +# CONFIG_INFTL is not set
2531 +# CONFIG_RFD_FTL is not set
2532 +# CONFIG_SSFDC is not set
2533 +
2534 +#
2535 +# RAM/ROM/Flash chip drivers
2536 +#
2537 +# CONFIG_MTD_CFI is not set
2538 +# CONFIG_MTD_JEDECPROBE is not set
2539 +CONFIG_MTD_MAP_BANK_WIDTH_1=y
2540 +CONFIG_MTD_MAP_BANK_WIDTH_2=y
2541 +CONFIG_MTD_MAP_BANK_WIDTH_4=y
2542 +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
2543 +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
2544 +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
2545 +CONFIG_MTD_CFI_I1=y
2546 +CONFIG_MTD_CFI_I2=y
2547 +# CONFIG_MTD_CFI_I4 is not set
2548 +# CONFIG_MTD_CFI_I8 is not set
2549 +# CONFIG_MTD_RAM is not set
2550 +# CONFIG_MTD_ROM is not set
2551 +# CONFIG_MTD_ABSENT is not set
2552 +# CONFIG_MTD_OBSOLETE_CHIPS is not set
2553 +
2554 +#
2555 +# Mapping drivers for chip access
2556 +#
2557 +CONFIG_MTD_COMPLEX_MAPPINGS=y
2558 +# CONFIG_MTD_PLATRAM is not set
2559 +
2560 +#
2561 +# Self-contained MTD device drivers
2562 +#
2563 +# CONFIG_MTD_SLRAM is not set
2564 +# CONFIG_MTD_PHRAM is not set
2565 +# CONFIG_MTD_MTDRAM is not set
2566 +# CONFIG_MTD_BLOCK2MTD is not set
2567 +
2568 +#
2569 +# Disk-On-Chip Device Drivers
2570 +#
2571 +# CONFIG_MTD_DOC2000 is not set
2572 +# CONFIG_MTD_DOC2001 is not set
2573 +# CONFIG_MTD_DOC2001PLUS is not set
2574 +
2575 +#
2576 +# NAND Flash Device Drivers
2577 +#
2578 +CONFIG_MTD_NAND=y
2579 +# CONFIG_MTD_NAND_VERIFY_WRITE is not set
2580 +# CONFIG_MTD_NAND_ECC_SMC is not set
2581 +CONFIG_MTD_NAND_IDS=y
2582 +# CONFIG_MTD_NAND_DISKONCHIP is not set
2583 +CONFIG_MTD_NAND_AT91=y
2584 +# CONFIG_MTD_NAND_NANDSIM is not set
2585 +
2586 +#
2587 +# OneNAND Flash Device Drivers
2588 +#
2589 +# CONFIG_MTD_ONENAND is not set
2590
2591 #
2592 # Parallel port support
2593 @@ -189,6 +463,7 @@
2594 #
2595 # Plug and Play support
2596 #
2597 +# CONFIG_PNPACPI is not set
2598
2599 #
2600 # Block devices
2601 @@ -196,28 +471,27 @@
2602 # CONFIG_BLK_DEV_COW_COMMON is not set
2603 CONFIG_BLK_DEV_LOOP=y
2604 # CONFIG_BLK_DEV_CRYPTOLOOP is not set
2605 -CONFIG_BLK_DEV_NBD=y
2606 +# CONFIG_BLK_DEV_NBD is not set
2607 # CONFIG_BLK_DEV_UB is not set
2608 CONFIG_BLK_DEV_RAM=y
2609 CONFIG_BLK_DEV_RAM_COUNT=16
2610 -CONFIG_BLK_DEV_RAM_SIZE=4096
2611 -CONFIG_BLK_DEV_INITRD=y
2612 -CONFIG_INITRAMFS_SOURCE=""
2613 +CONFIG_BLK_DEV_RAM_SIZE=16384
2614 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
2615 # CONFIG_CDROM_PKTCDVD is not set
2616 +# CONFIG_ATA_OVER_ETH is not set
2617
2618 #
2619 -# IO Schedulers
2620 +# ATA/ATAPI/MFM/RLL support
2621 #
2622 -CONFIG_IOSCHED_NOOP=y
2623 -CONFIG_IOSCHED_AS=y
2624 -CONFIG_IOSCHED_DEADLINE=y
2625 -CONFIG_IOSCHED_CFQ=y
2626 -# CONFIG_ATA_OVER_ETH is not set
2627 +# CONFIG_IDE is not set
2628
2629 #
2630 # SCSI device support
2631 #
2632 +# CONFIG_RAID_ATTRS is not set
2633 CONFIG_SCSI=y
2634 +# CONFIG_SCSI_TGT is not set
2635 +# CONFIG_SCSI_NETLINK is not set
2636 CONFIG_SCSI_PROC_FS=y
2637
2638 #
2639 @@ -233,97 +507,61 @@
2640 #
2641 # Some SCSI devices (e.g. CD jukebox) support multiple LUNs
2642 #
2643 -# CONFIG_SCSI_MULTI_LUN is not set
2644 -# CONFIG_SCSI_CONSTANTS is not set
2645 -# CONFIG_SCSI_LOGGING is not set
2646 +CONFIG_SCSI_MULTI_LUN=y
2647 +CONFIG_SCSI_CONSTANTS=y
2648 +CONFIG_SCSI_LOGGING=y
2649 +# CONFIG_SCSI_SCAN_ASYNC is not set
2650
2651 #
2652 -# SCSI Transport Attributes
2653 +# SCSI Transports
2654 #
2655 -# CONFIG_SCSI_SPI_ATTRS is not set
2656 +CONFIG_SCSI_SPI_ATTRS=m
2657 # CONFIG_SCSI_FC_ATTRS is not set
2658 # CONFIG_SCSI_ISCSI_ATTRS is not set
2659 +# CONFIG_SCSI_SAS_ATTRS is not set
2660 +# CONFIG_SCSI_SAS_LIBSAS is not set
2661
2662 #
2663 # SCSI low-level drivers
2664 #
2665 -# CONFIG_SCSI_SATA is not set
2666 +# CONFIG_ISCSI_TCP is not set
2667 # CONFIG_SCSI_DEBUG is not set
2668
2669 #
2670 -# Multi-device support (RAID and LVM)
2671 -#
2672 -# CONFIG_MD is not set
2673 -
2674 -#
2675 -# Fusion MPT device support
2676 +# PCMCIA SCSI adapter support
2677 #
2678 -# CONFIG_FUSION is not set
2679 +# CONFIG_PCMCIA_AHA152X is not set
2680 +# CONFIG_PCMCIA_FDOMAIN is not set
2681 +# CONFIG_PCMCIA_NINJA_SCSI is not set
2682 +# CONFIG_PCMCIA_QLOGIC is not set
2683 +# CONFIG_PCMCIA_SYM53C500 is not set
2684
2685 #
2686 -# IEEE 1394 (FireWire) support
2687 +# Serial ATA (prod) and Parallel ATA (experimental) drivers
2688 #
2689 +# CONFIG_ATA is not set
2690
2691 #
2692 -# I2O device support
2693 +# Multi-device support (RAID and LVM)
2694 #
2695 +# CONFIG_MD is not set
2696
2697 #
2698 -# Networking support
2699 +# Fusion MPT device support
2700 #
2701 -CONFIG_NET=y
2702 +# CONFIG_FUSION is not set
2703
2704 #
2705 -# Networking options
2706 +# IEEE 1394 (FireWire) support
2707 #
2708 -CONFIG_PACKET=y
2709 -# CONFIG_PACKET_MMAP is not set
2710 -CONFIG_UNIX=y
2711 -# CONFIG_NET_KEY is not set
2712 -CONFIG_INET=y
2713 -CONFIG_IP_MULTICAST=y
2714 -# CONFIG_IP_ADVANCED_ROUTER is not set
2715 -CONFIG_IP_FIB_HASH=y
2716 -CONFIG_IP_PNP=y
2717 -CONFIG_IP_PNP_DHCP=y
2718 -# CONFIG_IP_PNP_BOOTP is not set
2719 -# CONFIG_IP_PNP_RARP is not set
2720 -# CONFIG_NET_IPIP is not set
2721 -# CONFIG_NET_IPGRE is not set
2722 -# CONFIG_IP_MROUTE is not set
2723 -# CONFIG_SYN_COOKIES is not set
2724 -# CONFIG_INET_AH is not set
2725 -# CONFIG_INET_ESP is not set
2726 -# CONFIG_INET_IPCOMP is not set
2727 -# CONFIG_INET_TUNNEL is not set
2728 -# CONFIG_IP_TCPDIAG is not set
2729 -# CONFIG_IP_TCPDIAG_IPV6 is not set
2730 -# CONFIG_TCP_CONG_ADVANCED is not set
2731 -CONFIG_TCP_CONG_BIC=y
2732 -# CONFIG_IPV6 is not set
2733 -# CONFIG_NETFILTER is not set
2734 -# CONFIG_BRIDGE is not set
2735 -# CONFIG_VLAN_8021Q is not set
2736 -# CONFIG_DECNET is not set
2737 -# CONFIG_LLC2 is not set
2738 -# CONFIG_IPX is not set
2739 -# CONFIG_ATALK is not set
2740
2741 #
2742 -# QoS and/or fair queueing
2743 +# I2O device support
2744 #
2745 -# CONFIG_NET_SCHED is not set
2746 -# CONFIG_NET_CLS_ROUTE is not set
2747
2748 #
2749 -# Network testing
2750 +# Network device support
2751 #
2752 -# CONFIG_NET_PKTGEN is not set
2753 -# CONFIG_NETPOLL is not set
2754 -# CONFIG_NET_POLL_CONTROLLER is not set
2755 -# CONFIG_HAMRADIO is not set
2756 -# CONFIG_IRDA is not set
2757 -# CONFIG_BT is not set
2758 CONFIG_NETDEVICES=y
2759 # CONFIG_DUMMY is not set
2760 # CONFIG_BONDING is not set
2761 @@ -331,6 +569,11 @@
2762 # CONFIG_TUN is not set
2763
2764 #
2765 +# PHY device support
2766 +#
2767 +# CONFIG_PHYLIB is not set
2768 +
2769 +#
2770 # Ethernet (10 or 100Mbit)
2771 #
2772 CONFIG_NET_ETHERNET=y
2773 @@ -357,11 +600,20 @@
2774 # CONFIG_NET_RADIO is not set
2775
2776 #
2777 +# PCMCIA network device support
2778 +#
2779 +# CONFIG_NET_PCMCIA is not set
2780 +
2781 +#
2782 # Wan interfaces
2783 #
2784 # CONFIG_WAN is not set
2785 # CONFIG_PPP is not set
2786 # CONFIG_SLIP is not set
2787 +# CONFIG_SHAPER is not set
2788 +# CONFIG_NETCONSOLE is not set
2789 +# CONFIG_NETPOLL is not set
2790 +# CONFIG_NET_POLL_CONTROLLER is not set
2791
2792 #
2793 # ISDN subsystem
2794 @@ -372,6 +624,7 @@
2795 # Input device support
2796 #
2797 CONFIG_INPUT=y
2798 +# CONFIG_INPUT_FF_MEMLESS is not set
2799
2800 #
2801 # Userland interfaces
2802 @@ -397,9 +650,7 @@
2803 #
2804 # Hardware I/O ports
2805 #
2806 -CONFIG_SERIO=y
2807 -# CONFIG_SERIO_SERPORT is not set
2808 -# CONFIG_SERIO_RAW is not set
2809 +# CONFIG_SERIO is not set
2810 # CONFIG_GAMEPORT is not set
2811
2812 #
2813 @@ -408,6 +659,7 @@
2814 CONFIG_VT=y
2815 CONFIG_VT_CONSOLE=y
2816 CONFIG_HW_CONSOLE=y
2817 +# CONFIG_VT_HW_CONSOLE_BINDING is not set
2818 # CONFIG_SERIAL_NONSTANDARD is not set
2819
2820 #
2821 @@ -420,11 +672,11 @@
2822 #
2823 CONFIG_SERIAL_ATMEL=y
2824 CONFIG_SERIAL_ATMEL_CONSOLE=y
2825 +# CONFIG_SERIAL_ATMEL_TTYAT is not set
2826 CONFIG_SERIAL_CORE=y
2827 CONFIG_SERIAL_CORE_CONSOLE=y
2828 CONFIG_UNIX98_PTYS=y
2829 -CONFIG_LEGACY_PTYS=y
2830 -CONFIG_LEGACY_PTY_COUNT=256
2831 +# CONFIG_LEGACY_PTYS is not set
2832
2833 #
2834 # IPMI
2835 @@ -435,21 +687,23 @@
2836 # Watchdog Cards
2837 #
2838 # CONFIG_WATCHDOG is not set
2839 +# CONFIG_HW_RANDOM is not set
2840 # CONFIG_NVRAM is not set
2841 -# CONFIG_RTC is not set
2842 -# CONFIG_AT91RM9200_RTC is not set
2843 # CONFIG_DTLK is not set
2844 # CONFIG_R3964 is not set
2845
2846 #
2847 -# Ftape, the floppy tape device driver
2848 +# PCMCIA character devices
2849 #
2850 +# CONFIG_SYNCLINK_CS is not set
2851 +# CONFIG_CARDMAN_4000 is not set
2852 +# CONFIG_CARDMAN_4040 is not set
2853 # CONFIG_RAW_DRIVER is not set
2854
2855 #
2856 # TPM devices
2857 #
2858 -# CONFIG_AT91_SPI is not set
2859 +# CONFIG_TCG_TPM is not set
2860
2861 #
2862 # I2C support
2863 @@ -457,10 +711,50 @@
2864 # CONFIG_I2C is not set
2865
2866 #
2867 +# SPI support
2868 +#
2869 +# CONFIG_SPI is not set
2870 +# CONFIG_SPI_MASTER is not set
2871 +
2872 +#
2873 +# Dallas's 1-wire bus
2874 +#
2875 +# CONFIG_W1 is not set
2876 +
2877 +#
2878 +# Hardware Monitoring support
2879 +#
2880 +CONFIG_HWMON=y
2881 +# CONFIG_HWMON_VID is not set
2882 +# CONFIG_SENSORS_ABITUGURU is not set
2883 +# CONFIG_SENSORS_F71805F is not set
2884 +# CONFIG_SENSORS_PC87427 is not set
2885 +# CONFIG_SENSORS_VT1211 is not set
2886 +CONFIG_HWMON_DEBUG_CHIP=y
2887 +
2888 +#
2889 # Misc devices
2890 #
2891
2892 #
2893 +# Multifunction device drivers
2894 +#
2895 +# CONFIG_MFD_SM501 is not set
2896 +
2897 +#
2898 +# LED devices
2899 +#
2900 +# CONFIG_NEW_LEDS is not set
2901 +
2902 +#
2903 +# LED drivers
2904 +#
2905 +
2906 +#
2907 +# LED Triggers
2908 +#
2909 +
2910 +#
2911 # Multimedia devices
2912 #
2913 # CONFIG_VIDEO_DEV is not set
2914 @@ -469,17 +763,57 @@
2915 # Digital Video Broadcasting Devices
2916 #
2917 # CONFIG_DVB is not set
2918 +# CONFIG_USB_DABUSB is not set
2919
2920 #
2921 # Graphics support
2922 #
2923 -# CONFIG_FB is not set
2924 +CONFIG_BACKLIGHT_LCD_SUPPORT=y
2925 +CONFIG_BACKLIGHT_CLASS_DEVICE=y
2926 +# CONFIG_LCD_CLASS_DEVICE is not set
2927 +CONFIG_BACKLIGHT_KB920x=y
2928 +CONFIG_FB=y
2929 +# CONFIG_FIRMWARE_EDID is not set
2930 +# CONFIG_FB_DDC is not set
2931 +CONFIG_FB_CFB_FILLRECT=y
2932 +CONFIG_FB_CFB_COPYAREA=y
2933 +CONFIG_FB_CFB_IMAGEBLIT=y
2934 +# CONFIG_FB_SVGALIB is not set
2935 +# CONFIG_FB_MACMODES is not set
2936 +# CONFIG_FB_BACKLIGHT is not set
2937 +CONFIG_FB_MODE_HELPERS=y
2938 +CONFIG_FB_TILEBLITTING=y
2939 +
2940 +#
2941 +# Frame buffer hardware drivers
2942 +#
2943 +CONFIG_FB_S1D15605=y
2944 +# CONFIG_FB_S1D13XXX is not set
2945 +# CONFIG_FB_VIRTUAL is not set
2946
2947 #
2948 # Console display driver support
2949 #
2950 # CONFIG_VGA_CONSOLE is not set
2951 CONFIG_DUMMY_CONSOLE=y
2952 +CONFIG_FRAMEBUFFER_CONSOLE=y
2953 +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
2954 +CONFIG_FONTS=y
2955 +# CONFIG_FONT_8x8 is not set
2956 +# CONFIG_FONT_8x16 is not set
2957 +# CONFIG_FONT_6x11 is not set
2958 +# CONFIG_FONT_7x14 is not set
2959 +# CONFIG_FONT_PEARL_8x8 is not set
2960 +# CONFIG_FONT_ACORN_8x8 is not set
2961 +CONFIG_FONT_MINI_4x6=y
2962 +# CONFIG_FONT_SUN8x16 is not set
2963 +# CONFIG_FONT_SUN12x22 is not set
2964 +# CONFIG_FONT_10x18 is not set
2965 +
2966 +#
2967 +# Logo configuration
2968 +#
2969 +# CONFIG_LOGO is not set
2970
2971 #
2972 # Sound
2973 @@ -487,82 +821,98 @@
2974 # CONFIG_SOUND is not set
2975
2976 #
2977 +# HID Devices
2978 +#
2979 +CONFIG_HID=y
2980 +# CONFIG_HID_DEBUG is not set
2981 +
2982 +#
2983 # USB support
2984 #
2985 CONFIG_USB_ARCH_HAS_HCD=y
2986 CONFIG_USB_ARCH_HAS_OHCI=y
2987 +# CONFIG_USB_ARCH_HAS_EHCI is not set
2988 CONFIG_USB=y
2989 -CONFIG_USB_DEBUG=y
2990 +# CONFIG_USB_DEBUG is not set
2991
2992 #
2993 # Miscellaneous USB options
2994 #
2995 CONFIG_USB_DEVICEFS=y
2996 +# CONFIG_USB_DYNAMIC_MINORS is not set
2997 +# CONFIG_USB_OTG is not set
2998
2999 #
3000 # USB Host Controller Drivers
3001 #
3002 # CONFIG_USB_ISP116X_HCD is not set
3003 CONFIG_USB_OHCI_HCD=y
3004 -# CONFIG_USB_OHCI_BIG_ENDIAN is not set
3005 +# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
3006 +# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
3007 CONFIG_USB_OHCI_LITTLE_ENDIAN=y
3008 # CONFIG_USB_SL811_HCD is not set
3009
3010 #
3011 # USB Device Class drivers
3012 #
3013 -# CONFIG_USB_BLUETOOTH_TTY is not set
3014 # CONFIG_USB_ACM is not set
3015 # CONFIG_USB_PRINTER is not set
3016
3017 #
3018 -# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
3019 +# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
3020 +#
3021 +
3022 +#
3023 +# may also be needed; see USB_STORAGE Help for more information
3024 #
3025 CONFIG_USB_STORAGE=y
3026 -CONFIG_USB_STORAGE_DEBUG=y
3027 +# CONFIG_USB_STORAGE_DEBUG is not set
3028 +# CONFIG_USB_STORAGE_DATAFAB is not set
3029 # CONFIG_USB_STORAGE_FREECOM is not set
3030 # CONFIG_USB_STORAGE_DPCM is not set
3031 +# CONFIG_USB_STORAGE_USBAT is not set
3032 +# CONFIG_USB_STORAGE_SDDR09 is not set
3033 +# CONFIG_USB_STORAGE_SDDR55 is not set
3034 +# CONFIG_USB_STORAGE_JUMPSHOT is not set
3035 +# CONFIG_USB_STORAGE_ALAUDA is not set
3036 +# CONFIG_USB_STORAGE_KARMA is not set
3037 +CONFIG_USB_LIBUSUAL=y
3038
3039 #
3040 # USB Input Devices
3041 #
3042 -# CONFIG_USB_HID is not set
3043 -
3044 -#
3045 -# USB HID Boot Protocol drivers
3046 -#
3047 -# CONFIG_USB_KBD is not set
3048 -# CONFIG_USB_MOUSE is not set
3049 +CONFIG_USB_HID=y
3050 +# CONFIG_USB_HIDINPUT_POWERBOOK is not set
3051 +# CONFIG_HID_FF is not set
3052 +# CONFIG_USB_HIDDEV is not set
3053 # CONFIG_USB_AIPTEK is not set
3054 # CONFIG_USB_WACOM is not set
3055 # CONFIG_USB_ACECAD is not set
3056 # CONFIG_USB_KBTAB is not set
3057 # CONFIG_USB_POWERMATE is not set
3058 -# CONFIG_USB_MTOUCH is not set
3059 -# CONFIG_USB_ITMTOUCH is not set
3060 -# CONFIG_USB_EGALAX is not set
3061 +# CONFIG_USB_TOUCHSCREEN is not set
3062 +# CONFIG_USB_YEALINK is not set
3063 # CONFIG_USB_XPAD is not set
3064 # CONFIG_USB_ATI_REMOTE is not set
3065 +# CONFIG_USB_ATI_REMOTE2 is not set
3066 +# CONFIG_USB_KEYSPAN_REMOTE is not set
3067 +# CONFIG_USB_APPLETOUCH is not set
3068 +# CONFIG_USB_GTCO is not set
3069
3070 #
3071 # USB Imaging devices
3072 #
3073 +# CONFIG_USB_MDC800 is not set
3074 # CONFIG_USB_MICROTEK is not set
3075
3076 #
3077 -# USB Multimedia devices
3078 -#
3079 -# CONFIG_USB_DABUSB is not set
3080 -
3081 -#
3082 -# Video4Linux support is needed for USB Multimedia device support
3083 -#
3084 -
3085 -#
3086 # USB Network Adapters
3087 #
3088 +# CONFIG_USB_CATC is not set
3089 # CONFIG_USB_KAWETH is not set
3090 # CONFIG_USB_PEGASUS is not set
3091 +# CONFIG_USB_RTL8150 is not set
3092 +# CONFIG_USB_USBNET_MII is not set
3093 # CONFIG_USB_USBNET is not set
3094 # CONFIG_USB_MON is not set
3095
3096 @@ -580,12 +930,23 @@
3097 #
3098 # CONFIG_USB_EMI62 is not set
3099 # CONFIG_USB_EMI26 is not set
3100 +# CONFIG_USB_ADUTUX is not set
3101 +# CONFIG_USB_AUERSWALD is not set
3102 +# CONFIG_USB_RIO500 is not set
3103 +# CONFIG_USB_LEGOTOWER is not set
3104 # CONFIG_USB_LCD is not set
3105 +# CONFIG_USB_BERRY_CHARGE is not set
3106 # CONFIG_USB_LED is not set
3107 +# CONFIG_USB_CYPRESS_CY7C63 is not set
3108 # CONFIG_USB_CYTHERM is not set
3109 -# CONFIG_USB_PHIDGETKIT is not set
3110 -# CONFIG_USB_PHIDGETSERVO is not set
3111 +# CONFIG_USB_PHIDGET is not set
3112 # CONFIG_USB_IDMOUSE is not set
3113 +# CONFIG_USB_FTDI_ELAN is not set
3114 +# CONFIG_USB_APPLEDISPLAY is not set
3115 +# CONFIG_USB_LD is not set
3116 +# CONFIG_USB_TRANCEVIBRATOR is not set
3117 +# CONFIG_USB_IOWARRIOR is not set
3118 +# CONFIG_USB_TEST is not set
3119
3120 #
3121 # USB DSL modem support
3122 @@ -599,36 +960,51 @@
3123 #
3124 # MMC/SD Card support
3125 #
3126 -# CONFIG_MMC is not set
3127 +CONFIG_MMC=y
3128 +# CONFIG_MMC_DEBUG is not set
3129 +CONFIG_MMC_BLOCK=y
3130 +CONFIG_MMC_AT91=y
3131 +
3132 +#
3133 +# Real Time Clock
3134 +#
3135 +CONFIG_RTC_LIB=y
3136 +# CONFIG_RTC_CLASS is not set
3137
3138 #
3139 # File systems
3140 #
3141 CONFIG_EXT2_FS=y
3142 CONFIG_EXT2_FS_XATTR=y
3143 -# CONFIG_EXT2_FS_POSIX_ACL is not set
3144 -# CONFIG_EXT2_FS_SECURITY is not set
3145 +CONFIG_EXT2_FS_POSIX_ACL=y
3146 +CONFIG_EXT2_FS_SECURITY=y
3147 # CONFIG_EXT2_FS_XIP is not set
3148 CONFIG_EXT3_FS=y
3149 CONFIG_EXT3_FS_XATTR=y
3150 -# CONFIG_EXT3_FS_POSIX_ACL is not set
3151 -# CONFIG_EXT3_FS_SECURITY is not set
3152 +CONFIG_EXT3_FS_POSIX_ACL=y
3153 +CONFIG_EXT3_FS_SECURITY=y
3154 +# CONFIG_EXT4DEV_FS is not set
3155 CONFIG_JBD=y
3156 # CONFIG_JBD_DEBUG is not set
3157 CONFIG_FS_MBCACHE=y
3158 # CONFIG_REISERFS_FS is not set
3159 # CONFIG_JFS_FS is not set
3160 -
3161 -#
3162 -# XFS support
3163 -#
3164 +CONFIG_FS_POSIX_ACL=y
3165 # CONFIG_XFS_FS is not set
3166 +# CONFIG_GFS2_FS is not set
3167 +# CONFIG_OCFS2_FS is not set
3168 # CONFIG_MINIX_FS is not set
3169 # CONFIG_ROMFS_FS is not set
3170 -# CONFIG_QUOTA is not set
3171 +CONFIG_INOTIFY=y
3172 +CONFIG_INOTIFY_USER=y
3173 +CONFIG_QUOTA=y
3174 +# CONFIG_QFMT_V1 is not set
3175 +CONFIG_QFMT_V2=y
3176 +CONFIG_QUOTACTL=y
3177 CONFIG_DNOTIFY=y
3178 -CONFIG_AUTOFS_FS=y
3179 +# CONFIG_AUTOFS_FS is not set
3180 CONFIG_AUTOFS4_FS=y
3181 +# CONFIG_FUSE_FS is not set
3182
3183 #
3184 # CD-ROM/DVD Filesystems
3185 @@ -643,25 +1019,40 @@
3186 CONFIG_MSDOS_FS=y
3187 CONFIG_VFAT_FS=y
3188 CONFIG_FAT_DEFAULT_CODEPAGE=437
3189 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
3190 +CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
3191 # CONFIG_NTFS_FS is not set
3192
3193 #
3194 # Pseudo filesystems
3195 #
3196 CONFIG_PROC_FS=y
3197 +CONFIG_PROC_SYSCTL=y
3198 CONFIG_SYSFS=y
3199 -CONFIG_DEVPTS_FS_XATTR=y
3200 -# CONFIG_DEVPTS_FS_SECURITY is not set
3201 CONFIG_TMPFS=y
3202 -# CONFIG_TMPFS_XATTR is not set
3203 +# CONFIG_TMPFS_POSIX_ACL is not set
3204 # CONFIG_HUGETLB_PAGE is not set
3205 CONFIG_RAMFS=y
3206 +CONFIG_CONFIGFS_FS=y
3207
3208 #
3209 # Miscellaneous filesystems
3210 #
3211 +# CONFIG_ADFS_FS is not set
3212 +# CONFIG_AFFS_FS is not set
3213 +# CONFIG_HFS_FS is not set
3214 # CONFIG_HFSPLUS_FS is not set
3215 +# CONFIG_BEFS_FS is not set
3216 +# CONFIG_BFS_FS is not set
3217 +# CONFIG_EFS_FS is not set
3218 +CONFIG_JFFS2_FS=y
3219 +CONFIG_JFFS2_FS_DEBUG=0
3220 +CONFIG_JFFS2_FS_WRITEBUFFER=y
3221 +# CONFIG_JFFS2_SUMMARY is not set
3222 +# CONFIG_JFFS2_FS_XATTR is not set
3223 +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
3224 +CONFIG_JFFS2_ZLIB=y
3225 +CONFIG_JFFS2_RTIME=y
3226 +# CONFIG_JFFS2_RUBIN is not set
3227 # CONFIG_CRAMFS is not set
3228 # CONFIG_VXFS_FS is not set
3229 # CONFIG_HPFS_FS is not set
3230 @@ -675,16 +1066,23 @@
3231 CONFIG_NFS_FS=y
3232 CONFIG_NFS_V3=y
3233 # CONFIG_NFS_V3_ACL is not set
3234 +CONFIG_NFS_V4=y
3235 +# CONFIG_NFS_DIRECTIO is not set
3236 # CONFIG_NFSD is not set
3237 CONFIG_ROOT_NFS=y
3238 CONFIG_LOCKD=y
3239 CONFIG_LOCKD_V4=y
3240 CONFIG_NFS_COMMON=y
3241 CONFIG_SUNRPC=y
3242 +CONFIG_SUNRPC_GSS=y
3243 +CONFIG_RPCSEC_GSS_KRB5=y
3244 +# CONFIG_RPCSEC_GSS_SPKM3 is not set
3245 # CONFIG_SMB_FS is not set
3246 # CONFIG_CIFS is not set
3247 # CONFIG_NCP_FS is not set
3248 # CONFIG_CODA_FS is not set
3249 +# CONFIG_AFS_FS is not set
3250 +# CONFIG_9P_FS is not set
3251
3252 #
3253 # Partition Types
3254 @@ -734,26 +1132,51 @@
3255 # CONFIG_NLS_ISO8859_15 is not set
3256 # CONFIG_NLS_KOI8_R is not set
3257 # CONFIG_NLS_KOI8_U is not set
3258 -# CONFIG_NLS_UTF8 is not set
3259 +CONFIG_NLS_UTF8=y
3260 +
3261 +#
3262 +# Distributed Lock Manager
3263 +#
3264 +# CONFIG_DLM is not set
3265 +
3266 +#
3267 +# Profiling support
3268 +#
3269 +# CONFIG_PROFILING is not set
3270
3271 #
3272 # Kernel hacking
3273 #
3274 # CONFIG_PRINTK_TIME is not set
3275 +CONFIG_ENABLE_MUST_CHECK=y
3276 +CONFIG_MAGIC_SYSRQ=y
3277 +# CONFIG_UNUSED_SYMBOLS is not set
3278 +# CONFIG_DEBUG_FS is not set
3279 +# CONFIG_HEADERS_CHECK is not set
3280 CONFIG_DEBUG_KERNEL=y
3281 -# CONFIG_MAGIC_SYSRQ is not set
3282 -CONFIG_LOG_BUF_SHIFT=14
3283 +# CONFIG_DEBUG_SHIRQ is not set
3284 +CONFIG_LOG_BUF_SHIFT=17
3285 +CONFIG_DETECT_SOFTLOCKUP=y
3286 # CONFIG_SCHEDSTATS is not set
3287 +# CONFIG_TIMER_STATS is not set
3288 # CONFIG_DEBUG_SLAB is not set
3289 -# CONFIG_DEBUG_SPINLOCK is not set
3290 -# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
3291 +# CONFIG_DEBUG_RT_MUTEXES is not set
3292 +# CONFIG_RT_MUTEX_TESTER is not set
3293 +CONFIG_DEBUG_SPINLOCK=y
3294 +# CONFIG_DEBUG_MUTEXES is not set
3295 +CONFIG_DEBUG_SPINLOCK_SLEEP=y
3296 +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
3297 # CONFIG_DEBUG_KOBJECT is not set
3298 CONFIG_DEBUG_BUGVERBOSE=y
3299 # CONFIG_DEBUG_INFO is not set
3300 -# CONFIG_DEBUG_FS is not set
3301 +# CONFIG_DEBUG_VM is not set
3302 +# CONFIG_DEBUG_LIST is not set
3303 CONFIG_FRAME_POINTER=y
3304 -CONFIG_DEBUG_USER=y
3305 -CONFIG_DEBUG_ERRORS=y
3306 +CONFIG_FORCED_INLINING=y
3307 +# CONFIG_RCU_TORTURE_TEST is not set
3308 +# CONFIG_FAULT_INJECTION is not set
3309 +# CONFIG_DEBUG_USER is not set
3310 +# CONFIG_DEBUG_ERRORS is not set
3311 CONFIG_DEBUG_LL=y
3312 # CONFIG_DEBUG_ICEDCC is not set
3313
3314 @@ -766,7 +1189,43 @@
3315 #
3316 # Cryptographic options
3317 #
3318 -# CONFIG_CRYPTO is not set
3319 +CONFIG_CRYPTO=y
3320 +CONFIG_CRYPTO_ALGAPI=y
3321 +CONFIG_CRYPTO_BLKCIPHER=y
3322 +CONFIG_CRYPTO_HASH=m
3323 +CONFIG_CRYPTO_MANAGER=y
3324 +CONFIG_CRYPTO_HMAC=m
3325 +# CONFIG_CRYPTO_XCBC is not set
3326 +# CONFIG_CRYPTO_NULL is not set
3327 +# CONFIG_CRYPTO_MD4 is not set
3328 +CONFIG_CRYPTO_MD5=y
3329 +# CONFIG_CRYPTO_SHA1 is not set
3330 +# CONFIG_CRYPTO_SHA256 is not set
3331 +# CONFIG_CRYPTO_SHA512 is not set
3332 +# CONFIG_CRYPTO_WP512 is not set
3333 +# CONFIG_CRYPTO_TGR192 is not set
3334 +# CONFIG_CRYPTO_GF128MUL is not set
3335 +# CONFIG_CRYPTO_ECB is not set
3336 +CONFIG_CRYPTO_CBC=y
3337 +CONFIG_CRYPTO_PCBC=m
3338 +# CONFIG_CRYPTO_LRW is not set
3339 +CONFIG_CRYPTO_DES=y
3340 +# CONFIG_CRYPTO_FCRYPT is not set
3341 +# CONFIG_CRYPTO_BLOWFISH is not set
3342 +# CONFIG_CRYPTO_TWOFISH is not set
3343 +# CONFIG_CRYPTO_SERPENT is not set
3344 +# CONFIG_CRYPTO_AES is not set
3345 +# CONFIG_CRYPTO_CAST5 is not set
3346 +# CONFIG_CRYPTO_CAST6 is not set
3347 +# CONFIG_CRYPTO_TEA is not set
3348 +# CONFIG_CRYPTO_ARC4 is not set
3349 +# CONFIG_CRYPTO_KHAZAD is not set
3350 +# CONFIG_CRYPTO_ANUBIS is not set
3351 +# CONFIG_CRYPTO_DEFLATE is not set
3352 +# CONFIG_CRYPTO_MICHAEL_MIC is not set
3353 +# CONFIG_CRYPTO_CRC32C is not set
3354 +# CONFIG_CRYPTO_CAMELLIA is not set
3355 +# CONFIG_CRYPTO_TEST is not set
3356
3357 #
3358 # Hardware crypto devices
3359 @@ -775,6 +1234,14 @@
3360 #
3361 # Library routines
3362 #
3363 +CONFIG_BITREVERSE=y
3364 # CONFIG_CRC_CCITT is not set
3365 +# CONFIG_CRC16 is not set
3366 CONFIG_CRC32=y
3367 # CONFIG_LIBCRC32C is not set
3368 +CONFIG_AUDIT_GENERIC=y
3369 +CONFIG_ZLIB_INFLATE=y
3370 +CONFIG_ZLIB_DEFLATE=y
3371 +CONFIG_PLIST=y
3372 +CONFIG_HAS_IOMEM=y
3373 +CONFIG_HAS_IOPORT=y
3374 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200.c
3375 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200.c 2007-06-17 04:09:12.000000000 +0200
3376 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200.c 2007-07-29 05:23:04.000000000 +0200
3377 @@ -267,6 +267,33 @@
3378
3379
3380 /* --------------------------------------------------------------------
3381 + * Timer/Counter library initialization
3382 + * -------------------------------------------------------------------- */
3383 +#ifdef CONFIG_ATMEL_TCLIB
3384 +
3385 +#include "tclib.h"
3386 +
3387 +static struct atmel_tcblock at91rm9200_tcblocks[] = {
3388 + [0] = {
3389 + .physaddr = AT91RM9200_BASE_TCB0,
3390 + .irq = { AT91RM9200_ID_TC0, AT91RM9200_ID_TC1, AT91RM9200_ID_TC2 },
3391 + .clk = { &tc0_clk, &tc1_clk, &tc2_clk },
3392 + },
3393 + [1] = {
3394 + .physaddr = AT91RM9200_BASE_TCB1,
3395 + .irq = { AT91RM9200_ID_TC3, AT91RM9200_ID_TC4, AT91RM9200_ID_TC5 },
3396 + .clk = { &tc3_clk, &tc4_clk, &tc5_clk },
3397 + },
3398 +};
3399 +
3400 +#define at91rm9200_tc_init() atmel_tc_init(at91rm9200_tcblocks, ARRAY_SIZE(at91rm9200_tcblocks))
3401 +
3402 +#else
3403 +#define at91rm9200_tc_init() do {} while(0)
3404 +#endif
3405 +
3406 +
3407 +/* --------------------------------------------------------------------
3408 * AT91RM9200 processor initialization
3409 * -------------------------------------------------------------------- */
3410 void __init at91rm9200_initialize(unsigned long main_clock, unsigned short banks)
3411 @@ -288,6 +315,9 @@
3412
3413 /* Initialize GPIO subsystem */
3414 at91_gpio_init(at91rm9200_gpio, banks);
3415 +
3416 + /* Initialize the Timer/Counter blocks */
3417 + at91rm9200_tc_init();
3418 }
3419
3420
3421 @@ -301,28 +331,28 @@
3422 static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = {
3423 7, /* Advanced Interrupt Controller (FIQ) */
3424 7, /* System Peripherals */
3425 - 0, /* Parallel IO Controller A */
3426 - 0, /* Parallel IO Controller B */
3427 - 0, /* Parallel IO Controller C */
3428 - 0, /* Parallel IO Controller D */
3429 - 6, /* USART 0 */
3430 - 6, /* USART 1 */
3431 - 6, /* USART 2 */
3432 - 6, /* USART 3 */
3433 + 1, /* Parallel IO Controller A */
3434 + 1, /* Parallel IO Controller B */
3435 + 1, /* Parallel IO Controller C */
3436 + 1, /* Parallel IO Controller D */
3437 + 5, /* USART 0 */
3438 + 5, /* USART 1 */
3439 + 5, /* USART 2 */
3440 + 5, /* USART 3 */
3441 0, /* Multimedia Card Interface */
3442 - 4, /* USB Device Port */
3443 - 0, /* Two-Wire Interface */
3444 - 6, /* Serial Peripheral Interface */
3445 - 5, /* Serial Synchronous Controller 0 */
3446 - 5, /* Serial Synchronous Controller 1 */
3447 - 5, /* Serial Synchronous Controller 2 */
3448 + 2, /* USB Device Port */
3449 + 6, /* Two-Wire Interface */
3450 + 5, /* Serial Peripheral Interface */
3451 + 4, /* Serial Synchronous Controller 0 */
3452 + 4, /* Serial Synchronous Controller 1 */
3453 + 4, /* Serial Synchronous Controller 2 */
3454 0, /* Timer Counter 0 */
3455 0, /* Timer Counter 1 */
3456 0, /* Timer Counter 2 */
3457 0, /* Timer Counter 3 */
3458 0, /* Timer Counter 4 */
3459 0, /* Timer Counter 5 */
3460 - 3, /* USB Host port */
3461 + 2, /* USB Host port */
3462 3, /* Ethernet MAC */
3463 0, /* Advanced Interrupt Controller (IRQ0) */
3464 0, /* Advanced Interrupt Controller (IRQ1) */
3465 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200_devices.c
3466 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91rm9200_devices.c 2007-06-17 04:09:12.000000000 +0200
3467 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91rm9200_devices.c 2007-07-29 05:23:04.000000000 +0200
3468 @@ -477,7 +477,18 @@
3469 * SPI
3470 * -------------------------------------------------------------------- */
3471
3472 -#if defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) || defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE)
3473 +#if defined(CONFIG_AT91_SPI) || defined(CONFIG_AT91_SPI_MODULE) /* legacy SPI driver */
3474 +#define SPI_DEVNAME "at91_spi"
3475 +
3476 +#elif defined(CONFIG_SPI_AT91) || defined(CONFIG_SPI_AT91_MODULE) /* SPI bitbanging driver */
3477 +#define SPI_DEVNAME "at91_spi"
3478 +
3479 +#elif defined(CONFIG_SPI_ATMEL) || defined(CONFIG_SPI_ATMEL_MODULE) /* new SPI driver */
3480 +#define SPI_DEVNAME "atmel_spi"
3481 +
3482 +#endif
3483 +
3484 +#ifdef SPI_DEVNAME
3485 static u64 spi_dmamask = 0xffffffffUL;
3486
3487 static struct resource spi_resources[] = {
3488 @@ -494,7 +505,7 @@
3489 };
3490
3491 static struct platform_device at91rm9200_spi_device = {
3492 - .name = "at91_spi",
3493 + .name = SPI_DEVNAME,
3494 .id = 0,
3495 .dev = {
3496 .dma_mask = &spi_dmamask,
3497 @@ -603,6 +614,32 @@
3498 #endif
3499
3500
3501 +#if defined(CONFIG_NEW_LEDS)
3502 +
3503 +static struct platform_device at91_leds = {
3504 + .name = "at91_leds",
3505 + .id = -1,
3506 +};
3507 +
3508 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
3509 +{
3510 + if (!nr)
3511 + return;
3512 +
3513 + at91_leds.dev.platform_data = leds;
3514 +
3515 + for ( ; nr; nr--, leds++) {
3516 + leds->index = nr; /* first record stores number of leds */
3517 + at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
3518 + }
3519 +
3520 + platform_device_register(&at91_leds);
3521 +}
3522 +#else
3523 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
3524 +#endif
3525 +
3526 +
3527 /* --------------------------------------------------------------------
3528 * UART
3529 * -------------------------------------------------------------------- */
3530 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260.c
3531 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260.c 2007-06-17 04:09:12.000000000 +0200
3532 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260.c 2007-07-29 05:23:04.000000000 +0200
3533 @@ -269,6 +269,33 @@
3534
3535
3536 /* --------------------------------------------------------------------
3537 + * Timer/Counter library initialization
3538 + * -------------------------------------------------------------------- */
3539 +#ifdef CONFIG_ATMEL_TCLIB
3540 +
3541 +#include "tclib.h"
3542 +
3543 +static struct atmel_tcblock at91sam9260_tcblocks[] = {
3544 + [0] = {
3545 + .physaddr = AT91SAM9260_BASE_TCB0,
3546 + .irq = { AT91SAM9260_ID_TC0, AT91SAM9260_ID_TC1, AT91SAM9260_ID_TC2 },
3547 + .clk = { &tc0_clk, &tc1_clk, &tc2_clk },
3548 + },
3549 + [1] = {
3550 + .physaddr = AT91SAM9260_BASE_TCB1,
3551 + .irq = { AT91SAM9260_ID_TC3, AT91SAM9260_ID_TC4, AT91SAM9260_ID_TC5 },
3552 + .clk = { &tc3_clk, &tc4_clk, &tc5_clk },
3553 + },
3554 +};
3555 +
3556 +#define at91sam9260_tc_init() atmel_tc_init(at91sam9260_tcblocks, ARRAY_SIZE(at91sam9260_tcblocks))
3557 +
3558 +#else
3559 +#define at91sam9260_tc_init() do {} while(0)
3560 +#endif
3561 +
3562 +
3563 +/* --------------------------------------------------------------------
3564 * AT91SAM9260 processor initialization
3565 * -------------------------------------------------------------------- */
3566
3567 @@ -315,6 +342,9 @@
3568
3569 /* Register GPIO subsystem */
3570 at91_gpio_init(at91sam9260_gpio, 3);
3571 +
3572 + /* Initialize the Timer/Counter blocks */
3573 + at91sam9260_tc_init();
3574 }
3575
3576 /* --------------------------------------------------------------------
3577 @@ -327,30 +357,30 @@
3578 static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {
3579 7, /* Advanced Interrupt Controller */
3580 7, /* System Peripherals */
3581 - 0, /* Parallel IO Controller A */
3582 - 0, /* Parallel IO Controller B */
3583 - 0, /* Parallel IO Controller C */
3584 + 1, /* Parallel IO Controller A */
3585 + 1, /* Parallel IO Controller B */
3586 + 1, /* Parallel IO Controller C */
3587 0, /* Analog-to-Digital Converter */
3588 - 6, /* USART 0 */
3589 - 6, /* USART 1 */
3590 - 6, /* USART 2 */
3591 + 5, /* USART 0 */
3592 + 5, /* USART 1 */
3593 + 5, /* USART 2 */
3594 0, /* Multimedia Card Interface */
3595 - 4, /* USB Device Port */
3596 - 0, /* Two-Wire Interface */
3597 - 6, /* Serial Peripheral Interface 0 */
3598 - 6, /* Serial Peripheral Interface 1 */
3599 + 2, /* USB Device Port */
3600 + 6, /* Two-Wire Interface */
3601 + 5, /* Serial Peripheral Interface 0 */
3602 + 5, /* Serial Peripheral Interface 1 */
3603 5, /* Serial Synchronous Controller */
3604 0,
3605 0,
3606 0, /* Timer Counter 0 */
3607 0, /* Timer Counter 1 */
3608 0, /* Timer Counter 2 */
3609 - 3, /* USB Host port */
3610 + 2, /* USB Host port */
3611 3, /* Ethernet */
3612 0, /* Image Sensor Interface */
3613 - 6, /* USART 3 */
3614 - 6, /* USART 4 */
3615 - 6, /* USART 5 */
3616 + 5, /* USART 3 */
3617 + 5, /* USART 4 */
3618 + 5, /* USART 5 */
3619 0, /* Timer Counter 3 */
3620 0, /* Timer Counter 4 */
3621 0, /* Timer Counter 5 */
3622 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260_devices.c
3623 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9260_devices.c 2007-06-17 04:09:12.000000000 +0200
3624 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9260_devices.c 2007-07-29 05:23:04.000000000 +0200
3625 @@ -524,6 +524,32 @@
3626 #endif
3627
3628
3629 +#if defined(CONFIG_NEW_LEDS)
3630 +
3631 +static struct platform_device at91_leds = {
3632 + .name = "at91_leds",
3633 + .id = -1,
3634 +};
3635 +
3636 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
3637 +{
3638 + if (!nr)
3639 + return;
3640 +
3641 + at91_leds.dev.platform_data = leds;
3642 +
3643 + for ( ; nr; nr--, leds++) {
3644 + leds->index = nr; /* first record stores number of leds */
3645 + at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
3646 + }
3647 +
3648 + platform_device_register(&at91_leds);
3649 +}
3650 +#else
3651 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
3652 +#endif
3653 +
3654 +
3655 /* --------------------------------------------------------------------
3656 * UART
3657 * -------------------------------------------------------------------- */
3658 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261.c
3659 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261.c 2007-06-17 04:09:12.000000000 +0200
3660 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261.c 2007-07-29 05:23:04.000000000 +0200
3661 @@ -247,6 +247,28 @@
3662
3663
3664 /* --------------------------------------------------------------------
3665 + * Timer/Counter library initialization
3666 + * -------------------------------------------------------------------- */
3667 +#ifdef CONFIG_ATMEL_TCLIB
3668 +
3669 +#include "tclib.h"
3670 +
3671 +static struct atmel_tcblock at91sam9261_tcblocks[] = {
3672 + [0] = {
3673 + .physaddr = AT91SAM9261_BASE_TCB0,
3674 + .irq = { AT91SAM9261_ID_TC0, AT91SAM9261_ID_TC1, AT91SAM9261_ID_TC2 },
3675 + .clk = { &tc0_clk, &tc1_clk, &tc2_clk },
3676 + }
3677 +};
3678 +
3679 +#define at91sam9261_tc_init() atmel_tc_init(at91sam9261_tcblocks, ARRAY_SIZE(at91sam9261_tcblocks))
3680 +
3681 +#else
3682 +#define at91sam9261_tc_init() do {} while(0)
3683 +#endif
3684 +
3685 +
3686 +/* --------------------------------------------------------------------
3687 * AT91SAM9261 processor initialization
3688 * -------------------------------------------------------------------- */
3689
3690 @@ -267,6 +289,9 @@
3691
3692 /* Register GPIO subsystem */
3693 at91_gpio_init(at91sam9261_gpio, 3);
3694 +
3695 + /* Initialize the Timer/Counter blocks */
3696 + at91sam9261_tc_init();
3697 }
3698
3699 /* --------------------------------------------------------------------
3700 @@ -279,25 +304,25 @@
3701 static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {
3702 7, /* Advanced Interrupt Controller */
3703 7, /* System Peripherals */
3704 - 0, /* Parallel IO Controller A */
3705 - 0, /* Parallel IO Controller B */
3706 - 0, /* Parallel IO Controller C */
3707 - 0,
3708 - 6, /* USART 0 */
3709 - 6, /* USART 1 */
3710 - 6, /* USART 2 */
3711 + 1, /* Parallel IO Controller A */
3712 + 1, /* Parallel IO Controller B */
3713 + 1, /* Parallel IO Controller C */
3714 + 0,
3715 + 5, /* USART 0 */
3716 + 5, /* USART 1 */
3717 + 5, /* USART 2 */
3718 0, /* Multimedia Card Interface */
3719 - 4, /* USB Device Port */
3720 - 0, /* Two-Wire Interface */
3721 - 6, /* Serial Peripheral Interface 0 */
3722 - 6, /* Serial Peripheral Interface 1 */
3723 - 5, /* Serial Synchronous Controller 0 */
3724 - 5, /* Serial Synchronous Controller 1 */
3725 - 5, /* Serial Synchronous Controller 2 */
3726 + 2, /* USB Device Port */
3727 + 6, /* Two-Wire Interface */
3728 + 5, /* Serial Peripheral Interface 0 */
3729 + 5, /* Serial Peripheral Interface 1 */
3730 + 4, /* Serial Synchronous Controller 0 */
3731 + 4, /* Serial Synchronous Controller 1 */
3732 + 4, /* Serial Synchronous Controller 2 */
3733 0, /* Timer Counter 0 */
3734 0, /* Timer Counter 1 */
3735 0, /* Timer Counter 2 */
3736 - 3, /* USB Host port */
3737 + 2, /* USB Host port */
3738 3, /* LCD Controller */
3739 0,
3740 0,
3741 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261_devices.c
3742 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9261_devices.c 2007-06-17 04:09:12.000000000 +0200
3743 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9261_devices.c 2007-07-29 05:23:04.000000000 +0200
3744 @@ -14,6 +14,9 @@
3745 #include <asm/mach/map.h>
3746
3747 #include <linux/platform_device.h>
3748 +#include <linux/fb.h>
3749 +
3750 +#include <video/atmel_lcdc.h>
3751
3752 #include <asm/arch/board.h>
3753 #include <asm/arch/gpio.h>
3754 @@ -522,6 +525,32 @@
3755 #endif
3756
3757
3758 +#if defined(CONFIG_NEW_LEDS)
3759 +
3760 +static struct platform_device at91_leds = {
3761 + .name = "at91_leds",
3762 + .id = -1,
3763 +};
3764 +
3765 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
3766 +{
3767 + if (!nr)
3768 + return;
3769 +
3770 + at91_leds.dev.platform_data = leds;
3771 +
3772 + for ( ; nr; nr--, leds++) {
3773 + leds->index = nr; /* first record stores number of leds */
3774 + at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
3775 + }
3776 +
3777 + platform_device_register(&at91_leds);
3778 +}
3779 +#else
3780 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
3781 +#endif
3782 +
3783 +
3784 /* --------------------------------------------------------------------
3785 * UART
3786 * -------------------------------------------------------------------- */
3787 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263.c
3788 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263.c 2007-06-17 04:09:12.000000000 +0200
3789 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263.c 2007-07-29 05:23:04.000000000 +0200
3790 @@ -273,6 +273,28 @@
3791
3792
3793 /* --------------------------------------------------------------------
3794 + * Timer/Counter library initialization
3795 + * -------------------------------------------------------------------- */
3796 +#ifdef CONFIG_ATMEL_TCLIB
3797 +
3798 +#include "tclib.h"
3799 +
3800 +static struct atmel_tcblock at91sam9263_tcblocks[] = {
3801 + [0] = {
3802 + .physaddr = AT91SAM9263_BASE_TCB0,
3803 + .irq = { AT91SAM9263_ID_TCB, AT91SAM9263_ID_TCB, AT91SAM9263_ID_TCB },
3804 + .clk = { &tcb_clk, &tcb_clk, &tcb_clk },
3805 + }
3806 +};
3807 +
3808 +#define at91sam9263_tc_init() atmel_tc_init(at91sam9263_tcblocks, ARRAY_SIZE(at91sam9263_tcblocks))
3809 +
3810 +#else
3811 +#define at91sam9263_tc_init() do {} while(0)
3812 +#endif
3813 +
3814 +
3815 +/* --------------------------------------------------------------------
3816 * AT91SAM9263 processor initialization
3817 * -------------------------------------------------------------------- */
3818
3819 @@ -292,6 +314,9 @@
3820
3821 /* Register GPIO subsystem */
3822 at91_gpio_init(at91sam9263_gpio, 5);
3823 +
3824 + /* Initialize the Timer/Counter blocks */
3825 + at91sam9263_tc_init();
3826 }
3827
3828 /* --------------------------------------------------------------------
3829 @@ -304,34 +329,34 @@
3830 static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {
3831 7, /* Advanced Interrupt Controller (FIQ) */
3832 7, /* System Peripherals */
3833 - 0, /* Parallel IO Controller A */
3834 - 0, /* Parallel IO Controller B */
3835 - 0, /* Parallel IO Controller C, D and E */
3836 + 1, /* Parallel IO Controller A */
3837 + 1, /* Parallel IO Controller B */
3838 + 1, /* Parallel IO Controller C, D and E */
3839 0,
3840 0,
3841 - 6, /* USART 0 */
3842 - 6, /* USART 1 */
3843 - 6, /* USART 2 */
3844 + 5, /* USART 0 */
3845 + 5, /* USART 1 */
3846 + 5, /* USART 2 */
3847 0, /* Multimedia Card Interface 0 */
3848 0, /* Multimedia Card Interface 1 */
3849 - 4, /* CAN */
3850 - 0, /* Two-Wire Interface */
3851 - 6, /* Serial Peripheral Interface 0 */
3852 - 6, /* Serial Peripheral Interface 1 */
3853 - 5, /* Serial Synchronous Controller 0 */
3854 - 5, /* Serial Synchronous Controller 1 */
3855 - 6, /* AC97 Controller */
3856 + 3, /* CAN */
3857 + 6, /* Two-Wire Interface */
3858 + 5, /* Serial Peripheral Interface 0 */
3859 + 5, /* Serial Peripheral Interface 1 */
3860 + 4, /* Serial Synchronous Controller 0 */
3861 + 4, /* Serial Synchronous Controller 1 */
3862 + 5, /* AC97 Controller */
3863 0, /* Timer Counter 0, 1 and 2 */
3864 0, /* Pulse Width Modulation Controller */
3865 3, /* Ethernet */
3866 0,
3867 0, /* 2D Graphic Engine */
3868 - 3, /* USB Device Port */
3869 + 2, /* USB Device Port */
3870 0, /* Image Sensor Interface */
3871 3, /* LDC Controller */
3872 0, /* DMA Controller */
3873 0,
3874 - 3, /* USB Host port */
3875 + 2, /* USB Host port */
3876 0, /* Advanced Interrupt Controller (IRQ0) */
3877 0, /* Advanced Interrupt Controller (IRQ1) */
3878 };
3879 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263_devices.c
3880 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9263_devices.c 2007-06-17 04:09:12.000000000 +0200
3881 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9263_devices.c 2007-07-29 05:23:04.000000000 +0200
3882 @@ -13,6 +13,9 @@
3883 #include <asm/mach/map.h>
3884
3885 #include <linux/platform_device.h>
3886 +#include <linux/fb.h>
3887 +
3888 +#include <video/atmel_lcdc.h>
3889
3890 #include <asm/arch/board.h>
3891 #include <asm/arch/gpio.h>
3892 @@ -625,6 +628,56 @@
3893
3894
3895 /* --------------------------------------------------------------------
3896 + * Image Sensor Interface
3897 + * -------------------------------------------------------------------- */
3898 +
3899 +#if defined(CONFIG_VIDEO_AT91_ISI) || defined(CONFIG_VIDEO_AT91_ISI_MODULE)
3900 +
3901 +struct resource isi_resources[] = {
3902 + [0] = {
3903 + .start = AT91SAM9263_BASE_ISI,
3904 + .end = AT91SAM9263_BASE_ISI + SZ_16K - 1,
3905 + .flags = IORESOURCE_MEM,
3906 + },
3907 + [1] = {
3908 + .start = AT91SAM9263_ID_ISI,
3909 + .end = AT91SAM9263_ID_ISI,
3910 + .flags = IORESOURCE_IRQ,
3911 + },
3912 +};
3913 +
3914 +static struct platform_device at91sam9263_isi_device = {
3915 + .name = "at91_isi",
3916 + .id = -1,
3917 + .resource = isi_resources,
3918 + .num_resources = ARRAY_SIZE(isi_resources),
3919 +};
3920 +
3921 +void __init at91_add_device_isi(void)
3922 +{
3923 + at91_set_A_periph(AT91_PIN_PE0, 0); /* ISI_D0 */
3924 + at91_set_A_periph(AT91_PIN_PE1, 0); /* ISI_D1 */
3925 + at91_set_A_periph(AT91_PIN_PE2, 0); /* ISI_D2 */
3926 + at91_set_A_periph(AT91_PIN_PE3, 0); /* ISI_D3 */
3927 + at91_set_A_periph(AT91_PIN_PE4, 0); /* ISI_D4 */
3928 + at91_set_A_periph(AT91_PIN_PE5, 0); /* ISI_D5 */
3929 + at91_set_A_periph(AT91_PIN_PE6, 0); /* ISI_D6 */
3930 + at91_set_A_periph(AT91_PIN_PE7, 0); /* ISI_D7 */
3931 + at91_set_A_periph(AT91_PIN_PE8, 0); /* ISI_PCK */
3932 + at91_set_A_periph(AT91_PIN_PE9, 0); /* ISI_HSYNC */
3933 + at91_set_A_periph(AT91_PIN_PE10, 0); /* ISI_VSYNC */
3934 + at91_set_B_periph(AT91_PIN_PE11, 0); /* ISI_MCK (PCK3) */
3935 + at91_set_B_periph(AT91_PIN_PE12, 0); /* ISI_PD8 */
3936 + at91_set_B_periph(AT91_PIN_PE13, 0); /* ISI_PD9 */
3937 + at91_set_B_periph(AT91_PIN_PE14, 0); /* ISI_PD10 */
3938 + at91_set_B_periph(AT91_PIN_PE15, 0); /* ISI_PD11 */
3939 +}
3940 +#else
3941 +void __init at91_add_device_isi(void) {}
3942 +#endif
3943 +
3944 +
3945 +/* --------------------------------------------------------------------
3946 * LCD Controller
3947 * -------------------------------------------------------------------- */
3948
3949 @@ -715,6 +768,32 @@
3950 #endif
3951
3952
3953 +#if defined(CONFIG_NEW_LEDS)
3954 +
3955 +static struct platform_device at91_leds = {
3956 + .name = "at91_leds",
3957 + .id = -1,
3958 +};
3959 +
3960 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
3961 +{
3962 + if (!nr)
3963 + return;
3964 +
3965 + at91_leds.dev.platform_data = leds;
3966 +
3967 + for ( ; nr; nr--, leds++) {
3968 + leds->index = nr; /* first record stores number of leds */
3969 + at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
3970 + }
3971 +
3972 + platform_device_register(&at91_leds);
3973 +}
3974 +#else
3975 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
3976 +#endif
3977 +
3978 +
3979 /* --------------------------------------------------------------------
3980 * UART
3981 * -------------------------------------------------------------------- */
3982 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl.c
3983 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl.c 2007-06-17 04:09:12.000000000 +0200
3984 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl.c 2007-07-29 05:23:04.000000000 +0200
3985 @@ -246,6 +246,28 @@
3986
3987
3988 /* --------------------------------------------------------------------
3989 + * Timer/Counter library initialization
3990 + * -------------------------------------------------------------------- */
3991 +#ifdef CONFIG_ATMEL_TCLIB
3992 +
3993 +#include "tclib.h"
3994 +
3995 +static struct atmel_tcblock at91sam9rl_tcblocks[] = {
3996 + [0] = {
3997 + .physaddr = AT91SAM9RL_BASE_TCB0,
3998 + .irq = { AT91SAM9RL_ID_TC0, AT91SAM9RL_ID_TC1, AT91SAM9RL_ID_TC2 },
3999 + .clk = { &tc0_clk, &tc1_clk, &tc2_clk },
4000 + }
4001 +};
4002 +
4003 +#define at91sam9rl_tc_init() atmel_tc_init(at91sam9rl_tcblocks, ARRAY_SIZE(at91sam9rl_tcblocks))
4004 +
4005 +#else
4006 +#define at91sam9rl_tc_init() do {} while(0)
4007 +#endif
4008 +
4009 +
4010 +/* --------------------------------------------------------------------
4011 * AT91SAM9RL processor initialization
4012 * -------------------------------------------------------------------- */
4013
4014 @@ -284,6 +306,9 @@
4015
4016 /* Register GPIO subsystem */
4017 at91_gpio_init(at91sam9rl_gpio, 4);
4018 +
4019 + /* Initialize the Timer/Counter blocks */
4020 + at91sam9rl_tc_init();
4021 }
4022
4023 /* --------------------------------------------------------------------
4024 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl_devices.c linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl_devices.c
4025 --- linux-2.6.22-rc5/arch/arm/mach-at91/at91sam9rl_devices.c 2007-06-17 04:09:12.000000000 +0200
4026 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/at91sam9rl_devices.c 2007-07-29 05:23:04.000000000 +0200
4027 @@ -370,6 +370,32 @@
4028 #endif
4029
4030
4031 +#if defined(CONFIG_NEW_LEDS)
4032 +
4033 +static struct platform_device at91_leds = {
4034 + .name = "at91_leds",
4035 + .id = -1,
4036 +};
4037 +
4038 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr)
4039 +{
4040 + if (!nr)
4041 + return;
4042 +
4043 + at91_leds.dev.platform_data = leds;
4044 +
4045 + for ( ; nr; nr--, leds++) {
4046 + leds->index = nr; /* first record stores number of leds */
4047 + at91_set_gpio_output(leds->gpio, (leds->flags & 1) == 0);
4048 + }
4049 +
4050 + platform_device_register(&at91_leds);
4051 +}
4052 +#else
4053 +void __init at91_gpio_leds(struct at91_gpio_led *leds, int nr) {}
4054 +#endif
4055 +
4056 +
4057 /* --------------------------------------------------------------------
4058 * UART
4059 * -------------------------------------------------------------------- */
4060 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-cam60.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-cam60.c
4061 --- linux-2.6.22-rc5/arch/arm/mach-at91/board-cam60.c 1970-01-01 01:00:00.000000000 +0100
4062 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-cam60.c 2007-07-29 05:23:04.000000000 +0200
4063 @@ -0,0 +1,148 @@
4064 +/*
4065 + * KwikByte CAM60
4066 + *
4067 + * based on board-sam9260ek.c
4068 + * Copyright (C) 2005 SAN People
4069 + * Copyright (C) 2006 Atmel
4070 + *
4071 + * This program is free software; you can redistribute it and/or modify
4072 + * it under the terms of the GNU General Public License as published by
4073 + * the Free Software Foundation; either version 2 of the License, or
4074 + * (at your option) any later version.
4075 + *
4076 + * This program is distributed in the hope that it will be useful,
4077 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4078 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4079 + * GNU General Public License for more details.
4080 + *
4081 + * You should have received a copy of the GNU General Public License
4082 + * along with this program; if not, write to the Free Software
4083 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4084 + */
4085 +
4086 +#include <linux/types.h>
4087 +#include <linux/init.h>
4088 +#include <linux/mm.h>
4089 +#include <linux/module.h>
4090 +#include <linux/platform_device.h>
4091 +#include <linux/spi/spi.h>
4092 +#include <linux/spi/flash.h>
4093 +
4094 +#include <asm/hardware.h>
4095 +#include <asm/setup.h>
4096 +#include <asm/mach-types.h>
4097 +#include <asm/irq.h>
4098 +
4099 +#include <asm/mach/arch.h>
4100 +#include <asm/mach/map.h>
4101 +#include <asm/mach/irq.h>
4102 +
4103 +#include <asm/arch/board.h>
4104 +#include <asm/arch/gpio.h>
4105 +#include <asm/arch/at91sam926x_mc.h>
4106 +
4107 +#include "generic.h"
4108 +
4109 +
4110 +/*
4111 + * Serial port configuration.
4112 + * 0 .. 5 = USART0 .. USART5
4113 + * 6 = DBGU
4114 + */
4115 +static struct at91_uart_config __initdata cam60_uart_config = {
4116 + .console_tty = 0, /* ttyS0 */
4117 + .nr_tty = 1,
4118 + .tty_map = { 6, -1, -1, -1, -1, -1, -1 } /* ttyS0, ..., ttyS6 */
4119 +};
4120 +
4121 +static void __init cam60_map_io(void)
4122 +{
4123 + /* Initialize processor: 10 MHz crystal */
4124 + at91sam9260_initialize(10000000);
4125 +
4126 + /* Setup the serial ports and console */
4127 + at91_init_serial(&cam60_uart_config);
4128 +}
4129 +
4130 +static void __init cam60_init_irq(void)
4131 +{
4132 + at91sam9260_init_interrupts(NULL);
4133 +}
4134 +
4135 +
4136 +/*
4137 + * SPI devices.
4138 + */
4139 +#if defined(CONFIG_MTD_DATAFLASH)
4140 +static struct mtd_partition __initdata cam60_spi_partitions[] = {
4141 + {
4142 + .name = "BOOT1",
4143 + .offset = 0,
4144 + .size = 4 * 1056,
4145 + },
4146 + {
4147 + .name = "BOOT2",
4148 + .offset = MTDPART_OFS_NXTBLK,
4149 + .size = 256 * 1056,
4150 + },
4151 + {
4152 + .name = "kernel",
4153 + .offset = MTDPART_OFS_NXTBLK,
4154 + .size = 2222 * 1056,
4155 + },
4156 + {
4157 + .name = "file system",
4158 + .offset = MTDPART_OFS_NXTBLK,
4159 + .size = MTDPART_SIZ_FULL,
4160 + },
4161 +};
4162 +
4163 +static struct flash_platform_data __initdata cam60_spi_flash_platform_data = {
4164 + .name = "spi_flash",
4165 + .parts = cam60_spi_partitions,
4166 + .nr_parts = ARRAY_SIZE(cam60_spi_partitions)
4167 +};
4168 +#endif
4169 +
4170 +static struct spi_board_info cam60_spi_devices[] = {
4171 +#if defined(CONFIG_MTD_DATAFLASH)
4172 + { /* DataFlash chip */
4173 + .modalias = "mtd_dataflash",
4174 + .chip_select = 0,
4175 + .max_speed_hz = 15 * 1000 * 1000,
4176 + .bus_num = 0,
4177 + .platform_data = &cam60_spi_flash_platform_data
4178 + },
4179 +#endif
4180 +};
4181 +
4182 +
4183 +/*
4184 + * MACB Ethernet device
4185 + */
4186 +static struct __initdata at91_eth_data cam60_macb_data = {
4187 + .phy_irq_pin = AT91_PIN_PB5,
4188 + .is_rmii = 0,
4189 +};
4190 +
4191 +
4192 +static void __init cam60_board_init(void)
4193 +{
4194 + /* Serial */
4195 + at91_add_device_serial();
4196 + /* SPI */
4197 + at91_add_device_spi(cam60_spi_devices, ARRAY_SIZE(cam60_spi_devices));
4198 + /* Ethernet */
4199 + at91_add_device_eth(&cam60_macb_data);
4200 +}
4201 +
4202 +MACHINE_START(CAM60, "KwikByte CAM60")
4203 + /* Maintainer: KwikByte */
4204 + .phys_io = AT91_BASE_SYS,
4205 + .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
4206 + .boot_params = AT91_SDRAM_BASE + 0x100,
4207 + .timer = &at91sam926x_timer,
4208 + .map_io = cam60_map_io,
4209 + .init_irq = cam60_init_irq,
4210 + .init_machine = cam60_board_init,
4211 +MACHINE_END
4212 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-chub.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-chub.c
4213 --- linux-2.6.22-rc5/arch/arm/mach-at91/board-chub.c 1970-01-01 01:00:00.000000000 +0100
4214 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-chub.c 2007-07-29 05:23:04.000000000 +0200
4215 @@ -0,0 +1,132 @@
4216 +/*
4217 + * linux/arch/arm/mach-at91/board-chub.c
4218 + *
4219 + * Copyright (C) 2005 SAN People, adapted for Promwad Chub board
4220 + * by Kuten Ivan
4221 + *
4222 + * This program is free software; you can redistribute it and/or modify
4223 + * it under the terms of the GNU General Public License as published by
4224 + * the Free Software Foundation; either version 2 of the License, or
4225 + * (at your option) any later version.
4226 + *
4227 + * This program is distributed in the hope that it will be useful,
4228 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
4229 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4230 + * GNU General Public License for more details.
4231 + *
4232 + * You should have received a copy of the GNU General Public License
4233 + * along with this program; if not, write to the Free Software
4234 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
4235 + */
4236 +
4237 +#include <linux/types.h>
4238 +#include <linux/init.h>
4239 +#include <linux/mm.h>
4240 +#include <linux/module.h>
4241 +#include <linux/platform_device.h>
4242 +
4243 +#include <asm/hardware.h>
4244 +#include <asm/setup.h>
4245 +#include <asm/mach-types.h>
4246 +#include <asm/irq.h>
4247 +
4248 +#include <asm/mach/arch.h>
4249 +#include <asm/mach/map.h>
4250 +#include <asm/mach/irq.h>
4251 +
4252 +#include <asm/arch/board.h>
4253 +#include <asm/arch/gpio.h>
4254 +
4255 +#include "generic.h"
4256 +
4257 +/*
4258 + * Serial port configuration.
4259 + * 0 .. 3 = USART0 .. USART3
4260 + * 4 = DBGU
4261 + */
4262 +static struct at91_uart_config __initdata chub_uart_config = {
4263 + .console_tty = 0, /* ttyS0 */
4264 + .nr_tty = 5,
4265 + .tty_map = { 4, 0, 1, 2, 3 } /* ttyS0, ..., ttyS4 */
4266 +};
4267 +
4268 +static void __init chub_init_irq(void)
4269 +{
4270 + at91rm9200_init_interrupts(NULL);
4271 +}
4272 +
4273 +static void __init chub_map_io(void)
4274 +{
4275 + /* Initialize clocks: 18.432 MHz crystal */
4276 + at91rm9200_initialize(18432000, AT91RM9200_PQFP);
4277 +
4278 + /* Setup the serial ports and console */
4279 + at91_init_serial(&chub_uart_config);
4280 +}
4281 +
4282 +static struct at91_eth_data __initdata chub_eth_data = {
4283 + .phy_irq_pin = AT91_PIN_PB29,
4284 + .is_rmii = 0,
4285 +};
4286 +
4287 +static struct mtd_partition __initdata chub_nand_partition[] = {
4288 + {
4289 + .name = "NAND Partition 1",
4290 + .offset = 0,
4291 + .size = MTDPART_SIZ_FULL,
4292 + },
4293 +};
4294 +
4295 +static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
4296 +{
4297 + *num_partitions = ARRAY_SIZE(chub_nand_partition);
4298 + return chub_nand_partition;
4299 +}
4300 +
4301 +static struct at91_nand_data __initdata chub_nand_data = {
4302 + .ale = 22,
4303 + .cle = 21,
4304 + .enable_pin = AT91_PIN_PA27,
4305 + .partition_info = nand_partitions,
4306 +};
4307 +
4308 +static struct spi_board_info chub_spi_devices[] = {
4309 + { /* DataFlash chip */
4310 + .modalias = "mtd_dataflash",
4311 + .chip_select = 0,
4312 + .max_speed_hz = 15 * 1000 * 1000,
4313 + },
4314 +};
4315 +
4316 +static void __init chub_board_init(void)
4317 +{
4318 + /* Serial */
4319 + at91_add_device_serial();
4320 + /* I2C */
4321 + at91_add_device_i2c();
4322 + /* Ethernet */
4323 + at91_add_device_eth(&chub_eth_data);
4324 + /* SPI */
4325 + at91_add_device_spi(chub_spi_devices, ARRAY_SIZE(chub_spi_devices));
4326 + /* NAND Flash */
4327 + at91_add_device_nand(&chub_nand_data);
4328 + /* Disable write protect for NAND */
4329 + at91_set_gpio_output(AT91_PIN_PB7, 1);
4330 + /* Power enable for 3x RS-232 and 1x RS-485 */
4331 + at91_set_gpio_output(AT91_PIN_PB9, 1);
4332 + /* Disable write protect for FRAM */
4333 + at91_set_gpio_output(AT91_PIN_PA21, 1);
4334 + /* Disable write protect for Dataflash */
4335 + at91_set_gpio_output(AT91_PIN_PA19, 1);
4336 +}
4337 +
4338 +MACHINE_START(CHUB, "Promwad Chub")
4339 + /* Maintainer: Ivan Kuten AT Promwad DOT com */
4340 + .phys_io = AT91_BASE_SYS,
4341 + .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc,
4342 + .boot_params = AT91_SDRAM_BASE + 0x100,
4343 + .timer = &at91rm9200_timer,
4344 + .map_io = chub_map_io,
4345 + .init_irq = chub_init_irq,
4346 + .init_machine = chub_board_init,
4347 +MACHINE_END
4348 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-csb337.c
4349 --- linux-2.6.22-rc5/arch/arm/mach-at91/board-csb337.c 2007-06-17 04:09:12.000000000 +0200
4350 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-csb337.c 2007-07-29 05:23:04.000000000 +0200
4351 @@ -24,6 +24,7 @@
4352 #include <linux/module.h>
4353 #include <linux/platform_device.h>
4354 #include <linux/spi/spi.h>
4355 +#include <linux/interrupt.h>
4356 #include <linux/mtd/physmap.h>
4357
4358 #include <asm/hardware.h>
4359 @@ -59,6 +60,7 @@
4360
4361 /* Setup the LEDs */
4362 at91_init_leds(AT91_PIN_PB0, AT91_PIN_PB1);
4363 + at91_set_gpio_output(AT91_PIN_PB2, 1); /* third (unused) LED */
4364
4365 /* Setup the serial ports and console */
4366 at91_init_serial(&csb337_uart_config);
4367 @@ -149,6 +151,55 @@
4368 .num_resources = ARRAY_SIZE(csb_flash_resources),
4369 };
4370
4371 +static struct at91_gpio_led csb337_leds[] = {
4372 + {
4373 + .name = "led0",
4374 + .gpio = AT91_PIN_PB0,
4375 + .trigger = "heartbeat",
4376 + },
4377 + {
4378 + .name = "led1",
4379 + .gpio = AT91_PIN_PB1,
4380 + .trigger = "timer",
4381 + },
4382 + {
4383 + .name = "led2",
4384 + .gpio = AT91_PIN_PB2,
4385 + }
4386 +};
4387 +
4388 +#if defined(CONFIG_CSB300_WAKE_SW0) || defined(CONFIG_CSB300_WAKE_SW1)
4389 +static irqreturn_t switch_irq_handler(int irq, void *context)
4390 +{
4391 + return IRQ_HANDLED;
4392 +}
4393 +
4394 +static inline void __init switch_irq_setup(int irq, char *name, unsigned long mode)
4395 +{
4396 + int res;
4397 +
4398 + res = request_irq(irq, switch_irq_handler, IRQF_SAMPLE_RANDOM | mode, name, NULL);
4399 + if (res == 0)
4400 + enable_irq_wake(irq);
4401 +}
4402 +
4403 +static void __init csb300_switches(void)
4404 +{
4405 +#ifdef CONFIG_CSB300_WAKE_SW0
4406 + at91_set_A_periph(AT91_PIN_PB29, 1); /* IRQ0 */
4407 + switch_irq_setup(AT91RM9200_ID_IRQ0, "csb300_sw0", IRQF_TRIGGER_FALLING);
4408 +#endif
4409 +#ifdef CONFIG_CSB300_WAKE_SW1
4410 + at91_set_gpio_input(AT91_PIN_PB28, 1);
4411 + at91_set_deglitch(AT91_PIN_PB28, 1);
4412 + switch_irq_setup(AT91_PIN_PB28, "csb300_sw1", IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING);
4413 +#endif
4414 + /* there's also SW2 at PA21, GPIO or TIOA2 */
4415 +}
4416 +#else
4417 +static void __init csb300_switches(void) {}
4418 +#endif
4419 +
4420 static void __init csb337_board_init(void)
4421 {
4422 /* Serial */
4423 @@ -168,8 +219,12 @@
4424 at91_add_device_spi(csb337_spi_devices, ARRAY_SIZE(csb337_spi_devices));
4425 /* MMC */
4426 at91_add_device_mmc(0, &csb337_mmc_data);
4427 + /* LEDS */
4428 + at91_gpio_leds(csb337_leds, ARRAY_SIZE(csb337_leds));
4429 /* NOR flash */
4430 platform_device_register(&csb_flash);
4431 + /* Switches on CSB300 */
4432 + csb300_switches();
4433 }
4434
4435 MACHINE_START(CSB337, "Cogent CSB337")
4436 diff -urN linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c linux-2.6.22-rc5.new/arch/arm/mach-at91/board-dk.c
4437 --- linux-2.6.22-rc5/arch/arm/mach-at91/board-dk.c 2007-06-17 04:09:12.000000000 +0200
4438 +++ linux-2.6.22-rc5.new/arch/arm/mach-at91/board-dk.c 2007-07-29 05:23:04.000000000 +0200
4439 @@ -73,6 +73,185 @@
4440 at91rm9200_init_interrupts(NULL);
4441 }
4442
4443 +#if defined(CONFIG_FB_S1D13XXX) || defined(CONFIG_FB_S1D13XXX_MODULE)
4444 +#include <video/s1d13xxxfb.h>
4445 +#include <asm/arch/ics1523.h>
4446 +
4447 +/* EPSON S1D13806 FB */