aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-15 19:16:31 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-15 19:16:31 -0400
commit902233ee494f9d9da6dbb818316fcbf892bebbed (patch)
treeb3fcfbd1c757851a562ef0921cab4e1b3e2d9f19 /arch
parente871e3c268a26c35ad805196a01d84a55bb755c6 (diff)
parentc5760abde715dcd9ead66769e45d1896332e9d9c (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (30 commits) Blackfin SMC91X ethernet supporting driver: SMC91C111 LEDs are note drived in the kernel like in uboot Blackfin SPI driver: fix bug SPI DMA incomplete transmission Blackfin SPI driver: tweak spi cleanup function to match newer kernel changes Blackfin RTC drivers: update MAINTAINERS information Blackfin serial driver: decouple PARODD and CMSPAR checking from PARENB Blackfin serial driver: actually implement the break_ctl() function Blackfin serial driver: ignore framing and parity errors Blackfin serial driver: hook up our UARTs STP bit with userspaces CMSPAR Blackfin arch: move HI/LO macros into blackfin.h and punt the rest of macros.h as it includes VDSP macros we never use Blackfin arch: redo our linker script a bit Blackfin arch: make sure we initialize our L1 Data B section properly based on the linked kernel Blackfin arch: fix bug can not wakeup from sleep via push buttons Blackfin arch: add support for Alon Bar-Lev's dynamic kernel command-line Blackfin arch: add missing gpio.h header to fix compiling in some pm configurations Blackfin arch: As Mike pointed out range goes form m..MAX_BLACKFIN_GPIO -1 Blackfin arch: fix spelling typo in output Blackfin arch: try to split up functions like this into smaller units according to LKML review Blackfin arch: add proper ENDPROC() Blackfin arch: move more of our startup code to .init so it can be freed once we are up and running Blackfin arch: unify differences between our diff head.S files -- no functional changes ...
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/Kconfig35
-rw-r--r--arch/blackfin/configs/BF533-EZKIT_defconfig241
-rw-r--r--arch/blackfin/configs/BF533-STAMP_defconfig92
-rw-r--r--arch/blackfin/configs/BF537-STAMP_defconfig98
-rw-r--r--arch/blackfin/configs/BF561-EZKIT_defconfig192
-rw-r--r--arch/blackfin/configs/PNAV-10_defconfig119
-rw-r--r--arch/blackfin/defconfig1327
-rw-r--r--arch/blackfin/kernel/bfin_dma_5xx.c6
-rw-r--r--arch/blackfin/kernel/bfin_gpio.c14
-rw-r--r--arch/blackfin/kernel/entry.S5
-rw-r--r--arch/blackfin/kernel/irqchip.c2
-rw-r--r--arch/blackfin/kernel/setup.c248
-rw-r--r--arch/blackfin/kernel/traps.c2
-rw-r--r--arch/blackfin/kernel/vmlinux.lds.S166
-rw-r--r--arch/blackfin/lib/divsi3.S3
-rw-r--r--arch/blackfin/lib/ins.S4
-rw-r--r--arch/blackfin/lib/memchr.S2
-rw-r--r--arch/blackfin/lib/memcmp.S2
-rw-r--r--arch/blackfin/lib/memcpy.S2
-rw-r--r--arch/blackfin/lib/memmove.S2
-rw-r--r--arch/blackfin/lib/memset.S2
-rw-r--r--arch/blackfin/lib/modsi3.S2
-rw-r--r--arch/blackfin/lib/outs.S3
-rw-r--r--arch/blackfin/lib/smulsi3_highpart.S2
-rw-r--r--arch/blackfin/lib/udivsi3.S2
-rw-r--r--arch/blackfin/lib/umodsi3.S4
-rw-r--r--arch/blackfin/lib/umulsi3_highpart.S2
-rw-r--r--arch/blackfin/mach-bf533/boards/cm_bf533.c2
-rw-r--r--arch/blackfin/mach-bf533/boards/ezkit.c2
-rw-r--r--arch/blackfin/mach-bf533/head.S30
-rw-r--r--arch/blackfin/mach-bf533/ints-priority.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/generic_board.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/pnav10.c2
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c2
-rw-r--r--arch/blackfin/mach-bf537/head.S35
-rw-r--r--arch/blackfin/mach-bf537/ints-priority.c2
-rw-r--r--arch/blackfin/mach-bf561/boards/cm_bf561.c4
-rw-r--r--arch/blackfin/mach-bf561/head.S33
-rw-r--r--arch/blackfin/mach-bf561/ints-priority.c2
-rw-r--r--arch/blackfin/mach-common/cache.S10
-rw-r--r--arch/blackfin/mach-common/cacheinit.S4
-rw-r--r--arch/blackfin/mach-common/cplbhdlr.S4
-rw-r--r--arch/blackfin/mach-common/cplbinfo.c2
-rw-r--r--arch/blackfin/mach-common/cplbmgr.S1
-rw-r--r--arch/blackfin/mach-common/entry.S18
-rw-r--r--arch/blackfin/mach-common/interrupt.S2
-rw-r--r--arch/blackfin/mach-common/ints-priority-dc.c2
-rw-r--r--arch/blackfin/mach-common/ints-priority-sc.c2
-rw-r--r--arch/blackfin/mach-common/lock.S4
-rw-r--r--arch/blackfin/mach-common/pm.c2
-rw-r--r--arch/blackfin/mm/blackfin_sram.c111
-rw-r--r--arch/blackfin/mm/init.c20
52 files changed, 970 insertions, 1909 deletions
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index b1b111bb2f3a..1fad8560c7af 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -394,41 +394,6 @@ config BFIN_IDLE_LED_PIN
394 default 0x08 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 2) 394 default 0x08 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 2)
395 default 0x10 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 3) 395 default 0x10 if (BFIN533_STAMP && BFIN_IDLE_LED_NUM = 3)
396 396
397comment "Console UART Setup"
398
399choice
400 prompt "Baud Rate"
401 default BAUD_57600
402config BAUD_9600
403 bool "9600"
404config BAUD_19200
405 bool "19200"
406config BAUD_38400
407 bool "38400"
408config BAUD_57600
409 bool "57600"
410config BAUD_115200
411 bool "115200"
412endchoice
413
414choice
415 prompt "Parity"
416 default BAUD_NO_PARITY
417config BAUD_NO_PARITY
418 bool "No Parity"
419config BAUD_PARITY
420 bool "Parity"
421endchoice
422
423choice
424 prompt "Stop Bits"
425 default BAUD_1_STOPBIT
426config BAUD_1_STOPBIT
427 bool "1"
428config BAUD_2_STOPBIT
429 bool "2"
430endchoice
431
432endmenu 397endmenu
433 398
434 399
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig
index 377c8e05e4ab..90d58aabe693 100644
--- a/arch/blackfin/configs/BF533-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig
@@ -1,20 +1,21 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19.3 3# Linux kernel version: 2.6.21.3
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 7CONFIG_RWSEM_GENERIC_SPINLOCK=y
8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
9CONFIG_BLACKFIN=y 9CONFIG_BLACKFIN=y
10CONFIG_ZONE_DMA=y
10CONFIG_BFIN=y 11CONFIG_BFIN=y
11CONFIG_SEMAPHORE_SLEEPERS=y 12CONFIG_SEMAPHORE_SLEEPERS=y
12CONFIG_GENERIC_FIND_NEXT_BIT=y 13CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 15CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17# CONFIG_GENERIC_TIME is not set
16CONFIG_GENERIC_CALIBRATE_DELAY=y 18CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_UCLINUX=y
18CONFIG_FORCE_MAX_ZONEORDER=14 19CONFIG_FORCE_MAX_ZONEORDER=14
19CONFIG_IRQCHIP_DEMUX_GPIO=y 20CONFIG_IRQCHIP_DEMUX_GPIO=y
20CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 21CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -33,13 +34,16 @@ CONFIG_LOCALVERSION=""
33CONFIG_LOCALVERSION_AUTO=y 34CONFIG_LOCALVERSION_AUTO=y
34CONFIG_SYSVIPC=y 35CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set 36# CONFIG_IPC_NS is not set
37CONFIG_SYSVIPC_SYSCTL=y
36# CONFIG_POSIX_MQUEUE is not set 38# CONFIG_POSIX_MQUEUE is not set
37# CONFIG_BSD_PROCESS_ACCT is not set 39# CONFIG_BSD_PROCESS_ACCT is not set
38# CONFIG_TASKSTATS is not set 40# CONFIG_TASKSTATS is not set
39# CONFIG_UTS_NS is not set 41# CONFIG_UTS_NS is not set
40# CONFIG_AUDIT is not set 42# CONFIG_AUDIT is not set
41# CONFIG_IKCONFIG is not set 43# CONFIG_IKCONFIG is not set
44CONFIG_SYSFS_DEPRECATED=y
42# CONFIG_RELAY is not set 45# CONFIG_RELAY is not set
46CONFIG_BLK_DEV_INITRD=y
43CONFIG_INITRAMFS_SOURCE="" 47CONFIG_INITRAMFS_SOURCE=""
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SYSCTL=y 49CONFIG_SYSCTL=y
@@ -54,9 +58,7 @@ CONFIG_BUG=y
54CONFIG_ELF_CORE=y 58CONFIG_ELF_CORE=y
55CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
56CONFIG_FUTEX=y 60CONFIG_FUTEX=y
57CONFIG_EPOLL=y
58CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 61CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
59# CONFIG_LIMIT_PAGECACHE is not set
60CONFIG_BUDDY=y 62CONFIG_BUDDY=y
61# CONFIG_NP2 is not set 63# CONFIG_NP2 is not set
62CONFIG_SLAB=y 64CONFIG_SLAB=y
@@ -80,7 +82,9 @@ CONFIG_KMOD=y
80# Block layer 82# Block layer
81# 83#
82CONFIG_BLOCK=y 84CONFIG_BLOCK=y
85# CONFIG_LBD is not set
83# CONFIG_BLK_DEV_IO_TRACE is not set 86# CONFIG_BLK_DEV_IO_TRACE is not set
87# CONFIG_LSF is not set
84 88
85# 89#
86# IO Schedulers 90# IO Schedulers
@@ -109,7 +113,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
109# CONFIG_BF532 is not set 113# CONFIG_BF532 is not set
110CONFIG_BF533=y 114CONFIG_BF533=y
111# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
112# CONFIG_BF535 is not set
113# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
114# CONFIG_BF537 is not set 117# CONFIG_BF537 is not set
115# CONFIG_BF561 is not set 118# CONFIG_BF561 is not set
@@ -125,6 +128,7 @@ CONFIG_BFIN533_EZKIT=y
125# CONFIG_BFIN537_BLUETECHNIX_CM is not set 128# CONFIG_BFIN537_BLUETECHNIX_CM is not set
126# CONFIG_BFIN561_BLUETECHNIX_CM is not set 129# CONFIG_BFIN561_BLUETECHNIX_CM is not set
127# CONFIG_BFIN561_EZKIT is not set 130# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set
128# CONFIG_PNAV10 is not set 132# CONFIG_PNAV10 is not set
129# CONFIG_GENERIC_BOARD is not set 133# CONFIG_GENERIC_BOARD is not set
130CONFIG_MEM_MT48LC16M16A2TG_75=y 134CONFIG_MEM_MT48LC16M16A2TG_75=y
@@ -168,6 +172,7 @@ CONFIG_WDTIMER=13
168# 172#
169# Board customizations 173# Board customizations
170# 174#
175# CONFIG_CMDLINE_BOOL is not set
171 176
172# 177#
173# Board Setup 178# Board Setup
@@ -178,19 +183,6 @@ CONFIG_MEM_ADD_WIDTH=9
178CONFIG_BOOT_LOAD=0x1000 183CONFIG_BOOT_LOAD=0x1000
179 184
180# 185#
181# Console UART Setup
182#
183# CONFIG_BAUD_9600 is not set
184# CONFIG_BAUD_19200 is not set
185# CONFIG_BAUD_38400 is not set
186CONFIG_BAUD_57600=y
187# CONFIG_BAUD_115200 is not set
188CONFIG_BAUD_NO_PARITY=y
189# CONFIG_BAUD_PARITY is not set
190CONFIG_BAUD_1_STOPBIT=y
191# CONFIG_BAUD_2_STOPBIT is not set
192
193#
194# Blackfin Kernel Optimizations 186# Blackfin Kernel Optimizations
195# 187#
196 188
@@ -199,6 +191,7 @@ CONFIG_BAUD_1_STOPBIT=y
199# 191#
200# CONFIG_HZ_100 is not set 192# CONFIG_HZ_100 is not set
201CONFIG_HZ_250=y 193CONFIG_HZ_250=y
194# CONFIG_HZ_300 is not set
202# CONFIG_HZ_1000 is not set 195# CONFIG_HZ_1000 is not set
203CONFIG_HZ=250 196CONFIG_HZ=250
204 197
@@ -217,6 +210,7 @@ CONFIG_MEMSET_L1=y
217CONFIG_MEMCPY_L1=y 210CONFIG_MEMCPY_L1=y
218CONFIG_SYS_BFIN_SPINLOCK_L1=y 211CONFIG_SYS_BFIN_SPINLOCK_L1=y
219# CONFIG_IP_CHECKSUM_L1 is not set 212# CONFIG_IP_CHECKSUM_L1 is not set
213CONFIG_CACHELINE_ALIGNED_L1=y
220# CONFIG_SYSCALL_TAB_L1 is not set 214# CONFIG_SYSCALL_TAB_L1 is not set
221# CONFIG_CPLB_SWITCH_TAB_L1 is not set 215# CONFIG_CPLB_SWITCH_TAB_L1 is not set
222CONFIG_RAMKERNEL=y 216CONFIG_RAMKERNEL=y
@@ -230,6 +224,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
230# CONFIG_SPARSEMEM_STATIC is not set 224# CONFIG_SPARSEMEM_STATIC is not set
231CONFIG_SPLIT_PTLOCK_CPUS=4 225CONFIG_SPLIT_PTLOCK_CPUS=4
232# CONFIG_RESOURCES_64BIT is not set 226# CONFIG_RESOURCES_64BIT is not set
227CONFIG_ZONE_DMA_FLAG=1
233CONFIG_LARGE_ALLOCS=y 228CONFIG_LARGE_ALLOCS=y
234CONFIG_BFIN_DMA_5XX=y 229CONFIG_BFIN_DMA_5XX=y
235# CONFIG_DMA_UNCACHED_2M is not set 230# CONFIG_DMA_UNCACHED_2M is not set
@@ -302,7 +297,7 @@ CONFIG_BINFMT_ZFLAT=y
302# Power management options 297# Power management options
303# 298#
304CONFIG_PM=y 299CONFIG_PM=y
305CONFIG_PM_LEGACY=y 300# CONFIG_PM_LEGACY is not set
306# CONFIG_PM_DEBUG is not set 301# CONFIG_PM_DEBUG is not set
307# CONFIG_PM_SYSFS_DEPRECATED is not set 302# CONFIG_PM_SYSFS_DEPRECATED is not set
308CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y 303CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y
@@ -330,6 +325,7 @@ CONFIG_UNIX=y
330CONFIG_XFRM=y 325CONFIG_XFRM=y
331# CONFIG_XFRM_USER is not set 326# CONFIG_XFRM_USER is not set
332# CONFIG_XFRM_SUB_POLICY is not set 327# CONFIG_XFRM_SUB_POLICY is not set
328# CONFIG_XFRM_MIGRATE is not set
333# CONFIG_NET_KEY is not set 329# CONFIG_NET_KEY is not set
334CONFIG_INET=y 330CONFIG_INET=y
335# CONFIG_IP_MULTICAST is not set 331# CONFIG_IP_MULTICAST is not set
@@ -356,6 +352,7 @@ CONFIG_INET_TCP_DIAG=y
356# CONFIG_TCP_CONG_ADVANCED is not set 352# CONFIG_TCP_CONG_ADVANCED is not set
357CONFIG_TCP_CONG_CUBIC=y 353CONFIG_TCP_CONG_CUBIC=y
358CONFIG_DEFAULT_TCP_CONG="cubic" 354CONFIG_DEFAULT_TCP_CONG="cubic"
355# CONFIG_TCP_MD5SIG is not set
359# CONFIG_IPV6 is not set 356# CONFIG_IPV6 is not set
360# CONFIG_INET6_XFRM_TUNNEL is not set 357# CONFIG_INET6_XFRM_TUNNEL is not set
361# CONFIG_INET6_TUNNEL is not set 358# CONFIG_INET6_TUNNEL is not set
@@ -399,7 +396,48 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
399# 396#
400# CONFIG_NET_PKTGEN is not set 397# CONFIG_NET_PKTGEN is not set
401# CONFIG_HAMRADIO is not set 398# CONFIG_HAMRADIO is not set
402# CONFIG_IRDA is not set 399CONFIG_IRDA=m
400
401#
402# IrDA protocols
403#
404CONFIG_IRLAN=m
405CONFIG_IRCOMM=m
406# CONFIG_IRDA_ULTRA is not set
407
408#
409# IrDA options
410#
411CONFIG_IRDA_CACHE_LAST_LSAP=y
412# CONFIG_IRDA_FAST_RR is not set
413# CONFIG_IRDA_DEBUG is not set
414
415#
416# Infrared-port device drivers
417#
418
419#
420# SIR device drivers
421#
422CONFIG_IRTTY_SIR=m
423
424#
425# Dongle support
426#
427# CONFIG_DONGLE is not set
428
429#
430# Old SIR device drivers
431#
432# CONFIG_IRPORT_SIR is not set
433
434#
435# Old Serial dongle support
436#
437
438#
439# FIR device drivers
440#
403# CONFIG_BT is not set 441# CONFIG_BT is not set
404# CONFIG_IEEE80211 is not set 442# CONFIG_IEEE80211 is not set
405 443
@@ -434,6 +472,7 @@ CONFIG_MTD_PARTITIONS=y
434# User Modules And Translation Layers 472# User Modules And Translation Layers
435# 473#
436CONFIG_MTD_CHAR=m 474CONFIG_MTD_CHAR=m
475CONFIG_MTD_BLKDEVS=y
437CONFIG_MTD_BLOCK=y 476CONFIG_MTD_BLOCK=y
438# CONFIG_FTL is not set 477# CONFIG_FTL is not set
439# CONFIG_NFTL is not set 478# CONFIG_NFTL is not set
@@ -489,6 +528,8 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
489# 528#
490# Self-contained MTD device drivers 529# Self-contained MTD device drivers
491# 530#
531# CONFIG_MTD_DATAFLASH is not set
532# CONFIG_MTD_M25P80 is not set
492# CONFIG_MTD_SLRAM is not set 533# CONFIG_MTD_SLRAM is not set
493# CONFIG_MTD_PHRAM is not set 534# CONFIG_MTD_PHRAM is not set
494# CONFIG_MTD_MTDRAM is not set 535# CONFIG_MTD_MTDRAM is not set
@@ -519,6 +560,7 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
519# 560#
520# Plug and Play support 561# Plug and Play support
521# 562#
563# CONFIG_PNPACPI is not set
522 564
523# 565#
524# Block devices 566# Block devices
@@ -530,14 +572,12 @@ CONFIG_BLK_DEV_RAM=y
530CONFIG_BLK_DEV_RAM_COUNT=16 572CONFIG_BLK_DEV_RAM_COUNT=16
531CONFIG_BLK_DEV_RAM_SIZE=4096 573CONFIG_BLK_DEV_RAM_SIZE=4096
532CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 574CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
533# CONFIG_BLK_DEV_INITRD is not set
534# CONFIG_CDROM_PKTCDVD is not set 575# CONFIG_CDROM_PKTCDVD is not set
535# CONFIG_ATA_OVER_ETH is not set 576# CONFIG_ATA_OVER_ETH is not set
536 577
537# 578#
538# Misc devices 579# Misc devices
539# 580#
540# CONFIG_TIFM_CORE is not set
541 581
542# 582#
543# ATA/ATAPI/MFM/RLL support 583# ATA/ATAPI/MFM/RLL support
@@ -636,7 +676,26 @@ CONFIG_SMC91X=y
636# 676#
637# Input device support 677# Input device support
638# 678#
639# CONFIG_INPUT is not set 679CONFIG_INPUT=m
680# CONFIG_INPUT_FF_MEMLESS is not set
681
682#
683# Userland interfaces
684#
685# CONFIG_INPUT_MOUSEDEV is not set
686# CONFIG_INPUT_JOYDEV is not set
687# CONFIG_INPUT_TSDEV is not set
688CONFIG_INPUT_EVDEV=m
689# CONFIG_INPUT_EVBUG is not set
690
691#
692# Input Device Drivers
693#
694# CONFIG_INPUT_KEYBOARD is not set
695# CONFIG_INPUT_MOUSE is not set
696# CONFIG_INPUT_JOYSTICK is not set
697# CONFIG_INPUT_TOUCHSCREEN is not set
698# CONFIG_INPUT_MISC is not set
640 699
641# 700#
642# Hardware I/O ports 701# Hardware I/O ports
@@ -649,12 +708,14 @@ CONFIG_SMC91X=y
649# 708#
650# CONFIG_AD9960 is not set 709# CONFIG_AD9960 is not set
651# CONFIG_SPI_ADC_BF533 is not set 710# CONFIG_SPI_ADC_BF533 is not set
652# CONFIG_BF533_PFLAGS is not set 711# CONFIG_BF5xx_PFLAGS is not set
653# CONFIG_BF5xx_PPIFCD is not set 712# CONFIG_BF5xx_PPIFCD is not set
654# CONFIG_BF5xx_TIMERS is not set 713# CONFIG_BF5xx_TIMERS is not set
655# CONFIG_BF5xx_PPI is not set 714# CONFIG_BF5xx_PPI is not set
656# CONFIG_BFIN_SPORT is not set 715CONFIG_BFIN_SPORT=y
657# CONFIG_BFIN_TIMER_LATENCY is not set 716# CONFIG_BFIN_TIMER_LATENCY is not set
717# CONFIG_AD5304 is not set
718# CONFIG_BF5xx_FBDMA is not set
658# CONFIG_VT is not set 719# CONFIG_VT is not set
659# CONFIG_SERIAL_NONSTANDARD is not set 720# CONFIG_SERIAL_NONSTANDARD is not set
660 721
@@ -691,16 +752,19 @@ CONFIG_UNIX98_PTYS=y
691# 752#
692# Watchdog Cards 753# Watchdog Cards
693# 754#
694# CONFIG_WATCHDOG is not set 755CONFIG_WATCHDOG=y
756# CONFIG_WATCHDOG_NOWAYOUT is not set
757
758#
759# Watchdog Device Drivers
760#
761# CONFIG_SOFT_WATCHDOG is not set
762CONFIG_BFIN_WDT=y
695CONFIG_HW_RANDOM=y 763CONFIG_HW_RANDOM=y
696# CONFIG_GEN_RTC is not set 764# CONFIG_GEN_RTC is not set
697CONFIG_BLACKFIN_DPMC=y 765CONFIG_BLACKFIN_DPMC=y
698# CONFIG_DTLK is not set 766# CONFIG_DTLK is not set
699# CONFIG_R3964 is not set 767# CONFIG_R3964 is not set
700
701#
702# Ftape, the floppy tape device driver
703#
704# CONFIG_RAW_DRIVER is not set 768# CONFIG_RAW_DRIVER is not set
705 769
706# 770#
@@ -716,8 +780,19 @@ CONFIG_BLACKFIN_DPMC=y
716# 780#
717# SPI support 781# SPI support
718# 782#
719# CONFIG_SPI is not set 783CONFIG_SPI=y
720# CONFIG_SPI_MASTER is not set 784CONFIG_SPI_MASTER=y
785
786#
787# SPI Master Controller Drivers
788#
789CONFIG_SPI_BFIN=y
790# CONFIG_SPI_BITBANG is not set
791
792#
793# SPI Protocol Masters
794#
795# CONFIG_SPI_AT25 is not set
721 796
722# 797#
723# Dallas's 1-wire bus 798# Dallas's 1-wire bus
@@ -731,10 +806,17 @@ CONFIG_HWMON=y
731# CONFIG_HWMON_VID is not set 806# CONFIG_HWMON_VID is not set
732# CONFIG_SENSORS_ABITUGURU is not set 807# CONFIG_SENSORS_ABITUGURU is not set
733# CONFIG_SENSORS_F71805F is not set 808# CONFIG_SENSORS_F71805F is not set
809# CONFIG_SENSORS_LM70 is not set
810# CONFIG_SENSORS_PC87427 is not set
734# CONFIG_SENSORS_VT1211 is not set 811# CONFIG_SENSORS_VT1211 is not set
735# CONFIG_HWMON_DEBUG_CHIP is not set 812# CONFIG_HWMON_DEBUG_CHIP is not set
736 813
737# 814#
815# Multifunction device drivers
816#
817# CONFIG_MFD_SM501 is not set
818
819#
738# Multimedia devices 820# Multimedia devices
739# 821#
740# CONFIG_VIDEO_DEV is not set 822# CONFIG_VIDEO_DEV is not set
@@ -747,9 +829,8 @@ CONFIG_HWMON=y
747# 829#
748# Graphics support 830# Graphics support
749# 831#
750CONFIG_FIRMWARE_EDID=y
751# CONFIG_FB is not set
752# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 832# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
833# CONFIG_FB is not set
753 834
754# 835#
755# Sound 836# Sound
@@ -757,6 +838,12 @@ CONFIG_FIRMWARE_EDID=y
757# CONFIG_SOUND is not set 838# CONFIG_SOUND is not set
758 839
759# 840#
841# HID Devices
842#
843CONFIG_HID=m
844# CONFIG_HID_DEBUG is not set
845
846#
760# USB support 847# USB support
761# 848#
762CONFIG_USB_ARCH_HAS_HCD=y 849CONFIG_USB_ARCH_HAS_HCD=y
@@ -776,6 +863,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
776# 863#
777# MMC/SD Card support 864# MMC/SD Card support
778# 865#
866# CONFIG_SPI_MMC is not set
779# CONFIG_MMC is not set 867# CONFIG_MMC is not set
780 868
781# 869#
@@ -821,8 +909,10 @@ CONFIG_RTC_INTF_DEV=y
821# 909#
822# CONFIG_RTC_DRV_DS1553 is not set 910# CONFIG_RTC_DRV_DS1553 is not set
823# CONFIG_RTC_DRV_DS1742 is not set 911# CONFIG_RTC_DRV_DS1742 is not set
912# CONFIG_RTC_DRV_RS5C348 is not set
824# CONFIG_RTC_DRV_M48T86 is not set 913# CONFIG_RTC_DRV_M48T86 is not set
825# CONFIG_RTC_DRV_TEST is not set 914# CONFIG_RTC_DRV_TEST is not set
915# CONFIG_RTC_DRV_MAX6902 is not set
826# CONFIG_RTC_DRV_V3020 is not set 916# CONFIG_RTC_DRV_V3020 is not set
827CONFIG_RTC_DRV_BFIN=y 917CONFIG_RTC_DRV_BFIN=y
828 918
@@ -840,6 +930,14 @@ CONFIG_RTC_DRV_BFIN=y
840# 930#
841 931
842# 932#
933# Auxiliary Display support
934#
935
936#
937# Virtualization
938#
939
940#
843# PBX support 941# PBX support
844# 942#
845# CONFIG_PBX is not set 943# CONFIG_PBX is not set
@@ -847,13 +945,9 @@ CONFIG_RTC_DRV_BFIN=y
847# 945#
848# File systems 946# File systems
849# 947#
850CONFIG_EXT2_FS=y 948# CONFIG_EXT2_FS is not set
851CONFIG_EXT2_FS_XATTR=y
852# CONFIG_EXT2_FS_POSIX_ACL is not set
853# CONFIG_EXT2_FS_SECURITY is not set
854# CONFIG_EXT3_FS is not set 949# CONFIG_EXT3_FS is not set
855# CONFIG_EXT4DEV_FS is not set 950# CONFIG_EXT4DEV_FS is not set
856CONFIG_FS_MBCACHE=y
857# CONFIG_REISERFS_FS is not set 951# CONFIG_REISERFS_FS is not set
858# CONFIG_JFS_FS is not set 952# CONFIG_JFS_FS is not set
859# CONFIG_FS_POSIX_ACL is not set 953# CONFIG_FS_POSIX_ACL is not set
@@ -862,7 +956,8 @@ CONFIG_FS_MBCACHE=y
862# CONFIG_OCFS2_FS is not set 956# CONFIG_OCFS2_FS is not set
863# CONFIG_MINIX_FS is not set 957# CONFIG_MINIX_FS is not set
864# CONFIG_ROMFS_FS is not set 958# CONFIG_ROMFS_FS is not set
865# CONFIG_INOTIFY is not set 959CONFIG_INOTIFY=y
960CONFIG_INOTIFY_USER=y
866# CONFIG_QUOTA is not set 961# CONFIG_QUOTA is not set
867# CONFIG_DNOTIFY is not set 962# CONFIG_DNOTIFY is not set
868# CONFIG_AUTOFS_FS is not set 963# CONFIG_AUTOFS_FS is not set
@@ -913,7 +1008,6 @@ CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
913# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set 1008# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
914# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set 1009# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
915CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y 1010CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
916# CONFIG_JFFS_FS is not set
917CONFIG_JFFS2_FS=m 1011CONFIG_JFFS2_FS=m
918CONFIG_JFFS2_FS_DEBUG=0 1012CONFIG_JFFS2_FS_DEBUG=0
919CONFIG_JFFS2_FS_WRITEBUFFER=y 1013CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -945,7 +1039,8 @@ CONFIG_NFS_COMMON=y
945CONFIG_SUNRPC=m 1039CONFIG_SUNRPC=m
946# CONFIG_RPCSEC_GSS_KRB5 is not set 1040# CONFIG_RPCSEC_GSS_KRB5 is not set
947# CONFIG_RPCSEC_GSS_SPKM3 is not set 1041# CONFIG_RPCSEC_GSS_SPKM3 is not set
948# CONFIG_SMB_FS is not set 1042CONFIG_SMB_FS=m
1043# CONFIG_SMB_NLS_DEFAULT is not set
949# CONFIG_CIFS is not set 1044# CONFIG_CIFS is not set
950# CONFIG_NCP_FS is not set 1045# CONFIG_NCP_FS is not set
951# CONFIG_CODA_FS is not set 1046# CONFIG_CODA_FS is not set
@@ -961,7 +1056,51 @@ CONFIG_MSDOS_PARTITION=y
961# 1056#
962# Native Language Support 1057# Native Language Support
963# 1058#
964# CONFIG_NLS is not set 1059CONFIG_NLS=m
1060CONFIG_NLS_DEFAULT="iso8859-1"
1061# CONFIG_NLS_CODEPAGE_437 is not set
1062# CONFIG_NLS_CODEPAGE_737 is not set
1063# CONFIG_NLS_CODEPAGE_775 is not set
1064# CONFIG_NLS_CODEPAGE_850 is not set
1065# CONFIG_NLS_CODEPAGE_852 is not set
1066# CONFIG_NLS_CODEPAGE_855 is not set
1067# CONFIG_NLS_CODEPAGE_857 is not set
1068# CONFIG_NLS_CODEPAGE_860 is not set
1069# CONFIG_NLS_CODEPAGE_861 is not set
1070# CONFIG_NLS_CODEPAGE_862 is not set
1071# CONFIG_NLS_CODEPAGE_863 is not set
1072# CONFIG_NLS_CODEPAGE_864 is not set
1073# CONFIG_NLS_CODEPAGE_865 is not set
1074# CONFIG_NLS_CODEPAGE_866 is not set
1075# CONFIG_NLS_CODEPAGE_869 is not set
1076# CONFIG_NLS_CODEPAGE_936 is not set
1077# CONFIG_NLS_CODEPAGE_950 is not set
1078# CONFIG_NLS_CODEPAGE_932 is not set
1079# CONFIG_NLS_CODEPAGE_949 is not set
1080# CONFIG_NLS_CODEPAGE_874 is not set
1081# CONFIG_NLS_ISO8859_8 is not set
1082# CONFIG_NLS_CODEPAGE_1250 is not set
1083# CONFIG_NLS_CODEPAGE_1251 is not set
1084# CONFIG_NLS_ASCII is not set
1085# CONFIG_NLS_ISO8859_1 is not set
1086# CONFIG_NLS_ISO8859_2 is not set
1087# CONFIG_NLS_ISO8859_3 is not set
1088# CONFIG_NLS_ISO8859_4 is not set
1089# CONFIG_NLS_ISO8859_5 is not set
1090# CONFIG_NLS_ISO8859_6 is not set
1091# CONFIG_NLS_ISO8859_7 is not set
1092# CONFIG_NLS_ISO8859_9 is not set
1093# CONFIG_NLS_ISO8859_13 is not set
1094# CONFIG_NLS_ISO8859_14 is not set
1095# CONFIG_NLS_ISO8859_15 is not set
1096# CONFIG_NLS_KOI8_R is not set
1097# CONFIG_NLS_KOI8_U is not set
1098# CONFIG_NLS_UTF8 is not set
1099
1100#
1101# Distributed Lock Manager
1102#
1103# CONFIG_DLM is not set
965 1104
966# 1105#
967# Profiling support 1106# Profiling support
@@ -975,19 +1114,16 @@ CONFIG_MSDOS_PARTITION=y
975CONFIG_ENABLE_MUST_CHECK=y 1114CONFIG_ENABLE_MUST_CHECK=y
976# CONFIG_MAGIC_SYSRQ is not set 1115# CONFIG_MAGIC_SYSRQ is not set
977# CONFIG_UNUSED_SYMBOLS is not set 1116# CONFIG_UNUSED_SYMBOLS is not set
1117# CONFIG_DEBUG_FS is not set
1118# CONFIG_HEADERS_CHECK is not set
978# CONFIG_DEBUG_KERNEL is not set 1119# CONFIG_DEBUG_KERNEL is not set
979CONFIG_LOG_BUF_SHIFT=14 1120CONFIG_LOG_BUF_SHIFT=14
980# CONFIG_DEBUG_BUGVERBOSE is not set 1121# CONFIG_DEBUG_BUGVERBOSE is not set
981# CONFIG_DEBUG_FS is not set
982# CONFIG_UNWIND_INFO is not set
983# CONFIG_HEADERS_CHECK is not set
984# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set 1122# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
985CONFIG_DEBUG_HUNT_FOR_ZERO=y 1123CONFIG_DEBUG_HUNT_FOR_ZERO=y
986# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 1124# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
987# CONFIG_BOOTPARAM is not set
988# CONFIG_NO_KERNEL_MSG is not set
989CONFIG_CPLB_INFO=y 1125CONFIG_CPLB_INFO=y
990# CONFIG_NO_ACCESS_CHECK is not set 1126CONFIG_ACCESS_CHECK=y
991 1127
992# 1128#
993# Security options 1129# Security options
@@ -995,7 +1131,7 @@ CONFIG_CPLB_INFO=y
995# CONFIG_KEYS is not set 1131# CONFIG_KEYS is not set
996CONFIG_SECURITY=y 1132CONFIG_SECURITY=y
997# CONFIG_SECURITY_NETWORK is not set 1133# CONFIG_SECURITY_NETWORK is not set
998CONFIG_SECURITY_CAPABILITIES=y 1134CONFIG_SECURITY_CAPABILITIES=m
999 1135
1000# 1136#
1001# Cryptographic options 1137# Cryptographic options
@@ -1005,10 +1141,13 @@ CONFIG_SECURITY_CAPABILITIES=y
1005# 1141#
1006# Library routines 1142# Library routines
1007# 1143#
1008# CONFIG_CRC_CCITT is not set 1144CONFIG_BITREVERSE=y
1145CONFIG_CRC_CCITT=m
1009# CONFIG_CRC16 is not set 1146# CONFIG_CRC16 is not set
1010CONFIG_CRC32=y 1147CONFIG_CRC32=y
1011# CONFIG_LIBCRC32C is not set 1148# CONFIG_LIBCRC32C is not set
1012CONFIG_ZLIB_INFLATE=y 1149CONFIG_ZLIB_INFLATE=y
1013CONFIG_ZLIB_DEFLATE=m 1150CONFIG_ZLIB_DEFLATE=m
1014CONFIG_PLIST=y 1151CONFIG_PLIST=y
1152CONFIG_HAS_IOMEM=y
1153CONFIG_HAS_IOPORT=y
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig
index 14a948c288a5..fee918957392 100644
--- a/arch/blackfin/configs/BF533-STAMP_defconfig
+++ b/arch/blackfin/configs/BF533-STAMP_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20.4 3# Linux kernel version: 2.6.21.3
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 7CONFIG_RWSEM_GENERIC_SPINLOCK=y
8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
9CONFIG_BLACKFIN=y 9CONFIG_BLACKFIN=y
10CONFIG_ZONE_DMA=y
10CONFIG_BFIN=y 11CONFIG_BFIN=y
11CONFIG_SEMAPHORE_SLEEPERS=y 12CONFIG_SEMAPHORE_SLEEPERS=y
12CONFIG_GENERIC_FIND_NEXT_BIT=y 13CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -33,6 +34,7 @@ CONFIG_LOCALVERSION=""
33CONFIG_LOCALVERSION_AUTO=y 34CONFIG_LOCALVERSION_AUTO=y
34CONFIG_SYSVIPC=y 35CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set 36# CONFIG_IPC_NS is not set
37CONFIG_SYSVIPC_SYSCTL=y
36# CONFIG_POSIX_MQUEUE is not set 38# CONFIG_POSIX_MQUEUE is not set
37# CONFIG_BSD_PROCESS_ACCT is not set 39# CONFIG_BSD_PROCESS_ACCT is not set
38# CONFIG_TASKSTATS is not set 40# CONFIG_TASKSTATS is not set
@@ -41,6 +43,7 @@ CONFIG_SYSVIPC=y
41# CONFIG_IKCONFIG is not set 43# CONFIG_IKCONFIG is not set
42CONFIG_SYSFS_DEPRECATED=y 44CONFIG_SYSFS_DEPRECATED=y
43# CONFIG_RELAY is not set 45# CONFIG_RELAY is not set
46CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 47CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 49CONFIG_SYSCTL=y
@@ -55,9 +58,7 @@ CONFIG_BUG=y
55CONFIG_ELF_CORE=y 58CONFIG_ELF_CORE=y
56CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
57CONFIG_FUTEX=y 60CONFIG_FUTEX=y
58CONFIG_EPOLL=y
59CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 61CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
60# CONFIG_LIMIT_PAGECACHE is not set
61CONFIG_BUDDY=y 62CONFIG_BUDDY=y
62# CONFIG_NP2 is not set 63# CONFIG_NP2 is not set
63CONFIG_SLAB=y 64CONFIG_SLAB=y
@@ -127,6 +128,7 @@ CONFIG_BFIN533_STAMP=y
127# CONFIG_BFIN537_BLUETECHNIX_CM is not set 128# CONFIG_BFIN537_BLUETECHNIX_CM is not set
128# CONFIG_BFIN561_BLUETECHNIX_CM is not set 129# CONFIG_BFIN561_BLUETECHNIX_CM is not set
129# CONFIG_BFIN561_EZKIT is not set 130# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set
130# CONFIG_PNAV10 is not set 132# CONFIG_PNAV10 is not set
131# CONFIG_GENERIC_BOARD is not set 133# CONFIG_GENERIC_BOARD is not set
132CONFIG_MEM_MT48LC64M4A2FB_7E=y 134CONFIG_MEM_MT48LC64M4A2FB_7E=y
@@ -193,19 +195,6 @@ CONFIG_BFIN_IDLE_LED_PORT=0xFFC00700
193CONFIG_BFIN_IDLE_LED_DPORT=0xFFC00730 195CONFIG_BFIN_IDLE_LED_DPORT=0xFFC00730
194 196
195# 197#
196# Console UART Setup
197#
198# CONFIG_BAUD_9600 is not set
199# CONFIG_BAUD_19200 is not set
200# CONFIG_BAUD_38400 is not set
201CONFIG_BAUD_57600=y
202# CONFIG_BAUD_115200 is not set
203CONFIG_BAUD_NO_PARITY=y
204# CONFIG_BAUD_PARITY is not set
205CONFIG_BAUD_1_STOPBIT=y
206# CONFIG_BAUD_2_STOPBIT is not set
207
208#
209# Blackfin Kernel Optimizations 198# Blackfin Kernel Optimizations
210# 199#
211 200
@@ -233,6 +222,7 @@ CONFIG_MEMSET_L1=y
233CONFIG_MEMCPY_L1=y 222CONFIG_MEMCPY_L1=y
234CONFIG_SYS_BFIN_SPINLOCK_L1=y 223CONFIG_SYS_BFIN_SPINLOCK_L1=y
235# CONFIG_IP_CHECKSUM_L1 is not set 224# CONFIG_IP_CHECKSUM_L1 is not set
225CONFIG_CACHELINE_ALIGNED_L1=y
236# CONFIG_SYSCALL_TAB_L1 is not set 226# CONFIG_SYSCALL_TAB_L1 is not set
237# CONFIG_CPLB_SWITCH_TAB_L1 is not set 227# CONFIG_CPLB_SWITCH_TAB_L1 is not set
238CONFIG_RAMKERNEL=y 228CONFIG_RAMKERNEL=y
@@ -246,6 +236,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
246# CONFIG_SPARSEMEM_STATIC is not set 236# CONFIG_SPARSEMEM_STATIC is not set
247CONFIG_SPLIT_PTLOCK_CPUS=4 237CONFIG_SPLIT_PTLOCK_CPUS=4
248# CONFIG_RESOURCES_64BIT is not set 238# CONFIG_RESOURCES_64BIT is not set
239CONFIG_ZONE_DMA_FLAG=1
249CONFIG_LARGE_ALLOCS=y 240CONFIG_LARGE_ALLOCS=y
250CONFIG_BFIN_DMA_5XX=y 241CONFIG_BFIN_DMA_5XX=y
251# CONFIG_DMA_UNCACHED_2M is not set 242# CONFIG_DMA_UNCACHED_2M is not set
@@ -318,7 +309,7 @@ CONFIG_BINFMT_ZFLAT=y
318# Power management options 309# Power management options
319# 310#
320CONFIG_PM=y 311CONFIG_PM=y
321CONFIG_PM_LEGACY=y 312# CONFIG_PM_LEGACY is not set
322# CONFIG_PM_DEBUG is not set 313# CONFIG_PM_DEBUG is not set
323# CONFIG_PM_SYSFS_DEPRECATED is not set 314# CONFIG_PM_SYSFS_DEPRECATED is not set
324CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y 315CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y
@@ -346,6 +337,7 @@ CONFIG_UNIX=y
346CONFIG_XFRM=y 337CONFIG_XFRM=y
347# CONFIG_XFRM_USER is not set 338# CONFIG_XFRM_USER is not set
348# CONFIG_XFRM_SUB_POLICY is not set 339# CONFIG_XFRM_SUB_POLICY is not set
340# CONFIG_XFRM_MIGRATE is not set
349# CONFIG_NET_KEY is not set 341# CONFIG_NET_KEY is not set
350CONFIG_INET=y 342CONFIG_INET=y
351# CONFIG_IP_MULTICAST is not set 343# CONFIG_IP_MULTICAST is not set
@@ -580,6 +572,7 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
580# 572#
581# Plug and Play support 573# Plug and Play support
582# 574#
575# CONFIG_PNPACPI is not set
583 576
584# 577#
585# Block devices 578# Block devices
@@ -591,14 +584,12 @@ CONFIG_BLK_DEV_RAM=y
591CONFIG_BLK_DEV_RAM_COUNT=16 584CONFIG_BLK_DEV_RAM_COUNT=16
592CONFIG_BLK_DEV_RAM_SIZE=4096 585CONFIG_BLK_DEV_RAM_SIZE=4096
593CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 586CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
594# CONFIG_BLK_DEV_INITRD is not set
595# CONFIG_CDROM_PKTCDVD is not set 587# CONFIG_CDROM_PKTCDVD is not set
596# CONFIG_ATA_OVER_ETH is not set 588# CONFIG_ATA_OVER_ETH is not set
597 589
598# 590#
599# Misc devices 591# Misc devices
600# 592#
601# CONFIG_TIFM_CORE is not set
602 593
603# 594#
604# ATA/ATAPI/MFM/RLL support 595# ATA/ATAPI/MFM/RLL support
@@ -733,7 +724,7 @@ CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=39
733# 724#
734# CONFIG_AD9960 is not set 725# CONFIG_AD9960 is not set
735# CONFIG_SPI_ADC_BF533 is not set 726# CONFIG_SPI_ADC_BF533 is not set
736# CONFIG_BF533_PFLAGS is not set 727# CONFIG_BF5xx_PFLAGS is not set
737# CONFIG_BF5xx_PPIFCD is not set 728# CONFIG_BF5xx_PPIFCD is not set
738# CONFIG_BF5xx_TIMERS is not set 729# CONFIG_BF5xx_TIMERS is not set
739# CONFIG_BF5xx_PPI is not set 730# CONFIG_BF5xx_PPI is not set
@@ -742,6 +733,8 @@ CONFIG_BFIN_SPORT=y
742CONFIG_TWI_LCD=m 733CONFIG_TWI_LCD=m
743CONFIG_TWI_LCD_SLAVE_ADDR=34 734CONFIG_TWI_LCD_SLAVE_ADDR=34
744# CONFIG_AD5304 is not set 735# CONFIG_AD5304 is not set
736# CONFIG_BF5xx_TEA5764 is not set
737# CONFIG_BF5xx_FBDMA is not set
745# CONFIG_VT is not set 738# CONFIG_VT is not set
746# CONFIG_SERIAL_NONSTANDARD is not set 739# CONFIG_SERIAL_NONSTANDARD is not set
747 740
@@ -778,7 +771,14 @@ CONFIG_UNIX98_PTYS=y
778# 771#
779# Watchdog Cards 772# Watchdog Cards
780# 773#
781# CONFIG_WATCHDOG is not set 774CONFIG_WATCHDOG=y
775# CONFIG_WATCHDOG_NOWAYOUT is not set
776
777#
778# Watchdog Device Drivers
779#
780# CONFIG_SOFT_WATCHDOG is not set
781CONFIG_BFIN_WDT=y
782CONFIG_HW_RANDOM=y 782CONFIG_HW_RANDOM=y
783# CONFIG_GEN_RTC is not set 783# CONFIG_GEN_RTC is not set
784CONFIG_BLACKFIN_DPMC=y 784CONFIG_BLACKFIN_DPMC=y
@@ -840,12 +840,13 @@ CONFIG_SPI_MASTER=y
840# 840#
841# SPI Master Controller Drivers 841# SPI Master Controller Drivers
842# 842#
843CONFIG_SPI_BFIN=y
843# CONFIG_SPI_BITBANG is not set 844# CONFIG_SPI_BITBANG is not set
844 845
845# 846#
846# SPI Protocol Masters 847# SPI Protocol Masters
847# 848#
848CONFIG_SPI_BFIN=y 849# CONFIG_SPI_AT25 is not set
849 850
850# 851#
851# Dallas's 1-wire bus 852# Dallas's 1-wire bus
@@ -861,6 +862,7 @@ CONFIG_HWMON=y
861# CONFIG_SENSORS_ADM1021 is not set 862# CONFIG_SENSORS_ADM1021 is not set
862# CONFIG_SENSORS_ADM1025 is not set 863# CONFIG_SENSORS_ADM1025 is not set
863# CONFIG_SENSORS_ADM1026 is not set 864# CONFIG_SENSORS_ADM1026 is not set
865# CONFIG_SENSORS_ADM1029 is not set
864# CONFIG_SENSORS_ADM1031 is not set 866# CONFIG_SENSORS_ADM1031 is not set
865# CONFIG_SENSORS_ADM9240 is not set 867# CONFIG_SENSORS_ADM9240 is not set
866# CONFIG_SENSORS_ASB100 is not set 868# CONFIG_SENSORS_ASB100 is not set
@@ -900,6 +902,11 @@ CONFIG_HWMON=y
900# CONFIG_HWMON_DEBUG_CHIP is not set 902# CONFIG_HWMON_DEBUG_CHIP is not set
901 903
902# 904#
905# Multifunction device drivers
906#
907# CONFIG_MFD_SM501 is not set
908
909#
903# Multimedia devices 910# Multimedia devices
904# 911#
905# CONFIG_VIDEO_DEV is not set 912# CONFIG_VIDEO_DEV is not set
@@ -912,15 +919,22 @@ CONFIG_HWMON=y
912# 919#
913# Graphics support 920# Graphics support
914# 921#
915CONFIG_FIRMWARE_EDID=y 922# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
916CONFIG_FB=m 923CONFIG_FB=m
924CONFIG_FIRMWARE_EDID=y
925# CONFIG_FB_DDC is not set
917CONFIG_FB_CFB_FILLRECT=m 926CONFIG_FB_CFB_FILLRECT=m
918CONFIG_FB_CFB_COPYAREA=m 927CONFIG_FB_CFB_COPYAREA=m
919CONFIG_FB_CFB_IMAGEBLIT=m 928CONFIG_FB_CFB_IMAGEBLIT=m
929# CONFIG_FB_SVGALIB is not set
920# CONFIG_FB_MACMODES is not set 930# CONFIG_FB_MACMODES is not set
921# CONFIG_FB_BACKLIGHT is not set 931# CONFIG_FB_BACKLIGHT is not set
922# CONFIG_FB_MODE_HELPERS is not set 932# CONFIG_FB_MODE_HELPERS is not set
923# CONFIG_FB_TILEBLITTING is not set 933# CONFIG_FB_TILEBLITTING is not set
934
935#
936# Frame buffer hardware drivers
937#
924CONFIG_FB_BFIN_7171=m 938CONFIG_FB_BFIN_7171=m
925CONFIG_FB_BFIN_7393=m 939CONFIG_FB_BFIN_7393=m
926CONFIG_NTSC=y 940CONFIG_NTSC=y
@@ -938,7 +952,6 @@ CONFIG_ADV7393_1XMEM=y
938# Logo configuration 952# Logo configuration
939# 953#
940# CONFIG_LOGO is not set 954# CONFIG_LOGO is not set
941# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
942 955
943# 956#
944# Sound 957# Sound
@@ -971,6 +984,18 @@ CONFIG_SND_VERBOSE_PROCFS=y
971# CONFIG_SND_MPU401 is not set 984# CONFIG_SND_MPU401 is not set
972 985
973# 986#
987# ALSA Blackfin devices
988#
989# CONFIG_SND_BLACKFIN_AD1836 is not set
990# CONFIG_SND_BLACKFIN_AD1981B is not set
991# CONFIG_SND_BFIN_AD73311 is not set
992
993#
994# SoC audio support
995#
996# CONFIG_SND_SOC is not set
997
998#
974# Open Sound System 999# Open Sound System
975# 1000#
976# CONFIG_SOUND_PRIME is not set 1001# CONFIG_SOUND_PRIME is not set
@@ -979,6 +1004,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
979# HID Devices 1004# HID Devices
980# 1005#
981CONFIG_HID=y 1006CONFIG_HID=y
1007# CONFIG_HID_DEBUG is not set
982 1008
983# 1009#
984# USB support 1010# USB support
@@ -1051,7 +1077,6 @@ CONFIG_RTC_INTF_DEV=y
1051# CONFIG_RTC_DRV_DS1672 is not set 1077# CONFIG_RTC_DRV_DS1672 is not set
1052# CONFIG_RTC_DRV_DS1742 is not set 1078# CONFIG_RTC_DRV_DS1742 is not set
1053# CONFIG_RTC_DRV_PCF8563 is not set 1079# CONFIG_RTC_DRV_PCF8563 is not set
1054# CONFIG_RTC_DRV_PCF8583 is not set
1055# CONFIG_RTC_DRV_RS5C348 is not set 1080# CONFIG_RTC_DRV_RS5C348 is not set
1056# CONFIG_RTC_DRV_RS5C372 is not set 1081# CONFIG_RTC_DRV_RS5C372 is not set
1057# CONFIG_RTC_DRV_M48T86 is not set 1082# CONFIG_RTC_DRV_M48T86 is not set
@@ -1074,6 +1099,10 @@ CONFIG_RTC_DRV_BFIN=y
1074# 1099#
1075 1100
1076# 1101#
1102# Auxiliary Display support
1103#
1104
1105#
1077# Virtualization 1106# Virtualization
1078# 1107#
1079 1108
@@ -1085,13 +1114,9 @@ CONFIG_RTC_DRV_BFIN=y
1085# 1114#
1086# File systems 1115# File systems
1087# 1116#
1088CONFIG_EXT2_FS=y 1117# CONFIG_EXT2_FS is not set
1089CONFIG_EXT2_FS_XATTR=y
1090# CONFIG_EXT2_FS_POSIX_ACL is not set
1091# CONFIG_EXT2_FS_SECURITY is not set
1092# CONFIG_EXT3_FS is not set 1118# CONFIG_EXT3_FS is not set
1093# CONFIG_EXT4DEV_FS is not set 1119# CONFIG_EXT4DEV_FS is not set
1094CONFIG_FS_MBCACHE=y
1095# CONFIG_REISERFS_FS is not set 1120# CONFIG_REISERFS_FS is not set
1096# CONFIG_JFS_FS is not set 1121# CONFIG_JFS_FS is not set
1097# CONFIG_FS_POSIX_ACL is not set 1122# CONFIG_FS_POSIX_ACL is not set
@@ -1103,7 +1128,7 @@ CONFIG_FS_MBCACHE=y
1103CONFIG_INOTIFY=y 1128CONFIG_INOTIFY=y
1104CONFIG_INOTIFY_USER=y 1129CONFIG_INOTIFY_USER=y
1105# CONFIG_QUOTA is not set 1130# CONFIG_QUOTA is not set
1106CONFIG_DNOTIFY=y 1131# CONFIG_DNOTIFY is not set
1107# CONFIG_AUTOFS_FS is not set 1132# CONFIG_AUTOFS_FS is not set
1108# CONFIG_AUTOFS4_FS is not set 1133# CONFIG_AUTOFS4_FS is not set
1109# CONFIG_FUSE_FS is not set 1134# CONFIG_FUSE_FS is not set
@@ -1275,7 +1300,7 @@ CONFIG_ACCESS_CHECK=y
1275# CONFIG_KEYS is not set 1300# CONFIG_KEYS is not set
1276CONFIG_SECURITY=y 1301CONFIG_SECURITY=y
1277# CONFIG_SECURITY_NETWORK is not set 1302# CONFIG_SECURITY_NETWORK is not set
1278CONFIG_SECURITY_CAPABILITIES=y 1303CONFIG_SECURITY_CAPABILITIES=m
1279 1304
1280# 1305#
1281# Cryptographic options 1306# Cryptographic options
@@ -1293,4 +1318,5 @@ CONFIG_CRC32=y
1293CONFIG_ZLIB_INFLATE=y 1318CONFIG_ZLIB_INFLATE=y
1294CONFIG_ZLIB_DEFLATE=m 1319CONFIG_ZLIB_DEFLATE=m
1295CONFIG_PLIST=y 1320CONFIG_PLIST=y
1296CONFIG_IOMAP_COPY=y 1321CONFIG_HAS_IOMEM=y
1322CONFIG_HAS_IOPORT=y
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig
index 8ed67dc450fd..37688bb55b9a 100644
--- a/arch/blackfin/configs/BF537-STAMP_defconfig
+++ b/arch/blackfin/configs/BF537-STAMP_defconfig
@@ -1,12 +1,13 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20.4 3# Linux kernel version: 2.6.21.3
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 7CONFIG_RWSEM_GENERIC_SPINLOCK=y
8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
9CONFIG_BLACKFIN=y 9CONFIG_BLACKFIN=y
10CONFIG_ZONE_DMA=y
10CONFIG_BFIN=y 11CONFIG_BFIN=y
11CONFIG_SEMAPHORE_SLEEPERS=y 12CONFIG_SEMAPHORE_SLEEPERS=y
12CONFIG_GENERIC_FIND_NEXT_BIT=y 13CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -33,6 +34,7 @@ CONFIG_LOCALVERSION=""
33CONFIG_LOCALVERSION_AUTO=y 34CONFIG_LOCALVERSION_AUTO=y
34CONFIG_SYSVIPC=y 35CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set 36# CONFIG_IPC_NS is not set
37CONFIG_SYSVIPC_SYSCTL=y
36# CONFIG_POSIX_MQUEUE is not set 38# CONFIG_POSIX_MQUEUE is not set
37# CONFIG_BSD_PROCESS_ACCT is not set 39# CONFIG_BSD_PROCESS_ACCT is not set
38# CONFIG_TASKSTATS is not set 40# CONFIG_TASKSTATS is not set
@@ -41,6 +43,7 @@ CONFIG_SYSVIPC=y
41# CONFIG_IKCONFIG is not set 43# CONFIG_IKCONFIG is not set
42CONFIG_SYSFS_DEPRECATED=y 44CONFIG_SYSFS_DEPRECATED=y
43# CONFIG_RELAY is not set 45# CONFIG_RELAY is not set
46CONFIG_BLK_DEV_INITRD=y
44CONFIG_INITRAMFS_SOURCE="" 47CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y 49CONFIG_SYSCTL=y
@@ -55,9 +58,7 @@ CONFIG_BUG=y
55CONFIG_ELF_CORE=y 58CONFIG_ELF_CORE=y
56CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
57CONFIG_FUTEX=y 60CONFIG_FUTEX=y
58CONFIG_EPOLL=y
59CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 61CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
60# CONFIG_LIMIT_PAGECACHE is not set
61CONFIG_BUDDY=y 62CONFIG_BUDDY=y
62# CONFIG_NP2 is not set 63# CONFIG_NP2 is not set
63CONFIG_SLAB=y 64CONFIG_SLAB=y
@@ -127,6 +128,7 @@ CONFIG_BFIN537_STAMP=y
127# CONFIG_BFIN537_BLUETECHNIX_CM is not set 128# CONFIG_BFIN537_BLUETECHNIX_CM is not set
128# CONFIG_BFIN561_BLUETECHNIX_CM is not set 129# CONFIG_BFIN561_BLUETECHNIX_CM is not set
129# CONFIG_BFIN561_EZKIT is not set 130# CONFIG_BFIN561_EZKIT is not set
131# CONFIG_BFIN561_TEPLA is not set
130# CONFIG_PNAV10 is not set 132# CONFIG_PNAV10 is not set
131# CONFIG_GENERIC_BOARD is not set 133# CONFIG_GENERIC_BOARD is not set
132CONFIG_MEM_MT48LC32M8A2_75=y 134CONFIG_MEM_MT48LC32M8A2_75=y
@@ -196,19 +198,6 @@ CONFIG_MEM_ADD_WIDTH=10
196CONFIG_BOOT_LOAD=0x1000 198CONFIG_BOOT_LOAD=0x1000
197 199
198# 200#
199# Console UART Setup
200#
201# CONFIG_BAUD_9600 is not set
202# CONFIG_BAUD_19200 is not set
203# CONFIG_BAUD_38400 is not set
204CONFIG_BAUD_57600=y
205# CONFIG_BAUD_115200 is not set
206CONFIG_BAUD_NO_PARITY=y
207# CONFIG_BAUD_PARITY is not set
208CONFIG_BAUD_1_STOPBIT=y
209# CONFIG_BAUD_2_STOPBIT is not set
210
211#
212# Blackfin Kernel Optimizations 201# Blackfin Kernel Optimizations
213# 202#
214 203
@@ -236,6 +225,7 @@ CONFIG_MEMSET_L1=y
236CONFIG_MEMCPY_L1=y 225CONFIG_MEMCPY_L1=y
237CONFIG_SYS_BFIN_SPINLOCK_L1=y 226CONFIG_SYS_BFIN_SPINLOCK_L1=y
238# CONFIG_IP_CHECKSUM_L1 is not set 227# CONFIG_IP_CHECKSUM_L1 is not set
228CONFIG_CACHELINE_ALIGNED_L1=y
239# CONFIG_SYSCALL_TAB_L1 is not set 229# CONFIG_SYSCALL_TAB_L1 is not set
240# CONFIG_CPLB_SWITCH_TAB_L1 is not set 230# CONFIG_CPLB_SWITCH_TAB_L1 is not set
241CONFIG_RAMKERNEL=y 231CONFIG_RAMKERNEL=y
@@ -249,6 +239,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
249# CONFIG_SPARSEMEM_STATIC is not set 239# CONFIG_SPARSEMEM_STATIC is not set
250CONFIG_SPLIT_PTLOCK_CPUS=4 240CONFIG_SPLIT_PTLOCK_CPUS=4
251# CONFIG_RESOURCES_64BIT is not set 241# CONFIG_RESOURCES_64BIT is not set
242CONFIG_ZONE_DMA_FLAG=1
252CONFIG_LARGE_ALLOCS=y 243CONFIG_LARGE_ALLOCS=y
253CONFIG_BFIN_DMA_5XX=y 244CONFIG_BFIN_DMA_5XX=y
254# CONFIG_DMA_UNCACHED_2M is not set 245# CONFIG_DMA_UNCACHED_2M is not set
@@ -321,7 +312,7 @@ CONFIG_BINFMT_ZFLAT=y
321# Power management options 312# Power management options
322# 313#
323CONFIG_PM=y 314CONFIG_PM=y
324CONFIG_PM_LEGACY=y 315# CONFIG_PM_LEGACY is not set
325# CONFIG_PM_DEBUG is not set 316# CONFIG_PM_DEBUG is not set
326# CONFIG_PM_SYSFS_DEPRECATED is not set 317# CONFIG_PM_SYSFS_DEPRECATED is not set
327CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y 318CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y
@@ -349,6 +340,7 @@ CONFIG_UNIX=y
349CONFIG_XFRM=y 340CONFIG_XFRM=y
350# CONFIG_XFRM_USER is not set 341# CONFIG_XFRM_USER is not set
351# CONFIG_XFRM_SUB_POLICY is not set 342# CONFIG_XFRM_SUB_POLICY is not set
343# CONFIG_XFRM_MIGRATE is not set
352# CONFIG_NET_KEY is not set 344# CONFIG_NET_KEY is not set
353CONFIG_INET=y 345CONFIG_INET=y
354# CONFIG_IP_MULTICAST is not set 346# CONFIG_IP_MULTICAST is not set
@@ -593,6 +585,7 @@ CONFIG_MTD_NAND_IDS=m
593# 585#
594# Plug and Play support 586# Plug and Play support
595# 587#
588# CONFIG_PNPACPI is not set
596 589
597# 590#
598# Block devices 591# Block devices
@@ -604,14 +597,12 @@ CONFIG_BLK_DEV_RAM=y
604CONFIG_BLK_DEV_RAM_COUNT=16 597CONFIG_BLK_DEV_RAM_COUNT=16
605CONFIG_BLK_DEV_RAM_SIZE=4096 598CONFIG_BLK_DEV_RAM_SIZE=4096
606CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 599CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
607# CONFIG_BLK_DEV_INITRD is not set
608# CONFIG_CDROM_PKTCDVD is not set 600# CONFIG_CDROM_PKTCDVD is not set
609# CONFIG_ATA_OVER_ETH is not set 601# CONFIG_ATA_OVER_ETH is not set
610 602
611# 603#
612# Misc devices 604# Misc devices
613# 605#
614# CONFIG_TIFM_CORE is not set
615 606
616# 607#
617# ATA/ATAPI/MFM/RLL support 608# ATA/ATAPI/MFM/RLL support
@@ -751,7 +742,7 @@ CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=72
751# 742#
752# CONFIG_AD9960 is not set 743# CONFIG_AD9960 is not set
753# CONFIG_SPI_ADC_BF533 is not set 744# CONFIG_SPI_ADC_BF533 is not set
754# CONFIG_BF533_PFLAGS is not set 745# CONFIG_BF5xx_PFLAGS is not set
755# CONFIG_BF5xx_PPIFCD is not set 746# CONFIG_BF5xx_PPIFCD is not set
756# CONFIG_BF5xx_TIMERS is not set 747# CONFIG_BF5xx_TIMERS is not set
757# CONFIG_BF5xx_PPI is not set 748# CONFIG_BF5xx_PPI is not set
@@ -760,6 +751,8 @@ CONFIG_BFIN_SPORT=y
760CONFIG_TWI_LCD=m 751CONFIG_TWI_LCD=m
761CONFIG_TWI_LCD_SLAVE_ADDR=34 752CONFIG_TWI_LCD_SLAVE_ADDR=34
762# CONFIG_AD5304 is not set 753# CONFIG_AD5304 is not set
754# CONFIG_BF5xx_TEA5764 is not set
755# CONFIG_BF5xx_FBDMA is not set
763# CONFIG_VT is not set 756# CONFIG_VT is not set
764# CONFIG_SERIAL_NONSTANDARD is not set 757# CONFIG_SERIAL_NONSTANDARD is not set
765 758
@@ -804,7 +797,14 @@ CONFIG_CAN_BLACKFIN=m
804# 797#
805# Watchdog Cards 798# Watchdog Cards
806# 799#
807# CONFIG_WATCHDOG is not set 800CONFIG_WATCHDOG=y
801# CONFIG_WATCHDOG_NOWAYOUT is not set
802
803#
804# Watchdog Device Drivers
805#
806# CONFIG_SOFT_WATCHDOG is not set
807CONFIG_BFIN_WDT=y
808CONFIG_HW_RANDOM=y 808CONFIG_HW_RANDOM=y
809# CONFIG_GEN_RTC is not set 809# CONFIG_GEN_RTC is not set
810CONFIG_BLACKFIN_DPMC=y 810CONFIG_BLACKFIN_DPMC=y
@@ -868,12 +868,13 @@ CONFIG_SPI_MASTER=y
868# 868#
869# SPI Master Controller Drivers 869# SPI Master Controller Drivers
870# 870#
871CONFIG_SPI_BFIN=y
871# CONFIG_SPI_BITBANG is not set 872# CONFIG_SPI_BITBANG is not set
872 873
873# 874#
874# SPI Protocol Masters 875# SPI Protocol Masters
875# 876#
876CONFIG_SPI_BFIN=y 877# CONFIG_SPI_AT25 is not set
877 878
878# 879#
879# Dallas's 1-wire bus 880# Dallas's 1-wire bus
@@ -889,6 +890,7 @@ CONFIG_HWMON=y
889# CONFIG_SENSORS_ADM1021 is not set 890# CONFIG_SENSORS_ADM1021 is not set
890# CONFIG_SENSORS_ADM1025 is not set 891# CONFIG_SENSORS_ADM1025 is not set
891# CONFIG_SENSORS_ADM1026 is not set 892# CONFIG_SENSORS_ADM1026 is not set
893# CONFIG_SENSORS_ADM1029 is not set
892# CONFIG_SENSORS_ADM1031 is not set 894# CONFIG_SENSORS_ADM1031 is not set
893# CONFIG_SENSORS_ADM9240 is not set 895# CONFIG_SENSORS_ADM9240 is not set
894# CONFIG_SENSORS_ASB100 is not set 896# CONFIG_SENSORS_ASB100 is not set
@@ -928,6 +930,11 @@ CONFIG_HWMON=y
928# CONFIG_HWMON_DEBUG_CHIP is not set 930# CONFIG_HWMON_DEBUG_CHIP is not set
929 931
930# 932#
933# Multifunction device drivers
934#
935# CONFIG_MFD_SM501 is not set
936
937#
931# Multimedia devices 938# Multimedia devices
932# 939#
933# CONFIG_VIDEO_DEV is not set 940# CONFIG_VIDEO_DEV is not set
@@ -940,15 +947,24 @@ CONFIG_HWMON=y
940# 947#
941# Graphics support 948# Graphics support
942# 949#
943CONFIG_FIRMWARE_EDID=y 950CONFIG_BACKLIGHT_LCD_SUPPORT=y
951CONFIG_BACKLIGHT_CLASS_DEVICE=m
952CONFIG_LCD_CLASS_DEVICE=m
944CONFIG_FB=m 953CONFIG_FB=m
954CONFIG_FIRMWARE_EDID=y
955# CONFIG_FB_DDC is not set
945CONFIG_FB_CFB_FILLRECT=m 956CONFIG_FB_CFB_FILLRECT=m
946CONFIG_FB_CFB_COPYAREA=m 957CONFIG_FB_CFB_COPYAREA=m
947CONFIG_FB_CFB_IMAGEBLIT=m 958CONFIG_FB_CFB_IMAGEBLIT=m
959# CONFIG_FB_SVGALIB is not set
948# CONFIG_FB_MACMODES is not set 960# CONFIG_FB_MACMODES is not set
949# CONFIG_FB_BACKLIGHT is not set 961# CONFIG_FB_BACKLIGHT is not set
950# CONFIG_FB_MODE_HELPERS is not set 962# CONFIG_FB_MODE_HELPERS is not set
951# CONFIG_FB_TILEBLITTING is not set 963# CONFIG_FB_TILEBLITTING is not set
964
965#
966# Frame buffer hardware drivers
967#
952CONFIG_FB_BFIN_7171=m 968CONFIG_FB_BFIN_7171=m
953CONFIG_FB_BFIN_7393=m 969CONFIG_FB_BFIN_7393=m
954CONFIG_NTSC=y 970CONFIG_NTSC=y
@@ -970,11 +986,6 @@ CONFIG_LQ035_SLAVE_ADDR=0x58
970# Logo configuration 986# Logo configuration
971# 987#
972# CONFIG_LOGO is not set 988# CONFIG_LOGO is not set
973CONFIG_BACKLIGHT_LCD_SUPPORT=y
974CONFIG_BACKLIGHT_CLASS_DEVICE=m
975CONFIG_BACKLIGHT_DEVICE=y
976CONFIG_LCD_CLASS_DEVICE=m
977CONFIG_LCD_DEVICE=y
978 989
979# 990#
980# Sound 991# Sound
@@ -1007,6 +1018,18 @@ CONFIG_SND_VERBOSE_PROCFS=y
1007# CONFIG_SND_MPU401 is not set 1018# CONFIG_SND_MPU401 is not set
1008 1019
1009# 1020#
1021# ALSA Blackfin devices
1022#
1023# CONFIG_SND_BLACKFIN_AD1836 is not set
1024# CONFIG_SND_BLACKFIN_AD1981B is not set
1025# CONFIG_SND_BFIN_AD73311 is not set
1026
1027#
1028# SoC audio support
1029#
1030# CONFIG_SND_SOC is not set
1031
1032#
1010# Open Sound System 1033# Open Sound System
1011# 1034#
1012# CONFIG_SOUND_PRIME is not set 1035# CONFIG_SOUND_PRIME is not set
@@ -1015,6 +1038,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
1015# HID Devices 1038# HID Devices
1016# 1039#
1017CONFIG_HID=y 1040CONFIG_HID=y
1041# CONFIG_HID_DEBUG is not set
1018 1042
1019# 1043#
1020# USB support 1044# USB support
@@ -1087,7 +1111,6 @@ CONFIG_RTC_INTF_DEV=y
1087# CONFIG_RTC_DRV_DS1672 is not set 1111# CONFIG_RTC_DRV_DS1672 is not set
1088# CONFIG_RTC_DRV_DS1742 is not set 1112# CONFIG_RTC_DRV_DS1742 is not set
1089# CONFIG_RTC_DRV_PCF8563 is not set 1113# CONFIG_RTC_DRV_PCF8563 is not set
1090# CONFIG_RTC_DRV_PCF8583 is not set
1091# CONFIG_RTC_DRV_RS5C348 is not set 1114# CONFIG_RTC_DRV_RS5C348 is not set
1092# CONFIG_RTC_DRV_RS5C372 is not set 1115# CONFIG_RTC_DRV_RS5C372 is not set
1093# CONFIG_RTC_DRV_M48T86 is not set 1116# CONFIG_RTC_DRV_M48T86 is not set
@@ -1110,6 +1133,10 @@ CONFIG_RTC_DRV_BFIN=y
1110# 1133#
1111 1134
1112# 1135#
1136# Auxiliary Display support
1137#
1138
1139#
1113# Virtualization 1140# Virtualization
1114# 1141#
1115 1142
@@ -1121,13 +1148,9 @@ CONFIG_RTC_DRV_BFIN=y
1121# 1148#
1122# File systems 1149# File systems
1123# 1150#
1124CONFIG_EXT2_FS=y 1151# CONFIG_EXT2_FS is not set
1125CONFIG_EXT2_FS_XATTR=y
1126# CONFIG_EXT2_FS_POSIX_ACL is not set
1127# CONFIG_EXT2_FS_SECURITY is not set
1128# CONFIG_EXT3_FS is not set 1152# CONFIG_EXT3_FS is not set
1129# CONFIG_EXT4DEV_FS is not set 1153# CONFIG_EXT4DEV_FS is not set
1130CONFIG_FS_MBCACHE=y
1131# CONFIG_REISERFS_FS is not set 1154# CONFIG_REISERFS_FS is not set
1132# CONFIG_JFS_FS is not set 1155# CONFIG_JFS_FS is not set
1133# CONFIG_FS_POSIX_ACL is not set 1156# CONFIG_FS_POSIX_ACL is not set
@@ -1139,7 +1162,7 @@ CONFIG_FS_MBCACHE=y
1139CONFIG_INOTIFY=y 1162CONFIG_INOTIFY=y
1140CONFIG_INOTIFY_USER=y 1163CONFIG_INOTIFY_USER=y
1141# CONFIG_QUOTA is not set 1164# CONFIG_QUOTA is not set
1142CONFIG_DNOTIFY=y 1165# CONFIG_DNOTIFY is not set
1143# CONFIG_AUTOFS_FS is not set 1166# CONFIG_AUTOFS_FS is not set
1144# CONFIG_AUTOFS4_FS is not set 1167# CONFIG_AUTOFS4_FS is not set
1145# CONFIG_FUSE_FS is not set 1168# CONFIG_FUSE_FS is not set
@@ -1311,7 +1334,7 @@ CONFIG_ACCESS_CHECK=y
1311# CONFIG_KEYS is not set 1334# CONFIG_KEYS is not set
1312CONFIG_SECURITY=y 1335CONFIG_SECURITY=y
1313# CONFIG_SECURITY_NETWORK is not set 1336# CONFIG_SECURITY_NETWORK is not set
1314CONFIG_SECURITY_CAPABILITIES=y 1337CONFIG_SECURITY_CAPABILITIES=m
1315 1338
1316# 1339#
1317# Cryptographic options 1340# Cryptographic options
@@ -1329,4 +1352,5 @@ CONFIG_CRC32=y
1329CONFIG_ZLIB_INFLATE=y 1352CONFIG_ZLIB_INFLATE=y
1330CONFIG_ZLIB_DEFLATE=m 1353CONFIG_ZLIB_DEFLATE=m
1331CONFIG_PLIST=y 1354CONFIG_PLIST=y
1332CONFIG_IOMAP_COPY=y 1355CONFIG_HAS_IOMEM=y
1356CONFIG_HAS_IOPORT=y
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig
index e32ca2072cbf..fe4e67debaca 100644
--- a/arch/blackfin/configs/BF561-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig
@@ -1,20 +1,21 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19.3 3# Linux kernel version: 2.6.21.3
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 7CONFIG_RWSEM_GENERIC_SPINLOCK=y
8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
9CONFIG_BLACKFIN=y 9CONFIG_BLACKFIN=y
10CONFIG_ZONE_DMA=y
10CONFIG_BFIN=y 11CONFIG_BFIN=y
11CONFIG_SEMAPHORE_SLEEPERS=y 12CONFIG_SEMAPHORE_SLEEPERS=y
12CONFIG_GENERIC_FIND_NEXT_BIT=y 13CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 15CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17# CONFIG_GENERIC_TIME is not set
16CONFIG_GENERIC_CALIBRATE_DELAY=y 18CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_UCLINUX=y
18CONFIG_FORCE_MAX_ZONEORDER=14 19CONFIG_FORCE_MAX_ZONEORDER=14
19CONFIG_IRQCHIP_DEMUX_GPIO=y 20CONFIG_IRQCHIP_DEMUX_GPIO=y
20CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 21CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -33,18 +34,21 @@ CONFIG_LOCALVERSION=""
33CONFIG_LOCALVERSION_AUTO=y 34CONFIG_LOCALVERSION_AUTO=y
34CONFIG_SYSVIPC=y 35CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set 36# CONFIG_IPC_NS is not set
37CONFIG_SYSVIPC_SYSCTL=y
36# CONFIG_POSIX_MQUEUE is not set 38# CONFIG_POSIX_MQUEUE is not set
37# CONFIG_BSD_PROCESS_ACCT is not set 39# CONFIG_BSD_PROCESS_ACCT is not set
38# CONFIG_TASKSTATS is not set 40# CONFIG_TASKSTATS is not set
39# CONFIG_UTS_NS is not set 41# CONFIG_UTS_NS is not set
40# CONFIG_AUDIT is not set 42# CONFIG_AUDIT is not set
41# CONFIG_IKCONFIG is not set 43# CONFIG_IKCONFIG is not set
44CONFIG_SYSFS_DEPRECATED=y
42# CONFIG_RELAY is not set 45# CONFIG_RELAY is not set
46CONFIG_BLK_DEV_INITRD=y
43CONFIG_INITRAMFS_SOURCE="" 47CONFIG_INITRAMFS_SOURCE=""
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 48# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SYSCTL=y 49CONFIG_SYSCTL=y
46CONFIG_EMBEDDED=y 50CONFIG_EMBEDDED=y
47# CONFIG_UID16 is not set 51CONFIG_UID16=y
48CONFIG_SYSCTL_SYSCALL=y 52CONFIG_SYSCTL_SYSCALL=y
49CONFIG_KALLSYMS=y 53CONFIG_KALLSYMS=y
50# CONFIG_KALLSYMS_EXTRA_PASS is not set 54# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -54,9 +58,7 @@ CONFIG_BUG=y
54CONFIG_ELF_CORE=y 58CONFIG_ELF_CORE=y
55CONFIG_BASE_FULL=y 59CONFIG_BASE_FULL=y
56CONFIG_FUTEX=y 60CONFIG_FUTEX=y
57CONFIG_EPOLL=y
58CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3 61CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
59# CONFIG_LIMIT_PAGECACHE is not set
60CONFIG_BUDDY=y 62CONFIG_BUDDY=y
61# CONFIG_NP2 is not set 63# CONFIG_NP2 is not set
62CONFIG_SLAB=y 64CONFIG_SLAB=y
@@ -80,7 +82,9 @@ CONFIG_KMOD=y
80# Block layer 82# Block layer
81# 83#
82CONFIG_BLOCK=y 84CONFIG_BLOCK=y
85# CONFIG_LBD is not set
83# CONFIG_BLK_DEV_IO_TRACE is not set 86# CONFIG_BLK_DEV_IO_TRACE is not set
87# CONFIG_LSF is not set
84 88
85# 89#
86# IO Schedulers 90# IO Schedulers
@@ -109,7 +113,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
109# CONFIG_BF532 is not set 113# CONFIG_BF532 is not set
110# CONFIG_BF533 is not set 114# CONFIG_BF533 is not set
111# CONFIG_BF534 is not set 115# CONFIG_BF534 is not set
112# CONFIG_BF535 is not set
113# CONFIG_BF536 is not set 116# CONFIG_BF536 is not set
114# CONFIG_BF537 is not set 117# CONFIG_BF537 is not set
115CONFIG_BF561=y 118CONFIG_BF561=y
@@ -125,6 +128,7 @@ CONFIG_BFIN_DUAL_CORE=y
125# CONFIG_BFIN537_BLUETECHNIX_CM is not set 128# CONFIG_BFIN537_BLUETECHNIX_CM is not set
126# CONFIG_BFIN561_BLUETECHNIX_CM is not set 129# CONFIG_BFIN561_BLUETECHNIX_CM is not set
127CONFIG_BFIN561_EZKIT=y 130CONFIG_BFIN561_EZKIT=y
131# CONFIG_BFIN561_TEPLA is not set
128# CONFIG_PNAV10 is not set 132# CONFIG_PNAV10 is not set
129# CONFIG_GENERIC_BOARD is not set 133# CONFIG_GENERIC_BOARD is not set
130CONFIG_MEM_MT48LC16M16A2TG_75=y 134CONFIG_MEM_MT48LC16M16A2TG_75=y
@@ -214,6 +218,7 @@ CONFIG_IRQ_WDTIMER=13
214# 218#
215# Board customizations 219# Board customizations
216# 220#
221# CONFIG_CMDLINE_BOOL is not set
217 222
218# 223#
219# Board Setup 224# Board Setup
@@ -224,19 +229,6 @@ CONFIG_MEM_ADD_WIDTH=9
224CONFIG_BOOT_LOAD=0x1000 229CONFIG_BOOT_LOAD=0x1000
225 230
226# 231#
227# Console UART Setup
228#
229# CONFIG_BAUD_9600 is not set
230# CONFIG_BAUD_19200 is not set
231# CONFIG_BAUD_38400 is not set
232CONFIG_BAUD_57600=y
233# CONFIG_BAUD_115200 is not set
234CONFIG_BAUD_NO_PARITY=y
235# CONFIG_BAUD_PARITY is not set
236CONFIG_BAUD_1_STOPBIT=y
237# CONFIG_BAUD_2_STOPBIT is not set
238
239#
240# Blackfin Kernel Optimizations 232# Blackfin Kernel Optimizations
241# 233#
242 234
@@ -245,6 +237,7 @@ CONFIG_BAUD_1_STOPBIT=y
245# 237#
246# CONFIG_HZ_100 is not set 238# CONFIG_HZ_100 is not set
247CONFIG_HZ_250=y 239CONFIG_HZ_250=y
240# CONFIG_HZ_300 is not set
248# CONFIG_HZ_1000 is not set 241# CONFIG_HZ_1000 is not set
249CONFIG_HZ=250 242CONFIG_HZ=250
250 243
@@ -263,6 +256,7 @@ CONFIG_MEMSET_L1=y
263CONFIG_MEMCPY_L1=y 256CONFIG_MEMCPY_L1=y
264CONFIG_SYS_BFIN_SPINLOCK_L1=y 257CONFIG_SYS_BFIN_SPINLOCK_L1=y
265# CONFIG_IP_CHECKSUM_L1 is not set 258# CONFIG_IP_CHECKSUM_L1 is not set
259CONFIG_CACHELINE_ALIGNED_L1=y
266# CONFIG_SYSCALL_TAB_L1 is not set 260# CONFIG_SYSCALL_TAB_L1 is not set
267# CONFIG_CPLB_SWITCH_TAB_L1 is not set 261# CONFIG_CPLB_SWITCH_TAB_L1 is not set
268CONFIG_RAMKERNEL=y 262CONFIG_RAMKERNEL=y
@@ -276,6 +270,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
276# CONFIG_SPARSEMEM_STATIC is not set 270# CONFIG_SPARSEMEM_STATIC is not set
277CONFIG_SPLIT_PTLOCK_CPUS=4 271CONFIG_SPLIT_PTLOCK_CPUS=4
278# CONFIG_RESOURCES_64BIT is not set 272# CONFIG_RESOURCES_64BIT is not set
273CONFIG_ZONE_DMA_FLAG=1
279CONFIG_LARGE_ALLOCS=y 274CONFIG_LARGE_ALLOCS=y
280CONFIG_BFIN_DMA_5XX=y 275CONFIG_BFIN_DMA_5XX=y
281# CONFIG_DMA_UNCACHED_2M is not set 276# CONFIG_DMA_UNCACHED_2M is not set
@@ -368,6 +363,7 @@ CONFIG_UNIX=y
368CONFIG_XFRM=y 363CONFIG_XFRM=y
369# CONFIG_XFRM_USER is not set 364# CONFIG_XFRM_USER is not set
370# CONFIG_XFRM_SUB_POLICY is not set 365# CONFIG_XFRM_SUB_POLICY is not set
366# CONFIG_XFRM_MIGRATE is not set
371# CONFIG_NET_KEY is not set 367# CONFIG_NET_KEY is not set
372CONFIG_INET=y 368CONFIG_INET=y
373# CONFIG_IP_MULTICAST is not set 369# CONFIG_IP_MULTICAST is not set
@@ -394,6 +390,7 @@ CONFIG_INET_TCP_DIAG=y
394# CONFIG_TCP_CONG_ADVANCED is not set 390# CONFIG_TCP_CONG_ADVANCED is not set
395CONFIG_TCP_CONG_CUBIC=y 391CONFIG_TCP_CONG_CUBIC=y
396CONFIG_DEFAULT_TCP_CONG="cubic" 392CONFIG_DEFAULT_TCP_CONG="cubic"
393# CONFIG_TCP_MD5SIG is not set
397# CONFIG_IPV6 is not set 394# CONFIG_IPV6 is not set
398# CONFIG_INET6_XFRM_TUNNEL is not set 395# CONFIG_INET6_XFRM_TUNNEL is not set
399# CONFIG_INET6_TUNNEL is not set 396# CONFIG_INET6_TUNNEL is not set
@@ -437,7 +434,48 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
437# 434#
438# CONFIG_NET_PKTGEN is not set 435# CONFIG_NET_PKTGEN is not set
439# CONFIG_HAMRADIO is not set 436# CONFIG_HAMRADIO is not set
440# CONFIG_IRDA is not set 437CONFIG_IRDA=m
438
439#
440# IrDA protocols
441#
442CONFIG_IRLAN=m
443CONFIG_IRCOMM=m
444# CONFIG_IRDA_ULTRA is not set
445
446#
447# IrDA options
448#
449CONFIG_IRDA_CACHE_LAST_LSAP=y
450# CONFIG_IRDA_FAST_RR is not set
451# CONFIG_IRDA_DEBUG is not set
452
453#
454# Infrared-port device drivers
455#
456
457#
458# SIR device drivers
459#
460CONFIG_IRTTY_SIR=m
461
462#
463# Dongle support
464#
465# CONFIG_DONGLE is not set
466
467#
468# Old SIR device drivers
469#
470# CONFIG_IRPORT_SIR is not set
471
472#
473# Old Serial dongle support
474#
475
476#
477# FIR device drivers
478#
441# CONFIG_BT is not set 479# CONFIG_BT is not set
442# CONFIG_IEEE80211 is not set 480# CONFIG_IEEE80211 is not set
443 481
@@ -472,6 +510,7 @@ CONFIG_MTD_PARTITIONS=y
472# User Modules And Translation Layers 510# User Modules And Translation Layers
473# 511#
474CONFIG_MTD_CHAR=m 512CONFIG_MTD_CHAR=m
513CONFIG_MTD_BLKDEVS=y
475CONFIG_MTD_BLOCK=y 514CONFIG_MTD_BLOCK=y
476# CONFIG_FTL is not set 515# CONFIG_FTL is not set
477# CONFIG_NFTL is not set 516# CONFIG_NFTL is not set
@@ -528,6 +567,8 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
528# 567#
529# Self-contained MTD device drivers 568# Self-contained MTD device drivers
530# 569#
570# CONFIG_MTD_DATAFLASH is not set
571# CONFIG_MTD_M25P80 is not set
531# CONFIG_MTD_SLRAM is not set 572# CONFIG_MTD_SLRAM is not set
532# CONFIG_MTD_PHRAM is not set 573# CONFIG_MTD_PHRAM is not set
533# CONFIG_MTD_MTDRAM is not set 574# CONFIG_MTD_MTDRAM is not set
@@ -558,6 +599,7 @@ CONFIG_BFIN_FLASH_BANK_3=0x7BB0
558# 599#
559# Plug and Play support 600# Plug and Play support
560# 601#
602# CONFIG_PNPACPI is not set
561 603
562# 604#
563# Block devices 605# Block devices
@@ -569,14 +611,12 @@ CONFIG_BLK_DEV_RAM=y
569CONFIG_BLK_DEV_RAM_COUNT=16 611CONFIG_BLK_DEV_RAM_COUNT=16
570CONFIG_BLK_DEV_RAM_SIZE=4096 612CONFIG_BLK_DEV_RAM_SIZE=4096
571CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 613CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
572# CONFIG_BLK_DEV_INITRD is not set
573# CONFIG_CDROM_PKTCDVD is not set 614# CONFIG_CDROM_PKTCDVD is not set
574# CONFIG_ATA_OVER_ETH is not set 615# CONFIG_ATA_OVER_ETH is not set
575 616
576# 617#
577# Misc devices 618# Misc devices
578# 619#
579# CONFIG_TIFM_CORE is not set
580 620
581# 621#
582# ATA/ATAPI/MFM/RLL support 622# ATA/ATAPI/MFM/RLL support
@@ -675,7 +715,26 @@ CONFIG_SMC91X=y
675# 715#
676# Input device support 716# Input device support
677# 717#
678# CONFIG_INPUT is not set 718CONFIG_INPUT=m
719# CONFIG_INPUT_FF_MEMLESS is not set
720
721#
722# Userland interfaces
723#
724# CONFIG_INPUT_MOUSEDEV is not set
725# CONFIG_INPUT_JOYDEV is not set
726# CONFIG_INPUT_TSDEV is not set
727CONFIG_INPUT_EVDEV=m
728# CONFIG_INPUT_EVBUG is not set
729
730#
731# Input Device Drivers
732#
733# CONFIG_INPUT_KEYBOARD is not set
734# CONFIG_INPUT_MOUSE is not set
735# CONFIG_INPUT_JOYSTICK is not set
736# CONFIG_INPUT_TOUCHSCREEN is not set
737# CONFIG_INPUT_MISC is not set
679 738
680# 739#
681# Hardware I/O ports 740# Hardware I/O ports
@@ -688,12 +747,14 @@ CONFIG_SMC91X=y
688# 747#
689# CONFIG_AD9960 is not set 748# CONFIG_AD9960 is not set
690# CONFIG_SPI_ADC_BF533 is not set 749# CONFIG_SPI_ADC_BF533 is not set
691# CONFIG_BF533_PFLAGS is not set 750# CONFIG_BF5xx_PFLAGS is not set
692# CONFIG_BF5xx_PPIFCD is not set 751# CONFIG_BF5xx_PPIFCD is not set
693# CONFIG_BF5xx_TIMERS is not set 752# CONFIG_BF5xx_TIMERS is not set
694# CONFIG_BF5xx_PPI is not set 753# CONFIG_BF5xx_PPI is not set
695# CONFIG_BFIN_SPORT is not set 754# CONFIG_BFIN_SPORT is not set
696# CONFIG_BFIN_TIMER_LATENCY is not set 755# CONFIG_BFIN_TIMER_LATENCY is not set
756# CONFIG_AD5304 is not set
757# CONFIG_BF5xx_FBDMA is not set
697# CONFIG_VT is not set 758# CONFIG_VT is not set
698# CONFIG_SERIAL_NONSTANDARD is not set 759# CONFIG_SERIAL_NONSTANDARD is not set
699 760
@@ -730,16 +791,19 @@ CONFIG_UNIX98_PTYS=y
730# 791#
731# Watchdog Cards 792# Watchdog Cards
732# 793#
733# CONFIG_WATCHDOG is not set 794CONFIG_WATCHDOG=y
795# CONFIG_WATCHDOG_NOWAYOUT is not set
796
797#
798# Watchdog Device Drivers
799#
800# CONFIG_SOFT_WATCHDOG is not set
801CONFIG_BFIN_WDT=y
734CONFIG_HW_RANDOM=y 802CONFIG_HW_RANDOM=y
735# CONFIG_GEN_RTC is not set 803# CONFIG_GEN_RTC is not set
736# CONFIG_BLACKFIN_DPMC is not set 804# CONFIG_BLACKFIN_DPMC is not set
737# CONFIG_DTLK is not set 805# CONFIG_DTLK is not set
738# CONFIG_R3964 is not set 806# CONFIG_R3964 is not set
739
740#
741# Ftape, the floppy tape device driver
742#
743# CONFIG_RAW_DRIVER is not set 807# CONFIG_RAW_DRIVER is not set
744 808
745# 809#
@@ -755,8 +819,19 @@ CONFIG_HW_RANDOM=y
755# 819#
756# SPI support 820# SPI support
757# 821#
758# CONFIG_SPI is not set 822CONFIG_SPI=y
759# CONFIG_SPI_MASTER is not set 823CONFIG_SPI_MASTER=y
824
825#
826# SPI Master Controller Drivers
827#
828CONFIG_SPI_BFIN=y
829# CONFIG_SPI_BITBANG is not set
830
831#
832# SPI Protocol Masters
833#
834# CONFIG_SPI_AT25 is not set
760 835
761# 836#
762# Dallas's 1-wire bus 837# Dallas's 1-wire bus
@@ -770,10 +845,17 @@ CONFIG_HWMON=y
770# CONFIG_HWMON_VID is not set 845# CONFIG_HWMON_VID is not set
771# CONFIG_SENSORS_ABITUGURU is not set 846# CONFIG_SENSORS_ABITUGURU is not set
772# CONFIG_SENSORS_F71805F is not set 847# CONFIG_SENSORS_F71805F is not set
848# CONFIG_SENSORS_LM70 is not set
849# CONFIG_SENSORS_PC87427 is not set
773# CONFIG_SENSORS_VT1211 is not set 850# CONFIG_SENSORS_VT1211 is not set
774# CONFIG_HWMON_DEBUG_CHIP is not set 851# CONFIG_HWMON_DEBUG_CHIP is not set
775 852
776# 853#
854# Multifunction device drivers
855#
856# CONFIG_MFD_SM501 is not set
857
858#
777# Multimedia devices 859# Multimedia devices
778# 860#
779# CONFIG_VIDEO_DEV is not set 861# CONFIG_VIDEO_DEV is not set
@@ -786,9 +868,8 @@ CONFIG_HWMON=y
786# 868#
787# Graphics support 869# Graphics support
788# 870#
789CONFIG_FIRMWARE_EDID=y
790# CONFIG_FB is not set
791# CONFIG_BACKLIGHT_LCD_SUPPORT is not set 871# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
872# CONFIG_FB is not set
792 873
793# 874#
794# Sound 875# Sound
@@ -796,6 +877,12 @@ CONFIG_FIRMWARE_EDID=y
796# CONFIG_SOUND is not set 877# CONFIG_SOUND is not set
797 878
798# 879#
880# HID Devices
881#
882CONFIG_HID=m
883# CONFIG_HID_DEBUG is not set
884
885#
799# USB support 886# USB support
800# 887#
801CONFIG_USB_ARCH_HAS_HCD=y 888CONFIG_USB_ARCH_HAS_HCD=y
@@ -815,6 +902,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
815# 902#
816# MMC/SD Card support 903# MMC/SD Card support
817# 904#
905# CONFIG_SPI_MMC is not set
818# CONFIG_MMC is not set 906# CONFIG_MMC is not set
819 907
820# 908#
@@ -857,6 +945,14 @@ CONFIG_USB_ARCH_HAS_HCD=y
857# 945#
858 946
859# 947#
948# Auxiliary Display support
949#
950
951#
952# Virtualization
953#
954
955#
860# PBX support 956# PBX support
861# 957#
862# CONFIG_PBX is not set 958# CONFIG_PBX is not set
@@ -864,13 +960,9 @@ CONFIG_USB_ARCH_HAS_HCD=y
864# 960#
865# File systems 961# File systems
866# 962#
867CONFIG_EXT2_FS=y 963# CONFIG_EXT2_FS is not set
868CONFIG_EXT2_FS_XATTR=y
869# CONFIG_EXT2_FS_POSIX_ACL is not set
870# CONFIG_EXT2_FS_SECURITY is not set
871# CONFIG_EXT3_FS is not set 964# CONFIG_EXT3_FS is not set
872# CONFIG_EXT4DEV_FS is not set 965# CONFIG_EXT4DEV_FS is not set
873CONFIG_FS_MBCACHE=y
874# CONFIG_REISERFS_FS is not set 966# CONFIG_REISERFS_FS is not set
875# CONFIG_JFS_FS is not set 967# CONFIG_JFS_FS is not set
876# CONFIG_FS_POSIX_ACL is not set 968# CONFIG_FS_POSIX_ACL is not set
@@ -882,7 +974,7 @@ CONFIG_FS_MBCACHE=y
882CONFIG_INOTIFY=y 974CONFIG_INOTIFY=y
883CONFIG_INOTIFY_USER=y 975CONFIG_INOTIFY_USER=y
884# CONFIG_QUOTA is not set 976# CONFIG_QUOTA is not set
885CONFIG_DNOTIFY=y 977# CONFIG_DNOTIFY is not set
886# CONFIG_AUTOFS_FS is not set 978# CONFIG_AUTOFS_FS is not set
887# CONFIG_AUTOFS4_FS is not set 979# CONFIG_AUTOFS4_FS is not set
888# CONFIG_FUSE_FS is not set 980# CONFIG_FUSE_FS is not set
@@ -931,7 +1023,6 @@ CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
931# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set 1023# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
932# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set 1024# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
933CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y 1025CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
934# CONFIG_JFFS_FS is not set
935CONFIG_JFFS2_FS=m 1026CONFIG_JFFS2_FS=m
936CONFIG_JFFS2_FS_DEBUG=0 1027CONFIG_JFFS2_FS_DEBUG=0
937CONFIG_JFFS2_FS_WRITEBUFFER=y 1028CONFIG_JFFS2_FS_WRITEBUFFER=y
@@ -1022,6 +1113,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1022# CONFIG_NLS_UTF8 is not set 1113# CONFIG_NLS_UTF8 is not set
1023 1114
1024# 1115#
1116# Distributed Lock Manager
1117#
1118# CONFIG_DLM is not set
1119
1120#
1025# Profiling support 1121# Profiling support
1026# 1122#
1027# CONFIG_PROFILING is not set 1123# CONFIG_PROFILING is not set
@@ -1033,20 +1129,17 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1033CONFIG_ENABLE_MUST_CHECK=y 1129CONFIG_ENABLE_MUST_CHECK=y
1034# CONFIG_MAGIC_SYSRQ is not set 1130# CONFIG_MAGIC_SYSRQ is not set
1035# CONFIG_UNUSED_SYMBOLS is not set 1131# CONFIG_UNUSED_SYMBOLS is not set
1132# CONFIG_DEBUG_FS is not set
1133# CONFIG_HEADERS_CHECK is not set
1036# CONFIG_DEBUG_KERNEL is not set 1134# CONFIG_DEBUG_KERNEL is not set
1037CONFIG_LOG_BUF_SHIFT=14 1135CONFIG_LOG_BUF_SHIFT=14
1038# CONFIG_DEBUG_BUGVERBOSE is not set 1136# CONFIG_DEBUG_BUGVERBOSE is not set
1039# CONFIG_DEBUG_FS is not set
1040# CONFIG_UNWIND_INFO is not set
1041# CONFIG_HEADERS_CHECK is not set
1042# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set 1137# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
1043CONFIG_DEBUG_HUNT_FOR_ZERO=y 1138CONFIG_DEBUG_HUNT_FOR_ZERO=y
1044# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 1139# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
1045# CONFIG_DUAL_CORE_TEST_MODULE is not set 1140# CONFIG_DUAL_CORE_TEST_MODULE is not set
1046# CONFIG_BOOTPARAM is not set
1047# CONFIG_NO_KERNEL_MSG is not set
1048CONFIG_CPLB_INFO=y 1141CONFIG_CPLB_INFO=y
1049# CONFIG_NO_ACCESS_CHECK is not set 1142CONFIG_ACCESS_CHECK=y
1050 1143
1051# 1144#
1052# Security options 1145# Security options
@@ -1054,7 +1147,7 @@ CONFIG_CPLB_INFO=y
1054# CONFIG_KEYS is not set 1147# CONFIG_KEYS is not set
1055CONFIG_SECURITY=y 1148CONFIG_SECURITY=y
1056# CONFIG_SECURITY_NETWORK is not set 1149# CONFIG_SECURITY_NETWORK is not set
1057CONFIG_SECURITY_CAPABILITIES=y 1150CONFIG_SECURITY_CAPABILITIES=m
1058 1151
1059# 1152#
1060# Cryptographic options 1153# Cryptographic options
@@ -1064,10 +1157,13 @@ CONFIG_SECURITY_CAPABILITIES=y
1064# 1157#
1065# Library routines 1158# Library routines
1066# 1159#
1067# CONFIG_CRC_CCITT is not set 1160CONFIG_BITREVERSE=y
1161CONFIG_CRC_CCITT=m
1068# CONFIG_CRC16 is not set 1162# CONFIG_CRC16 is not set
1069CONFIG_CRC32=y 1163CONFIG_CRC32=y
1070# CONFIG_LIBCRC32C is not set 1164# CONFIG_LIBCRC32C is not set
1071CONFIG_ZLIB_INFLATE=y 1165CONFIG_ZLIB_INFLATE=y
1072CONFIG_ZLIB_DEFLATE=m 1166CONFIG_ZLIB_DEFLATE=m
1073CONFIG_PLIST=y 1167CONFIG_PLIST=y
1168CONFIG_HAS_IOMEM=y
1169CONFIG_HAS_IOPORT=y
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig
index 97b4ffa2b4ac..a783ff69ace1 100644
--- a/arch/blackfin/configs/PNAV-10_defconfig
+++ b/arch/blackfin/configs/PNAV-10_defconfig
@@ -1,20 +1,21 @@
1# 1#
2# Automatically generated make config: don't edit 2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.19.3 3# Linux kernel version: 2.6.21.3
4# 4#
5# CONFIG_MMU is not set 5# CONFIG_MMU is not set
6# CONFIG_FPU is not set 6# CONFIG_FPU is not set
7CONFIG_RWSEM_GENERIC_SPINLOCK=y 7CONFIG_RWSEM_GENERIC_SPINLOCK=y
8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set 8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
9CONFIG_BLACKFIN=y 9CONFIG_BLACKFIN=y
10CONFIG_ZONE_DMA=y
10CONFIG_BFIN=y 11CONFIG_BFIN=y
11CONFIG_SEMAPHORE_SLEEPERS=y 12CONFIG_SEMAPHORE_SLEEPERS=y
12CONFIG_GENERIC_FIND_NEXT_BIT=y 13CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y 14CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y 15CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_IRQ_PROBE=y 16CONFIG_GENERIC_IRQ_PROBE=y
17# CONFIG_GENERIC_TIME is not set
16CONFIG_GENERIC_CALIBRATE_DELAY=y 18CONFIG_GENERIC_CALIBRATE_DELAY=y
17CONFIG_UCLINUX=y
18CONFIG_FORCE_MAX_ZONEORDER=14 19CONFIG_FORCE_MAX_ZONEORDER=14
19CONFIG_IRQCHIP_DEMUX_GPIO=y 20CONFIG_IRQCHIP_DEMUX_GPIO=y
20CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" 21CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
@@ -33,14 +34,16 @@ CONFIG_LOCALVERSION=""
33CONFIG_LOCALVERSION_AUTO=y 34CONFIG_LOCALVERSION_AUTO=y
34CONFIG_SYSVIPC=y 35CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set 36# CONFIG_IPC_NS is not set
37CONFIG_SYSVIPC_SYSCTL=y
36# CONFIG_POSIX_MQUEUE is not set 38# CONFIG_POSIX_MQUEUE is not set
37# CONFIG_BSD_PROCESS_ACCT is not set 39# CONFIG_BSD_PROCESS_ACCT is not set
38# CONFIG_TASKSTATS is not set 40# CONFIG_TASKSTATS is not set
39# CONFIG_UTS_NS is not set 41# CONFIG_UTS_NS is not set
40# CONFIG_AUDIT is not set 42# CONFIG_AUDIT is not set
41# CONFIG_IKCONFIG is not set 43# CONFIG_IKCONFIG is not set
44CONFIG_SYSFS_DEPRECATED=y
42# CONFIG_RELAY is not set 45# CONFIG_RELAY is not set
43CONFIG_INITRAMFS_SOURCE="" 46# CONFIG_BLK_DEV_INITRD is not set
44# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set 47# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
45CONFIG_SYSCTL=y 48CONFIG_SYSCTL=y
46CONFIG_EMBEDDED=y 49CONFIG_EMBEDDED=y
@@ -54,9 +57,7 @@ CONFIG_BUG=y
54CONFIG_ELF_CORE=y 57CONFIG_ELF_CORE=y
55CONFIG_BASE_FULL=y 58CONFIG_BASE_FULL=y
56CONFIG_FUTEX=y 59CONFIG_FUTEX=y
57CONFIG_EPOLL=y
58CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=9 60CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=9
59# CONFIG_LIMIT_PAGECACHE is not set
60CONFIG_BUDDY=y 61CONFIG_BUDDY=y
61# CONFIG_NP2 is not set 62# CONFIG_NP2 is not set
62CONFIG_SLAB=y 63CONFIG_SLAB=y
@@ -80,7 +81,9 @@ CONFIG_KMOD=y
80# Block layer 81# Block layer
81# 82#
82CONFIG_BLOCK=y 83CONFIG_BLOCK=y
84# CONFIG_LBD is not set
83# CONFIG_BLK_DEV_IO_TRACE is not set 85# CONFIG_BLK_DEV_IO_TRACE is not set
86# CONFIG_LSF is not set
84 87
85# 88#
86# IO Schedulers 89# IO Schedulers
@@ -109,7 +112,6 @@ CONFIG_PREEMPT_VOLUNTARY=y
109# CONFIG_BF532 is not set 112# CONFIG_BF532 is not set
110# CONFIG_BF533 is not set 113# CONFIG_BF533 is not set
111# CONFIG_BF534 is not set 114# CONFIG_BF534 is not set
112# CONFIG_BF535 is not set
113# CONFIG_BF536 is not set 115# CONFIG_BF536 is not set
114CONFIG_BF537=y 116CONFIG_BF537=y
115# CONFIG_BF561 is not set 117# CONFIG_BF561 is not set
@@ -125,6 +127,7 @@ CONFIG_BFIN_SINGLE_CORE=y
125# CONFIG_BFIN537_BLUETECHNIX_CM is not set 127# CONFIG_BFIN537_BLUETECHNIX_CM is not set
126# CONFIG_BFIN561_BLUETECHNIX_CM is not set 128# CONFIG_BFIN561_BLUETECHNIX_CM is not set
127# CONFIG_BFIN561_EZKIT is not set 129# CONFIG_BFIN561_EZKIT is not set
130# CONFIG_BFIN561_TEPLA is not set
128CONFIG_PNAV10=y 131CONFIG_PNAV10=y
129# CONFIG_GENERIC_BOARD is not set 132# CONFIG_GENERIC_BOARD is not set
130CONFIG_MEM_MT48LC32M8A2_75=y 133CONFIG_MEM_MT48LC32M8A2_75=y
@@ -183,6 +186,7 @@ CONFIG_IRQ_WATCH=13
183# 186#
184# Board customizations 187# Board customizations
185# 188#
189# CONFIG_CMDLINE_BOOL is not set
186 190
187# 191#
188# Board Setup 192# Board Setup
@@ -193,19 +197,6 @@ CONFIG_MEM_ADD_WIDTH=10
193CONFIG_BOOT_LOAD=0x1000 197CONFIG_BOOT_LOAD=0x1000
194 198
195# 199#
196# Console UART Setup
197#
198# CONFIG_BAUD_9600 is not set
199# CONFIG_BAUD_19200 is not set
200# CONFIG_BAUD_38400 is not set
201# CONFIG_BAUD_57600 is not set
202CONFIG_BAUD_115200=y
203CONFIG_BAUD_NO_PARITY=y
204# CONFIG_BAUD_PARITY is not set
205CONFIG_BAUD_1_STOPBIT=y
206# CONFIG_BAUD_2_STOPBIT is not set
207
208#
209# Blackfin Kernel Optimizations 200# Blackfin Kernel Optimizations
210# 201#
211 202
@@ -214,6 +205,7 @@ CONFIG_BAUD_1_STOPBIT=y
214# 205#
215# CONFIG_HZ_100 is not set 206# CONFIG_HZ_100 is not set
216CONFIG_HZ_250=y 207CONFIG_HZ_250=y
208# CONFIG_HZ_300 is not set
217# CONFIG_HZ_1000 is not set 209# CONFIG_HZ_1000 is not set
218CONFIG_HZ=250 210CONFIG_HZ=250
219 211
@@ -232,6 +224,7 @@ CONFIG_MEMSET_L1=y
232CONFIG_MEMCPY_L1=y 224CONFIG_MEMCPY_L1=y
233CONFIG_SYS_BFIN_SPINLOCK_L1=y 225CONFIG_SYS_BFIN_SPINLOCK_L1=y
234CONFIG_IP_CHECKSUM_L1=y 226CONFIG_IP_CHECKSUM_L1=y
227CONFIG_CACHELINE_ALIGNED_L1=y
235CONFIG_SYSCALL_TAB_L1=y 228CONFIG_SYSCALL_TAB_L1=y
236CONFIG_CPLB_SWITCH_TAB_L1=y 229CONFIG_CPLB_SWITCH_TAB_L1=y
237CONFIG_RAMKERNEL=y 230CONFIG_RAMKERNEL=y
@@ -245,6 +238,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
245# CONFIG_SPARSEMEM_STATIC is not set 238# CONFIG_SPARSEMEM_STATIC is not set
246CONFIG_SPLIT_PTLOCK_CPUS=4 239CONFIG_SPLIT_PTLOCK_CPUS=4
247# CONFIG_RESOURCES_64BIT is not set 240# CONFIG_RESOURCES_64BIT is not set
241CONFIG_ZONE_DMA_FLAG=1
248CONFIG_LARGE_ALLOCS=y 242CONFIG_LARGE_ALLOCS=y
249CONFIG_BFIN_DMA_5XX=y 243CONFIG_BFIN_DMA_5XX=y
250# CONFIG_DMA_UNCACHED_2M is not set 244# CONFIG_DMA_UNCACHED_2M is not set
@@ -338,6 +332,7 @@ CONFIG_UNIX=y
338CONFIG_XFRM=y 332CONFIG_XFRM=y
339# CONFIG_XFRM_USER is not set 333# CONFIG_XFRM_USER is not set
340# CONFIG_XFRM_SUB_POLICY is not set 334# CONFIG_XFRM_SUB_POLICY is not set
335# CONFIG_XFRM_MIGRATE is not set
341# CONFIG_NET_KEY is not set 336# CONFIG_NET_KEY is not set
342CONFIG_INET=y 337CONFIG_INET=y
343# CONFIG_IP_MULTICAST is not set 338# CONFIG_IP_MULTICAST is not set
@@ -364,6 +359,7 @@ CONFIG_INET_TCP_DIAG=y
364# CONFIG_TCP_CONG_ADVANCED is not set 359# CONFIG_TCP_CONG_ADVANCED is not set
365CONFIG_TCP_CONG_CUBIC=y 360CONFIG_TCP_CONG_CUBIC=y
366CONFIG_DEFAULT_TCP_CONG="cubic" 361CONFIG_DEFAULT_TCP_CONG="cubic"
362# CONFIG_TCP_MD5SIG is not set
367# CONFIG_IPV6 is not set 363# CONFIG_IPV6 is not set
368# CONFIG_INET6_XFRM_TUNNEL is not set 364# CONFIG_INET6_XFRM_TUNNEL is not set
369# CONFIG_INET6_TUNNEL is not set 365# CONFIG_INET6_TUNNEL is not set
@@ -442,6 +438,7 @@ CONFIG_MTD_PARTITIONS=y
442# User Modules And Translation Layers 438# User Modules And Translation Layers
443# 439#
444CONFIG_MTD_CHAR=m 440CONFIG_MTD_CHAR=m
441CONFIG_MTD_BLKDEVS=y
445CONFIG_MTD_BLOCK=y 442CONFIG_MTD_BLOCK=y
446# CONFIG_FTL is not set 443# CONFIG_FTL is not set
447# CONFIG_NFTL is not set 444# CONFIG_NFTL is not set
@@ -522,6 +519,7 @@ CONFIG_MTD_NAND_IDS=y
522# 519#
523# Plug and Play support 520# Plug and Play support
524# 521#
522# CONFIG_PNPACPI is not set
525 523
526# 524#
527# Block devices 525# Block devices
@@ -533,14 +531,12 @@ CONFIG_BLK_DEV_RAM=y
533CONFIG_BLK_DEV_RAM_COUNT=16 531CONFIG_BLK_DEV_RAM_COUNT=16
534CONFIG_BLK_DEV_RAM_SIZE=4096 532CONFIG_BLK_DEV_RAM_SIZE=4096
535CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 533CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
536# CONFIG_BLK_DEV_INITRD is not set
537# CONFIG_CDROM_PKTCDVD is not set 534# CONFIG_CDROM_PKTCDVD is not set
538# CONFIG_ATA_OVER_ETH is not set 535# CONFIG_ATA_OVER_ETH is not set
539 536
540# 537#
541# Misc devices 538# Misc devices
542# 539#
543# CONFIG_TIFM_CORE is not set
544 540
545# 541#
546# ATA/ATAPI/MFM/RLL support 542# ATA/ATAPI/MFM/RLL support
@@ -674,6 +670,7 @@ CONFIG_TOUCHSCREEN_AD7877=y
674# CONFIG_TOUCHSCREEN_PENMOUNT is not set 670# CONFIG_TOUCHSCREEN_PENMOUNT is not set
675# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set 671# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
676# CONFIG_TOUCHSCREEN_TOUCHWIN is not set 672# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
673# CONFIG_TOUCHSCREEN_UCB1400 is not set
677CONFIG_INPUT_MISC=y 674CONFIG_INPUT_MISC=y
678CONFIG_INPUT_UINPUT=y 675CONFIG_INPUT_UINPUT=y
679# CONFIG_BF53X_PFBUTTONS is not set 676# CONFIG_BF53X_PFBUTTONS is not set
@@ -690,7 +687,7 @@ CONFIG_INPUT_UINPUT=y
690# 687#
691# CONFIG_AD9960 is not set 688# CONFIG_AD9960 is not set
692# CONFIG_SPI_ADC_BF533 is not set 689# CONFIG_SPI_ADC_BF533 is not set
693# CONFIG_BF533_PFLAGS is not set 690# CONFIG_BF5xx_PFLAGS is not set
694# CONFIG_BF5xx_PPIFCD is not set 691# CONFIG_BF5xx_PPIFCD is not set
695# CONFIG_BF5xx_TIMERS is not set 692# CONFIG_BF5xx_TIMERS is not set
696# CONFIG_BF5xx_PPI is not set 693# CONFIG_BF5xx_PPI is not set
@@ -699,6 +696,8 @@ CONFIG_BFIN_SPORT=y
699CONFIG_TWI_LCD=m 696CONFIG_TWI_LCD=m
700CONFIG_TWI_LCD_SLAVE_ADDR=34 697CONFIG_TWI_LCD_SLAVE_ADDR=34
701# CONFIG_AD5304 is not set 698# CONFIG_AD5304 is not set
699# CONFIG_BF5xx_TEA5764 is not set
700# CONFIG_BF5xx_FBDMA is not set
702# CONFIG_VT is not set 701# CONFIG_VT is not set
703# CONFIG_SERIAL_NONSTANDARD is not set 702# CONFIG_SERIAL_NONSTANDARD is not set
704 703
@@ -750,10 +749,6 @@ CONFIG_HW_RANDOM=y
750CONFIG_BLACKFIN_DPMC=y 749CONFIG_BLACKFIN_DPMC=y
751# CONFIG_DTLK is not set 750# CONFIG_DTLK is not set
752# CONFIG_R3964 is not set 751# CONFIG_R3964 is not set
753
754#
755# Ftape, the floppy tape device driver
756#
757# CONFIG_RAW_DRIVER is not set 752# CONFIG_RAW_DRIVER is not set
758 753
759# 754#
@@ -777,9 +772,9 @@ CONFIG_I2C_CHARDEV=y
777# 772#
778# I2C Hardware Bus support 773# I2C Hardware Bus support
779# 774#
780# CONFIG_I2C_BFIN_GPIO is not set 775# CONFIG_I2C_BLACKFIN_GPIO is not set
781CONFIG_I2C_BFIN_TWI=y 776CONFIG_I2C_BLACKFIN_TWI=y
782CONFIG_TWICLK_KHZ=50 777CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=50
783# CONFIG_I2C_OCORES is not set 778# CONFIG_I2C_OCORES is not set
784# CONFIG_I2C_PARPORT_LIGHT is not set 779# CONFIG_I2C_PARPORT_LIGHT is not set
785# CONFIG_I2C_STUB is not set 780# CONFIG_I2C_STUB is not set
@@ -812,12 +807,13 @@ CONFIG_SPI_MASTER=y
812# 807#
813# SPI Master Controller Drivers 808# SPI Master Controller Drivers
814# 809#
815# CONFIG_SPI_BITBANG is not set
816CONFIG_SPI_BFIN=y 810CONFIG_SPI_BFIN=y
811# CONFIG_SPI_BITBANG is not set
817 812
818# 813#
819# SPI Protocol Masters 814# SPI Protocol Masters
820# 815#
816# CONFIG_SPI_AT25 is not set
821 817
822# 818#
823# Dallas's 1-wire bus 819# Dallas's 1-wire bus
@@ -833,6 +829,7 @@ CONFIG_HWMON=y
833# CONFIG_SENSORS_ADM1021 is not set 829# CONFIG_SENSORS_ADM1021 is not set
834# CONFIG_SENSORS_ADM1025 is not set 830# CONFIG_SENSORS_ADM1025 is not set
835# CONFIG_SENSORS_ADM1026 is not set 831# CONFIG_SENSORS_ADM1026 is not set
832# CONFIG_SENSORS_ADM1029 is not set
836# CONFIG_SENSORS_ADM1031 is not set 833# CONFIG_SENSORS_ADM1031 is not set
837# CONFIG_SENSORS_ADM9240 is not set 834# CONFIG_SENSORS_ADM9240 is not set
838# CONFIG_SENSORS_ASB100 is not set 835# CONFIG_SENSORS_ASB100 is not set
@@ -857,6 +854,7 @@ CONFIG_HWMON=y
857# CONFIG_SENSORS_LM92 is not set 854# CONFIG_SENSORS_LM92 is not set
858# CONFIG_SENSORS_MAX1619 is not set 855# CONFIG_SENSORS_MAX1619 is not set
859# CONFIG_SENSORS_PC87360 is not set 856# CONFIG_SENSORS_PC87360 is not set
857# CONFIG_SENSORS_PC87427 is not set
860# CONFIG_SENSORS_SMSC47M1 is not set 858# CONFIG_SENSORS_SMSC47M1 is not set
861# CONFIG_SENSORS_SMSC47M192 is not set 859# CONFIG_SENSORS_SMSC47M192 is not set
862# CONFIG_SENSORS_SMSC47B397 is not set 860# CONFIG_SENSORS_SMSC47B397 is not set
@@ -864,12 +862,18 @@ CONFIG_HWMON=y
864# CONFIG_SENSORS_W83781D is not set 862# CONFIG_SENSORS_W83781D is not set
865# CONFIG_SENSORS_W83791D is not set 863# CONFIG_SENSORS_W83791D is not set
866# CONFIG_SENSORS_W83792D is not set 864# CONFIG_SENSORS_W83792D is not set
865# CONFIG_SENSORS_W83793 is not set
867# CONFIG_SENSORS_W83L785TS is not set 866# CONFIG_SENSORS_W83L785TS is not set
868# CONFIG_SENSORS_W83627HF is not set 867# CONFIG_SENSORS_W83627HF is not set
869# CONFIG_SENSORS_W83627EHF is not set 868# CONFIG_SENSORS_W83627EHF is not set
870# CONFIG_HWMON_DEBUG_CHIP is not set 869# CONFIG_HWMON_DEBUG_CHIP is not set
871 870
872# 871#
872# Multifunction device drivers
873#
874# CONFIG_MFD_SM501 is not set
875
876#
873# Multimedia devices 877# Multimedia devices
874# 878#
875# CONFIG_VIDEO_DEV is not set 879# CONFIG_VIDEO_DEV is not set
@@ -882,15 +886,24 @@ CONFIG_HWMON=y
882# 886#
883# Graphics support 887# Graphics support
884# 888#
885CONFIG_FIRMWARE_EDID=y 889CONFIG_BACKLIGHT_LCD_SUPPORT=y
890CONFIG_BACKLIGHT_CLASS_DEVICE=y
891CONFIG_LCD_CLASS_DEVICE=y
886CONFIG_FB=y 892CONFIG_FB=y
893CONFIG_FIRMWARE_EDID=y
894# CONFIG_FB_DDC is not set
887CONFIG_FB_CFB_FILLRECT=y 895CONFIG_FB_CFB_FILLRECT=y
888CONFIG_FB_CFB_COPYAREA=y 896CONFIG_FB_CFB_COPYAREA=y
889CONFIG_FB_CFB_IMAGEBLIT=y 897CONFIG_FB_CFB_IMAGEBLIT=y
898# CONFIG_FB_SVGALIB is not set
890# CONFIG_FB_MACMODES is not set 899# CONFIG_FB_MACMODES is not set
891# CONFIG_FB_BACKLIGHT is not set 900# CONFIG_FB_BACKLIGHT is not set
892# CONFIG_FB_MODE_HELPERS is not set 901# CONFIG_FB_MODE_HELPERS is not set
893# CONFIG_FB_TILEBLITTING is not set 902# CONFIG_FB_TILEBLITTING is not set
903
904#
905# Frame buffer hardware drivers
906#
894# CONFIG_FB_BFIN_7171 is not set 907# CONFIG_FB_BFIN_7171 is not set
895# CONFIG_FB_BFIN_7393 is not set 908# CONFIG_FB_BFIN_7393 is not set
896CONFIG_FB_BF537_LQ035=y 909CONFIG_FB_BF537_LQ035=y
@@ -904,11 +917,6 @@ CONFIG_FB_BFIN_LANDSCAPE=y
904# Logo configuration 917# Logo configuration
905# 918#
906# CONFIG_LOGO is not set 919# CONFIG_LOGO is not set
907CONFIG_BACKLIGHT_LCD_SUPPORT=y
908CONFIG_BACKLIGHT_CLASS_DEVICE=y
909CONFIG_BACKLIGHT_DEVICE=y
910CONFIG_LCD_CLASS_DEVICE=y
911CONFIG_LCD_DEVICE=y
912 920
913# 921#
914# Sound 922# Sound
@@ -946,14 +954,24 @@ CONFIG_SND_BLACKFIN_AD1981B=m
946# CONFIG_SND_BFIN_AD73311 is not set 954# CONFIG_SND_BFIN_AD73311 is not set
947 955
948# 956#
957# SoC audio support
958#
959# CONFIG_SND_SOC is not set
960
961#
949# Open Sound System 962# Open Sound System
950# 963#
951CONFIG_SOUND_PRIME=y 964CONFIG_SOUND_PRIME=y
952CONFIG_OSS_OBSOLETE_DRIVER=y 965# CONFIG_OBSOLETE_OSS is not set
953# CONFIG_SOUND_MSNDCLAS is not set 966# CONFIG_SOUND_MSNDCLAS is not set
954# CONFIG_SOUND_MSNDPIN is not set 967# CONFIG_SOUND_MSNDPIN is not set
955 968
956# 969#
970# HID Devices
971#
972# CONFIG_HID is not set
973
974#
957# USB support 975# USB support
958# 976#
959CONFIG_USB_ARCH_HAS_HCD=y 977CONFIG_USB_ARCH_HAS_HCD=y
@@ -1024,7 +1042,6 @@ CONFIG_RTC_INTF_DEV=y
1024# CONFIG_RTC_DRV_DS1672 is not set 1042# CONFIG_RTC_DRV_DS1672 is not set
1025# CONFIG_RTC_DRV_DS1742 is not set 1043# CONFIG_RTC_DRV_DS1742 is not set
1026# CONFIG_RTC_DRV_PCF8563 is not set 1044# CONFIG_RTC_DRV_PCF8563 is not set
1027# CONFIG_RTC_DRV_PCF8583 is not set
1028# CONFIG_RTC_DRV_RS5C348 is not set 1045# CONFIG_RTC_DRV_RS5C348 is not set
1029# CONFIG_RTC_DRV_RS5C372 is not set 1046# CONFIG_RTC_DRV_RS5C372 is not set
1030# CONFIG_RTC_DRV_M48T86 is not set 1047# CONFIG_RTC_DRV_M48T86 is not set
@@ -1047,6 +1064,14 @@ CONFIG_RTC_DRV_BFIN=y
1047# 1064#
1048 1065
1049# 1066#
1067# Auxiliary Display support
1068#
1069
1070#
1071# Virtualization
1072#
1073
1074#
1050# PBX support 1075# PBX support
1051# 1076#
1052# CONFIG_PBX is not set 1077# CONFIG_PBX is not set
@@ -1121,7 +1146,6 @@ CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
1121# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set 1146# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
1122# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set 1147# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
1123CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y 1148CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
1124# CONFIG_JFFS_FS is not set
1125# CONFIG_JFFS2_FS is not set 1149# CONFIG_JFFS2_FS is not set
1126# CONFIG_CRAMFS is not set 1150# CONFIG_CRAMFS is not set
1127# CONFIG_VXFS_FS is not set 1151# CONFIG_VXFS_FS is not set
@@ -1204,6 +1228,11 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1204# CONFIG_NLS_UTF8 is not set 1228# CONFIG_NLS_UTF8 is not set
1205 1229
1206# 1230#
1231# Distributed Lock Manager
1232#
1233# CONFIG_DLM is not set
1234
1235#
1207# Profiling support 1236# Profiling support
1208# 1237#
1209# CONFIG_PROFILING is not set 1238# CONFIG_PROFILING is not set
@@ -1215,19 +1244,16 @@ CONFIG_NLS_DEFAULT="iso8859-1"
1215CONFIG_ENABLE_MUST_CHECK=y 1244CONFIG_ENABLE_MUST_CHECK=y
1216# CONFIG_MAGIC_SYSRQ is not set 1245# CONFIG_MAGIC_SYSRQ is not set
1217# CONFIG_UNUSED_SYMBOLS is not set 1246# CONFIG_UNUSED_SYMBOLS is not set
1247# CONFIG_DEBUG_FS is not set
1248# CONFIG_HEADERS_CHECK is not set
1218# CONFIG_DEBUG_KERNEL is not set 1249# CONFIG_DEBUG_KERNEL is not set
1219CONFIG_LOG_BUF_SHIFT=14 1250CONFIG_LOG_BUF_SHIFT=14
1220# CONFIG_DEBUG_BUGVERBOSE is not set 1251# CONFIG_DEBUG_BUGVERBOSE is not set
1221# CONFIG_DEBUG_FS is not set
1222# CONFIG_UNWIND_INFO is not set
1223# CONFIG_HEADERS_CHECK is not set
1224# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set 1252# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
1225# CONFIG_DEBUG_HUNT_FOR_ZERO is not set 1253# CONFIG_DEBUG_HUNT_FOR_ZERO is not set
1226# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set 1254# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
1227# CONFIG_BOOTPARAM is not set
1228# CONFIG_NO_KERNEL_MSG is not set
1229# CONFIG_CPLB_INFO is not set 1255# CONFIG_CPLB_INFO is not set
1230# CONFIG_NO_ACCESS_CHECK is not set 1256# CONFIG_ACCESS_CHECK is not set
1231 1257
1232# 1258#
1233# Security options 1259# Security options
@@ -1245,9 +1271,12 @@ CONFIG_SECURITY_CAPABILITIES=y
1245# 1271#
1246# Library routines 1272# Library routines
1247# 1273#
1274CONFIG_BITREVERSE=y
1248CONFIG_CRC_CCITT=m 1275CONFIG_CRC_CCITT=m
1249# CONFIG_CRC16 is not set 1276# CONFIG_CRC16 is not set
1250CONFIG_CRC32=y 1277CONFIG_CRC32=y
1251# CONFIG_LIBCRC32C is not set 1278# CONFIG_LIBCRC32C is not set
1252CONFIG_ZLIB_INFLATE=y 1279CONFIG_ZLIB_INFLATE=y
1253CONFIG_PLIST=y 1280CONFIG_PLIST=y
1281CONFIG_HAS_IOMEM=y
1282CONFIG_HAS_IOPORT=y
diff --git a/arch/blackfin/defconfig b/arch/blackfin/defconfig
deleted file mode 100644
index a513fbe39567..000000000000
--- a/arch/blackfin/defconfig
+++ /dev/null
@@ -1,1327 +0,0 @@
1#
2# Automatically generated make config: don't edit
3# Linux kernel version: 2.6.20.4
4#
5# CONFIG_MMU is not set
6# CONFIG_FPU is not set
7CONFIG_RWSEM_GENERIC_SPINLOCK=y
8# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
9CONFIG_BLACKFIN=y
10CONFIG_BFIN=y
11CONFIG_SEMAPHORE_SLEEPERS=y
12CONFIG_GENERIC_FIND_NEXT_BIT=y
13CONFIG_GENERIC_HWEIGHT=y
14CONFIG_GENERIC_HARDIRQS=y
15CONFIG_GENERIC_IRQ_PROBE=y
16# CONFIG_GENERIC_TIME is not set
17CONFIG_GENERIC_CALIBRATE_DELAY=y
18CONFIG_FORCE_MAX_ZONEORDER=14
19CONFIG_IRQCHIP_DEMUX_GPIO=y
20CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
21
22#
23# Code maturity level options
24#
25CONFIG_EXPERIMENTAL=y
26CONFIG_BROKEN_ON_SMP=y
27CONFIG_INIT_ENV_ARG_LIMIT=32
28
29#
30# General setup
31#
32CONFIG_LOCALVERSION=""
33CONFIG_LOCALVERSION_AUTO=y
34CONFIG_SYSVIPC=y
35# CONFIG_IPC_NS is not set
36# CONFIG_POSIX_MQUEUE is not set
37# CONFIG_BSD_PROCESS_ACCT is not set
38# CONFIG_TASKSTATS is not set
39# CONFIG_UTS_NS is not set
40# CONFIG_AUDIT is not set
41# CONFIG_IKCONFIG is not set
42CONFIG_SYSFS_DEPRECATED=y
43# CONFIG_RELAY is not set
44CONFIG_INITRAMFS_SOURCE=""
45# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
46CONFIG_SYSCTL=y
47CONFIG_EMBEDDED=y
48CONFIG_UID16=y
49CONFIG_SYSCTL_SYSCALL=y
50CONFIG_KALLSYMS=y
51# CONFIG_KALLSYMS_EXTRA_PASS is not set
52CONFIG_HOTPLUG=y
53CONFIG_PRINTK=y
54CONFIG_BUG=y
55CONFIG_ELF_CORE=y
56CONFIG_BASE_FULL=y
57CONFIG_FUTEX=y
58CONFIG_EPOLL=y
59CONFIG_BIG_ORDER_ALLOC_NOFAIL_MAGIC=3
60# CONFIG_LIMIT_PAGECACHE is not set
61CONFIG_BUDDY=y
62# CONFIG_NP2 is not set
63CONFIG_SLAB=y
64CONFIG_VM_EVENT_COUNTERS=y
65CONFIG_RT_MUTEXES=y
66CONFIG_TINY_SHMEM=y
67CONFIG_BASE_SMALL=0
68# CONFIG_SLOB is not set
69
70#
71# Loadable module support
72#
73CONFIG_MODULES=y
74CONFIG_MODULE_UNLOAD=y
75# CONFIG_MODULE_FORCE_UNLOAD is not set
76# CONFIG_MODVERSIONS is not set
77# CONFIG_MODULE_SRCVERSION_ALL is not set
78CONFIG_KMOD=y
79
80#
81# Block layer
82#
83CONFIG_BLOCK=y
84# CONFIG_LBD is not set
85# CONFIG_BLK_DEV_IO_TRACE is not set
86# CONFIG_LSF is not set
87
88#
89# IO Schedulers
90#
91CONFIG_IOSCHED_NOOP=y
92CONFIG_IOSCHED_AS=y
93# CONFIG_IOSCHED_DEADLINE is not set
94CONFIG_IOSCHED_CFQ=y
95CONFIG_DEFAULT_AS=y
96# CONFIG_DEFAULT_DEADLINE is not set
97# CONFIG_DEFAULT_CFQ is not set
98# CONFIG_DEFAULT_NOOP is not set
99CONFIG_DEFAULT_IOSCHED="anticipatory"
100# CONFIG_PREEMPT_NONE is not set
101CONFIG_PREEMPT_VOLUNTARY=y
102# CONFIG_PREEMPT is not set
103
104#
105# Blackfin Processor Options
106#
107
108#
109# Processor and Board Settings
110#
111# CONFIG_BF531 is not set
112# CONFIG_BF532 is not set
113# CONFIG_BF533 is not set
114# CONFIG_BF534 is not set
115# CONFIG_BF536 is not set
116CONFIG_BF537=y
117# CONFIG_BF561 is not set
118CONFIG_BF_REV_0_2=y
119# CONFIG_BF_REV_0_3 is not set
120# CONFIG_BF_REV_0_4 is not set
121# CONFIG_BF_REV_0_5 is not set
122CONFIG_BFIN_SINGLE_CORE=y
123# CONFIG_BFIN533_EZKIT is not set
124# CONFIG_BFIN533_STAMP is not set
125CONFIG_BFIN537_STAMP=y
126# CONFIG_BFIN533_BLUETECHNIX_CM is not set
127# CONFIG_BFIN537_BLUETECHNIX_CM is not set
128# CONFIG_BFIN561_BLUETECHNIX_CM is not set
129# CONFIG_BFIN561_EZKIT is not set
130# CONFIG_PNAV10 is not set
131# CONFIG_GENERIC_BOARD is not set
132CONFIG_MEM_MT48LC32M8A2_75=y
133CONFIG_IRQ_PLL_WAKEUP=7
134
135#
136# BF537 Specific Configuration
137#
138
139#
140# PORT F/G Selection
141#
142CONFIG_BF537_PORT_F=y
143# CONFIG_BF537_PORT_G is not set
144# CONFIG_BF537_PORT_H is not set
145
146#
147# Interrupt Priority Assignment
148#
149
150#
151# Priority
152#
153CONFIG_IRQ_DMA_ERROR=7
154CONFIG_IRQ_ERROR=7
155CONFIG_IRQ_RTC=8
156CONFIG_IRQ_PPI=8
157CONFIG_IRQ_SPORT0_RX=9
158CONFIG_IRQ_SPORT0_TX=9
159CONFIG_IRQ_SPORT1_RX=9
160CONFIG_IRQ_SPORT1_TX=9
161CONFIG_IRQ_TWI=10
162CONFIG_IRQ_SPI=10
163CONFIG_IRQ_UART0_RX=10
164CONFIG_IRQ_UART0_TX=10
165CONFIG_IRQ_UART1_RX=10
166CONFIG_IRQ_UART1_TX=10
167CONFIG_IRQ_CAN_RX=11
168CONFIG_IRQ_CAN_TX=11
169CONFIG_IRQ_MAC_RX=11
170CONFIG_IRQ_MAC_TX=11
171CONFIG_IRQ_TMR0=12
172CONFIG_IRQ_TMR1=12
173CONFIG_IRQ_TMR2=12
174CONFIG_IRQ_TMR3=12
175CONFIG_IRQ_TMR4=12
176CONFIG_IRQ_TMR5=12
177CONFIG_IRQ_TMR6=12
178CONFIG_IRQ_TMR7=12
179CONFIG_IRQ_PROG_INTA=12
180CONFIG_IRQ_PORTG_INTB=12
181CONFIG_IRQ_MEM_DMA0=13
182CONFIG_IRQ_MEM_DMA1=13
183CONFIG_IRQ_WATCH=13
184
185#
186# Board customizations
187#
188# CONFIG_CMDLINE_BOOL is not set
189
190#
191# Board Setup
192#
193CONFIG_CLKIN_HZ=25000000
194CONFIG_MEM_SIZE=64
195CONFIG_MEM_ADD_WIDTH=10
196CONFIG_BOOT_LOAD=0x1000
197
198#
199# Console UART Setup
200#
201# CONFIG_BAUD_9600 is not set
202# CONFIG_BAUD_19200 is not set
203# CONFIG_BAUD_38400 is not set
204CONFIG_BAUD_57600=y
205# CONFIG_BAUD_115200 is not set
206CONFIG_BAUD_NO_PARITY=y
207# CONFIG_BAUD_PARITY is not set
208CONFIG_BAUD_1_STOPBIT=y
209# CONFIG_BAUD_2_STOPBIT is not set
210
211#
212# Blackfin Kernel Optimizations
213#
214
215#
216# Timer Tick
217#
218# CONFIG_HZ_100 is not set
219CONFIG_HZ_250=y
220# CONFIG_HZ_300 is not set
221# CONFIG_HZ_1000 is not set
222CONFIG_HZ=250
223
224#
225# Memory Optimizations
226#
227CONFIG_I_ENTRY_L1=y
228CONFIG_EXCPT_IRQ_SYSC_L1=y
229CONFIG_DO_IRQ_L1=y
230CONFIG_CORE_TIMER_IRQ_L1=y
231CONFIG_IDLE_L1=y
232CONFIG_SCHEDULE_L1=y
233CONFIG_ARITHMETIC_OPS_L1=y
234CONFIG_ACCESS_OK_L1=y
235CONFIG_MEMSET_L1=y
236CONFIG_MEMCPY_L1=y
237CONFIG_SYS_BFIN_SPINLOCK_L1=y
238# CONFIG_IP_CHECKSUM_L1 is not set
239# CONFIG_SYSCALL_TAB_L1 is not set
240# CONFIG_CPLB_SWITCH_TAB_L1 is not set
241CONFIG_RAMKERNEL=y
242# CONFIG_ROMKERNEL is not set
243CONFIG_SELECT_MEMORY_MODEL=y
244CONFIG_FLATMEM_MANUAL=y
245# CONFIG_DISCONTIGMEM_MANUAL is not set
246# CONFIG_SPARSEMEM_MANUAL is not set
247CONFIG_FLATMEM=y
248CONFIG_FLAT_NODE_MEM_MAP=y
249# CONFIG_SPARSEMEM_STATIC is not set
250CONFIG_SPLIT_PTLOCK_CPUS=4
251# CONFIG_RESOURCES_64BIT is not set
252CONFIG_LARGE_ALLOCS=y
253CONFIG_BFIN_DMA_5XX=y
254# CONFIG_DMA_UNCACHED_2M is not set
255CONFIG_DMA_UNCACHED_1M=y
256# CONFIG_DMA_UNCACHED_NONE is not set
257
258#
259# Cache Support
260#
261CONFIG_BLKFIN_CACHE=y
262CONFIG_BLKFIN_DCACHE=y
263# CONFIG_BLKFIN_DCACHE_BANKA is not set
264# CONFIG_BLKFIN_CACHE_LOCK is not set
265# CONFIG_BLKFIN_WB is not set
266CONFIG_BLKFIN_WT=y
267CONFIG_L1_MAX_PIECE=16
268
269#
270# Clock Settings
271#
272# CONFIG_BFIN_KERNEL_CLOCK is not set
273
274#
275# Asynchonous Memory Configuration
276#
277
278#
279# EBIU_AMBCTL Global Control
280#
281CONFIG_C_AMCKEN=y
282CONFIG_C_CDPRIO=y
283# CONFIG_C_AMBEN is not set
284# CONFIG_C_AMBEN_B0 is not set
285# CONFIG_C_AMBEN_B0_B1 is not set
286# CONFIG_C_AMBEN_B0_B1_B2 is not set
287CONFIG_C_AMBEN_ALL=y
288
289#
290# EBIU_AMBCTL Control
291#
292CONFIG_BANK_0=0x7BB0
293CONFIG_BANK_1=0x7BB0
294CONFIG_BANK_2=0x7BB0
295CONFIG_BANK_3=0x99B3
296
297#
298# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
299#
300# CONFIG_PCI is not set
301
302#
303# PCCARD (PCMCIA/CardBus) support
304#
305# CONFIG_PCCARD is not set
306
307#
308# PCI Hotplug Support
309#
310
311#
312# Executable file formats
313#
314CONFIG_BINFMT_ELF_FDPIC=y
315CONFIG_BINFMT_FLAT=y
316CONFIG_BINFMT_ZFLAT=y
317# CONFIG_BINFMT_SHARED_FLAT is not set
318# CONFIG_BINFMT_MISC is not set
319
320#
321# Power management options
322#
323CONFIG_PM=y
324CONFIG_PM_LEGACY=y
325# CONFIG_PM_DEBUG is not set
326# CONFIG_PM_SYSFS_DEPRECATED is not set
327CONFIG_PM_WAKEUP_GPIO_BY_SIC_IWR=y
328# CONFIG_PM_WAKEUP_BY_GPIO is not set
329# CONFIG_PM_WAKEUP_GPIO_API is not set
330CONFIG_PM_WAKEUP_SIC_IWR=0x80000000
331
332#
333# CPU Frequency scaling
334#
335# CONFIG_CPU_FREQ is not set
336
337#
338# Networking
339#
340CONFIG_NET=y
341
342#
343# Networking options
344#
345# CONFIG_NETDEBUG is not set
346CONFIG_PACKET=y
347# CONFIG_PACKET_MMAP is not set
348CONFIG_UNIX=y
349CONFIG_XFRM=y
350# CONFIG_XFRM_USER is not set
351# CONFIG_XFRM_SUB_POLICY is not set
352# CONFIG_NET_KEY is not set
353CONFIG_INET=y
354# CONFIG_IP_MULTICAST is not set
355# CONFIG_IP_ADVANCED_ROUTER is not set
356CONFIG_IP_FIB_HASH=y
357CONFIG_IP_PNP=y
358# CONFIG_IP_PNP_DHCP is not set
359# CONFIG_IP_PNP_BOOTP is not set
360# CONFIG_IP_PNP_RARP is not set
361# CONFIG_NET_IPIP is not set
362# CONFIG_NET_IPGRE is not set
363# CONFIG_ARPD is not set
364CONFIG_SYN_COOKIES=y
365# CONFIG_INET_AH is not set
366# CONFIG_INET_ESP is not set
367# CONFIG_INET_IPCOMP is not set
368# CONFIG_INET_XFRM_TUNNEL is not set
369# CONFIG_INET_TUNNEL is not set
370CONFIG_INET_XFRM_MODE_TRANSPORT=y
371CONFIG_INET_XFRM_MODE_TUNNEL=y
372CONFIG_INET_XFRM_MODE_BEET=y
373CONFIG_INET_DIAG=y
374CONFIG_INET_TCP_DIAG=y
375# CONFIG_TCP_CONG_ADVANCED is not set
376CONFIG_TCP_CONG_CUBIC=y
377CONFIG_DEFAULT_TCP_CONG="cubic"
378# CONFIG_TCP_MD5SIG is not set
379# CONFIG_IPV6 is not set
380# CONFIG_INET6_XFRM_TUNNEL is not set
381# CONFIG_INET6_TUNNEL is not set
382# CONFIG_NETLABEL is not set
383# CONFIG_NETWORK_SECMARK is not set
384# CONFIG_NETFILTER is not set
385
386#
387# DCCP Configuration (EXPERIMENTAL)
388#
389# CONFIG_IP_DCCP is not set
390
391#
392# SCTP Configuration (EXPERIMENTAL)
393#
394# CONFIG_IP_SCTP is not set
395
396#
397# TIPC Configuration (EXPERIMENTAL)
398#
399# CONFIG_TIPC is not set
400# CONFIG_ATM is not set
401# CONFIG_BRIDGE is not set
402# CONFIG_VLAN_8021Q is not set
403# CONFIG_DECNET is not set
404# CONFIG_LLC2 is not set
405# CONFIG_IPX is not set
406# CONFIG_ATALK is not set
407# CONFIG_X25 is not set
408# CONFIG_LAPB is not set
409# CONFIG_ECONET is not set
410# CONFIG_WAN_ROUTER is not set
411
412#
413# QoS and/or fair queueing
414#
415# CONFIG_NET_SCHED is not set
416
417#
418# Network testing
419#
420# CONFIG_NET_PKTGEN is not set
421# CONFIG_HAMRADIO is not set
422CONFIG_IRDA=m
423
424#
425# IrDA protocols
426#
427CONFIG_IRLAN=m
428CONFIG_IRCOMM=m
429# CONFIG_IRDA_ULTRA is not set
430
431#
432# IrDA options
433#
434CONFIG_IRDA_CACHE_LAST_LSAP=y
435# CONFIG_IRDA_FAST_RR is not set
436# CONFIG_IRDA_DEBUG is not set
437
438#
439# Infrared-port device drivers
440#
441
442#
443# SIR device drivers
444#
445CONFIG_IRTTY_SIR=m
446
447#
448# Dongle support
449#
450# CONFIG_DONGLE is not set
451
452#
453# Old SIR device drivers
454#
455# CONFIG_IRPORT_SIR is not set
456
457#
458# Old Serial dongle support
459#
460
461#
462# FIR device drivers
463#
464# CONFIG_BT is not set
465# CONFIG_IEEE80211 is not set
466
467#
468# Device Drivers
469#
470
471#
472# Generic Driver Options
473#
474CONFIG_STANDALONE=y
475CONFIG_PREVENT_FIRMWARE_BUILD=y
476# CONFIG_FW_LOADER is not set
477# CONFIG_SYS_HYPERVISOR is not set
478
479#
480# Connector - unified userspace <-> kernelspace linker
481#
482# CONFIG_CONNECTOR is not set
483
484#
485# Memory Technology Devices (MTD)
486#
487CONFIG_MTD=y
488# CONFIG_MTD_DEBUG is not set
489# CONFIG_MTD_CONCAT is not set
490CONFIG_MTD_PARTITIONS=y
491# CONFIG_MTD_REDBOOT_PARTS is not set
492# CONFIG_MTD_CMDLINE_PARTS is not set
493
494#
495# User Modules And Translation Layers
496#
497CONFIG_MTD_CHAR=m
498CONFIG_MTD_BLKDEVS=y
499CONFIG_MTD_BLOCK=y
500# CONFIG_FTL is not set
501# CONFIG_NFTL is not set
502# CONFIG_INFTL is not set
503# CONFIG_RFD_FTL is not set
504# CONFIG_SSFDC is not set
505
506#
507# RAM/ROM/Flash chip drivers
508#
509# CONFIG_MTD_CFI is not set
510CONFIG_MTD_JEDECPROBE=m
511CONFIG_MTD_GEN_PROBE=m
512# CONFIG_MTD_CFI_ADV_OPTIONS is not set
513CONFIG_MTD_MAP_BANK_WIDTH_1=y
514CONFIG_MTD_MAP_BANK_WIDTH_2=y
515CONFIG_MTD_MAP_BANK_WIDTH_4=y
516# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
517# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
518# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
519CONFIG_MTD_CFI_I1=y
520CONFIG_MTD_CFI_I2=y
521# CONFIG_MTD_CFI_I4 is not set
522# CONFIG_MTD_CFI_I8 is not set
523# CONFIG_MTD_CFI_INTELEXT is not set
524# CONFIG_MTD_CFI_AMDSTD is not set
525# CONFIG_MTD_CFI_STAA is not set
526CONFIG_MTD_MW320D=m
527CONFIG_MTD_RAM=y
528CONFIG_MTD_ROM=m
529# CONFIG_MTD_ABSENT is not set
530# CONFIG_MTD_OBSOLETE_CHIPS is not set
531
532#
533# Mapping drivers for chip access
534#
535CONFIG_MTD_COMPLEX_MAPPINGS=y
536# CONFIG_MTD_PHYSMAP is not set
537CONFIG_MTD_BF5xx=m
538CONFIG_BFIN_FLASH_SIZE=0x400000
539CONFIG_EBIU_FLASH_BASE=0x20000000
540
541#
542# FLASH_EBIU_AMBCTL Control
543#
544CONFIG_BFIN_FLASH_BANK_0=0x7BB0
545CONFIG_BFIN_FLASH_BANK_1=0x7BB0
546CONFIG_BFIN_FLASH_BANK_2=0x7BB0
547CONFIG_BFIN_FLASH_BANK_3=0x7BB0
548CONFIG_MTD_UCLINUX=y
549# CONFIG_MTD_PLATRAM is not set
550
551#
552# Self-contained MTD device drivers
553#
554# CONFIG_MTD_DATAFLASH is not set
555# CONFIG_MTD_M25P80 is not set
556# CONFIG_MTD_SLRAM is not set
557# CONFIG_MTD_PHRAM is not set
558# CONFIG_MTD_MTDRAM is not set
559# CONFIG_MTD_BLOCK2MTD is not set
560
561#
562# Disk-On-Chip Device Drivers
563#
564# CONFIG_MTD_DOC2000 is not set
565# CONFIG_MTD_DOC2001 is not set
566# CONFIG_MTD_DOC2001PLUS is not set
567
568#
569# NAND Flash Device Drivers
570#
571CONFIG_MTD_NAND=m
572# CONFIG_MTD_NAND_VERIFY_WRITE is not set
573# CONFIG_MTD_NAND_ECC_SMC is not set
574CONFIG_MTD_NAND_BFIN=m
575CONFIG_BFIN_NAND_BASE=0x20212000
576CONFIG_BFIN_NAND_CLE=2
577CONFIG_BFIN_NAND_ALE=1
578CONFIG_BFIN_NAND_READY=3
579CONFIG_MTD_NAND_IDS=m
580# CONFIG_MTD_NAND_DISKONCHIP is not set
581# CONFIG_MTD_NAND_NANDSIM is not set
582
583#
584# OneNAND Flash Device Drivers
585#
586# CONFIG_MTD_ONENAND is not set
587
588#
589# Parallel port support
590#
591# CONFIG_PARPORT is not set
592
593#
594# Plug and Play support
595#
596
597#
598# Block devices
599#
600# CONFIG_BLK_DEV_COW_COMMON is not set
601# CONFIG_BLK_DEV_LOOP is not set
602# CONFIG_BLK_DEV_NBD is not set
603CONFIG_BLK_DEV_RAM=y
604CONFIG_BLK_DEV_RAM_COUNT=16
605CONFIG_BLK_DEV_RAM_SIZE=4096
606CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
607# CONFIG_BLK_DEV_INITRD is not set
608# CONFIG_CDROM_PKTCDVD is not set
609# CONFIG_ATA_OVER_ETH is not set
610
611#
612# Misc devices
613#
614# CONFIG_TIFM_CORE is not set
615
616#
617# ATA/ATAPI/MFM/RLL support
618#
619# CONFIG_IDE is not set
620
621#
622# SCSI device support
623#
624# CONFIG_RAID_ATTRS is not set
625# CONFIG_SCSI is not set
626# CONFIG_SCSI_NETLINK is not set
627
628#
629# Serial ATA (prod) and Parallel ATA (experimental) drivers
630#
631# CONFIG_ATA is not set
632
633#
634# Multi-device support (RAID and LVM)
635#
636# CONFIG_MD is not set
637
638#
639# Fusion MPT device support
640#
641# CONFIG_FUSION is not set
642
643#
644# IEEE 1394 (FireWire) support
645#
646
647#
648# I2O device support
649#
650
651#
652# Network device support
653#
654CONFIG_NETDEVICES=y
655# CONFIG_DUMMY is not set
656# CONFIG_BONDING is not set
657# CONFIG_EQUALIZER is not set
658# CONFIG_TUN is not set
659
660#
661# PHY device support
662#
663# CONFIG_PHYLIB is not set
664
665#
666# Ethernet (10 or 100Mbit)
667#
668CONFIG_NET_ETHERNET=y
669CONFIG_MII=y
670# CONFIG_SMC91X is not set
671CONFIG_BFIN_MAC=y
672CONFIG_BFIN_MAC_USE_L1=y
673CONFIG_BFIN_TX_DESC_NUM=10
674CONFIG_BFIN_RX_DESC_NUM=20
675# CONFIG_BFIN_MAC_RMII is not set
676
677#
678# Ethernet (1000 Mbit)
679#
680
681#
682# Ethernet (10000 Mbit)
683#
684
685#
686# Token Ring devices
687#
688
689#
690# Wireless LAN (non-hamradio)
691#
692# CONFIG_NET_RADIO is not set
693
694#
695# Wan interfaces
696#
697# CONFIG_WAN is not set
698# CONFIG_PPP is not set
699# CONFIG_SLIP is not set
700# CONFIG_SHAPER is not set
701# CONFIG_NETCONSOLE is not set
702# CONFIG_NETPOLL is not set
703# CONFIG_NET_POLL_CONTROLLER is not set
704
705#
706# ISDN subsystem
707#
708# CONFIG_ISDN is not set
709
710#
711# Telephony Support
712#
713# CONFIG_PHONE is not set
714
715#
716# Input device support
717#
718CONFIG_INPUT=y
719# CONFIG_INPUT_FF_MEMLESS is not set
720
721#
722# Userland interfaces
723#
724# CONFIG_INPUT_MOUSEDEV is not set
725# CONFIG_INPUT_JOYDEV is not set
726# CONFIG_INPUT_TSDEV is not set
727CONFIG_INPUT_EVDEV=m
728# CONFIG_INPUT_EVBUG is not set
729
730#
731# Input Device Drivers
732#
733# CONFIG_INPUT_KEYBOARD is not set
734# CONFIG_INPUT_MOUSE is not set
735# CONFIG_INPUT_JOYSTICK is not set
736# CONFIG_INPUT_TOUCHSCREEN is not set
737CONFIG_INPUT_MISC=y
738# CONFIG_INPUT_UINPUT is not set
739# CONFIG_BF53X_PFBUTTONS is not set
740CONFIG_TWI_KEYPAD=m
741CONFIG_BFIN_TWIKEYPAD_IRQ_PFX=72
742
743#
744# Hardware I/O ports
745#
746# CONFIG_SERIO is not set
747# CONFIG_GAMEPORT is not set
748
749#
750# Character devices
751#
752# CONFIG_AD9960 is not set
753# CONFIG_SPI_ADC_BF533 is not set
754# CONFIG_BF533_PFLAGS is not set
755# CONFIG_BF5xx_PPIFCD is not set
756# CONFIG_BF5xx_TIMERS is not set
757# CONFIG_BF5xx_PPI is not set
758CONFIG_BFIN_SPORT=y
759# CONFIG_BFIN_TIMER_LATENCY is not set
760CONFIG_TWI_LCD=m
761CONFIG_TWI_LCD_SLAVE_ADDR=34
762# CONFIG_AD5304 is not set
763# CONFIG_VT is not set
764# CONFIG_SERIAL_NONSTANDARD is not set
765
766#
767# Serial drivers
768#
769# CONFIG_SERIAL_8250 is not set
770
771#
772# Non-8250 serial port support
773#
774CONFIG_SERIAL_BFIN=y
775CONFIG_SERIAL_BFIN_CONSOLE=y
776CONFIG_SERIAL_BFIN_DMA=y
777# CONFIG_SERIAL_BFIN_PIO is not set
778CONFIG_SERIAL_BFIN_UART0=y
779# CONFIG_BFIN_UART0_CTSRTS is not set
780# CONFIG_SERIAL_BFIN_UART1 is not set
781CONFIG_SERIAL_CORE=y
782CONFIG_SERIAL_CORE_CONSOLE=y
783# CONFIG_SERIAL_BFIN_SPORT is not set
784CONFIG_UNIX98_PTYS=y
785# CONFIG_LEGACY_PTYS is not set
786
787#
788# CAN, the car bus and industrial fieldbus
789#
790CONFIG_CAN4LINUX=y
791
792#
793# linux embedded drivers
794#
795# CONFIG_CAN_MCF5282 is not set
796# CONFIG_CAN_UNCTWINCAN is not set
797CONFIG_CAN_BLACKFIN=m
798
799#
800# IPMI
801#
802# CONFIG_IPMI_HANDLER is not set
803
804#
805# Watchdog Cards
806#
807# CONFIG_WATCHDOG is not set
808CONFIG_HW_RANDOM=y
809# CONFIG_GEN_RTC is not set
810CONFIG_BLACKFIN_DPMC=y
811# CONFIG_DTLK is not set
812# CONFIG_R3964 is not set
813# CONFIG_RAW_DRIVER is not set
814
815#
816# TPM devices
817#
818# CONFIG_TCG_TPM is not set
819
820#
821# I2C support
822#
823CONFIG_I2C=m
824CONFIG_I2C_CHARDEV=m
825
826#
827# I2C Algorithms
828#
829# CONFIG_I2C_ALGOBIT is not set
830# CONFIG_I2C_ALGOPCF is not set
831# CONFIG_I2C_ALGOPCA is not set
832
833#
834# I2C Hardware Bus support
835#
836# CONFIG_I2C_BLACKFIN_GPIO is not set
837# CONFIG_I2C_BLACKFIN_TWI is not set
838# CONFIG_I2C_OCORES is not set
839# CONFIG_I2C_PARPORT_LIGHT is not set
840# CONFIG_I2C_STUB is not set
841# CONFIG_I2C_PCA_ISA is not set
842
843#
844# Miscellaneous I2C Chip support
845#
846# CONFIG_SENSORS_DS1337 is not set
847# CONFIG_SENSORS_DS1374 is not set
848CONFIG_SENSORS_AD5252=m
849# CONFIG_SENSORS_EEPROM is not set
850# CONFIG_SENSORS_PCF8574 is not set
851# CONFIG_SENSORS_PCF8575 is not set
852# CONFIG_SENSORS_PCA9543 is not set
853# CONFIG_SENSORS_PCA9539 is not set
854# CONFIG_SENSORS_PCF8591 is not set
855# CONFIG_SENSORS_MAX6875 is not set
856# CONFIG_I2C_DEBUG_CORE is not set
857# CONFIG_I2C_DEBUG_ALGO is not set
858# CONFIG_I2C_DEBUG_BUS is not set
859# CONFIG_I2C_DEBUG_CHIP is not set
860
861#
862# SPI support
863#
864CONFIG_SPI=y
865CONFIG_SPI_MASTER=y
866
867#
868# SPI Master Controller Drivers
869#
870# CONFIG_SPI_BITBANG is not set
871
872#
873# SPI Protocol Masters
874#
875CONFIG_SPI_BFIN=y
876
877#
878# Dallas's 1-wire bus
879#
880# CONFIG_W1 is not set
881
882#
883# Hardware Monitoring support
884#
885CONFIG_HWMON=y
886# CONFIG_HWMON_VID is not set
887# CONFIG_SENSORS_ABITUGURU is not set
888# CONFIG_SENSORS_ADM1021 is not set
889# CONFIG_SENSORS_ADM1025 is not set
890# CONFIG_SENSORS_ADM1026 is not set
891# CONFIG_SENSORS_ADM1031 is not set
892# CONFIG_SENSORS_ADM9240 is not set
893# CONFIG_SENSORS_ASB100 is not set
894# CONFIG_SENSORS_ATXP1 is not set
895# CONFIG_SENSORS_DS1621 is not set
896# CONFIG_SENSORS_F71805F is not set
897# CONFIG_SENSORS_FSCHER is not set
898# CONFIG_SENSORS_FSCPOS is not set
899# CONFIG_SENSORS_GL518SM is not set
900# CONFIG_SENSORS_GL520SM is not set
901# CONFIG_SENSORS_IT87 is not set
902# CONFIG_SENSORS_LM63 is not set
903# CONFIG_SENSORS_LM70 is not set
904# CONFIG_SENSORS_LM75 is not set
905# CONFIG_SENSORS_LM77 is not set
906# CONFIG_SENSORS_LM78 is not set
907# CONFIG_SENSORS_LM80 is not set
908# CONFIG_SENSORS_LM83 is not set
909# CONFIG_SENSORS_LM85 is not set
910# CONFIG_SENSORS_LM87 is not set
911# CONFIG_SENSORS_LM90 is not set
912# CONFIG_SENSORS_LM92 is not set
913# CONFIG_SENSORS_MAX1619 is not set
914# CONFIG_SENSORS_PC87360 is not set
915# CONFIG_SENSORS_PC87427 is not set
916# CONFIG_SENSORS_SMSC47M1 is not set
917# CONFIG_SENSORS_SMSC47M192 is not set
918# CONFIG_SENSORS_SMSC47B397 is not set
919# CONFIG_SENSORS_VT1211 is not set
920# CONFIG_SENSORS_W83781D is not set
921# CONFIG_SENSORS_W83791D is not set
922# CONFIG_SENSORS_W83792D is not set
923# CONFIG_SENSORS_W83793 is not set
924# CONFIG_SENSORS_W83L785TS is not set
925# CONFIG_SENSORS_W83627HF is not set
926# CONFIG_SENSORS_W83627EHF is not set
927# CONFIG_HWMON_DEBUG_CHIP is not set
928
929#
930# Multimedia devices
931#
932# CONFIG_VIDEO_DEV is not set
933
934#
935# Digital Video Broadcasting Devices
936#
937# CONFIG_DVB is not set
938
939#
940# Graphics support
941#
942CONFIG_FIRMWARE_EDID=y
943CONFIG_FB=m
944CONFIG_FB_CFB_FILLRECT=m
945CONFIG_FB_CFB_COPYAREA=m
946CONFIG_FB_CFB_IMAGEBLIT=m
947# CONFIG_FB_MACMODES is not set
948# CONFIG_FB_BACKLIGHT is not set
949# CONFIG_FB_MODE_HELPERS is not set
950# CONFIG_FB_TILEBLITTING is not set
951CONFIG_FB_BFIN_7171=m
952CONFIG_FB_BFIN_7393=m
953CONFIG_NTSC=y
954# CONFIG_PAL is not set
955# CONFIG_NTSC_640x480 is not set
956# CONFIG_PAL_640x480 is not set
957# CONFIG_NTSC_YCBCR is not set
958# CONFIG_PAL_YCBCR is not set
959CONFIG_ADV7393_1XMEM=y
960# CONFIG_ADV7393_2XMEM is not set
961# CONFIG_FB_S1D13XXX is not set
962# CONFIG_FB_VIRTUAL is not set
963
964#
965# Logo configuration
966#
967# CONFIG_LOGO is not set
968CONFIG_BACKLIGHT_LCD_SUPPORT=y
969CONFIG_BACKLIGHT_CLASS_DEVICE=m
970CONFIG_BACKLIGHT_DEVICE=y
971CONFIG_LCD_CLASS_DEVICE=m
972CONFIG_LCD_DEVICE=y
973
974#
975# Sound
976#
977CONFIG_SOUND=m
978
979#
980# Advanced Linux Sound Architecture
981#
982CONFIG_SND=m
983CONFIG_SND_TIMER=m
984CONFIG_SND_PCM=m
985# CONFIG_SND_SEQUENCER is not set
986CONFIG_SND_OSSEMUL=y
987CONFIG_SND_MIXER_OSS=m
988CONFIG_SND_PCM_OSS=m
989CONFIG_SND_PCM_OSS_PLUGINS=y
990# CONFIG_SND_DYNAMIC_MINORS is not set
991CONFIG_SND_SUPPORT_OLD_API=y
992CONFIG_SND_VERBOSE_PROCFS=y
993# CONFIG_SND_VERBOSE_PRINTK is not set
994# CONFIG_SND_DEBUG is not set
995
996#
997# Generic devices
998#
999# CONFIG_SND_DUMMY is not set
1000# CONFIG_SND_MTPAV is not set
1001# CONFIG_SND_SERIAL_U16550 is not set
1002# CONFIG_SND_MPU401 is not set
1003
1004#
1005# Open Sound System
1006#
1007# CONFIG_SOUND_PRIME is not set
1008
1009#
1010# HID Devices
1011#
1012CONFIG_HID=y
1013
1014#
1015# USB support
1016#
1017CONFIG_USB_ARCH_HAS_HCD=y
1018# CONFIG_USB_ARCH_HAS_OHCI is not set
1019# CONFIG_USB_ARCH_HAS_EHCI is not set
1020# CONFIG_USB is not set
1021
1022#
1023# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
1024#
1025
1026#
1027# USB Gadget Support
1028#
1029# CONFIG_USB_GADGET is not set
1030
1031#
1032# MMC/SD Card support
1033#
1034# CONFIG_SPI_MMC is not set
1035# CONFIG_MMC is not set
1036
1037#
1038# LED devices
1039#
1040# CONFIG_NEW_LEDS is not set
1041
1042#
1043# LED drivers
1044#
1045
1046#
1047# LED Triggers
1048#
1049
1050#
1051# InfiniBand support
1052#
1053
1054#
1055# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)
1056#
1057
1058#
1059# Real Time Clock
1060#
1061CONFIG_RTC_LIB=y
1062CONFIG_RTC_CLASS=y
1063CONFIG_RTC_HCTOSYS=y
1064CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
1065# CONFIG_RTC_DEBUG is not set
1066
1067#
1068# RTC interfaces
1069#
1070CONFIG_RTC_INTF_SYSFS=y
1071CONFIG_RTC_INTF_PROC=y
1072CONFIG_RTC_INTF_DEV=y
1073# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
1074
1075#
1076# RTC drivers
1077#
1078# CONFIG_RTC_DRV_X1205 is not set
1079# CONFIG_RTC_DRV_DS1307 is not set
1080# CONFIG_RTC_DRV_DS1553 is not set
1081# CONFIG_RTC_DRV_ISL1208 is not set
1082# CONFIG_RTC_DRV_DS1672 is not set
1083# CONFIG_RTC_DRV_DS1742 is not set
1084# CONFIG_RTC_DRV_PCF8563 is not set
1085# CONFIG_RTC_DRV_PCF8583 is not set
1086# CONFIG_RTC_DRV_RS5C348 is not set
1087# CONFIG_RTC_DRV_RS5C372 is not set
1088# CONFIG_RTC_DRV_M48T86 is not set
1089# CONFIG_RTC_DRV_TEST is not set
1090# CONFIG_RTC_DRV_MAX6902 is not set
1091# CONFIG_RTC_DRV_V3020 is not set
1092CONFIG_RTC_DRV_BFIN=y
1093
1094#
1095# DMA Engine support
1096#
1097# CONFIG_DMA_ENGINE is not set
1098
1099#
1100# DMA Clients
1101#
1102
1103#
1104# DMA Devices
1105#
1106
1107#
1108# Virtualization
1109#
1110
1111#
1112# PBX support
1113#
1114# CONFIG_PBX is not set
1115
1116#
1117# File systems
1118#
1119CONFIG_EXT2_FS=y
1120CONFIG_EXT2_FS_XATTR=y
1121# CONFIG_EXT2_FS_POSIX_ACL is not set
1122# CONFIG_EXT2_FS_SECURITY is not set
1123# CONFIG_EXT3_FS is not set
1124# CONFIG_EXT4DEV_FS is not set
1125CONFIG_FS_MBCACHE=y
1126# CONFIG_REISERFS_FS is not set
1127# CONFIG_JFS_FS is not set
1128# CONFIG_FS_POSIX_ACL is not set
1129# CONFIG_XFS_FS is not set
1130# CONFIG_GFS2_FS is not set
1131# CONFIG_OCFS2_FS is not set
1132# CONFIG_MINIX_FS is not set
1133# CONFIG_ROMFS_FS is not set
1134CONFIG_INOTIFY=y
1135CONFIG_INOTIFY_USER=y
1136# CONFIG_QUOTA is not set
1137CONFIG_DNOTIFY=y
1138# CONFIG_AUTOFS_FS is not set
1139# CONFIG_AUTOFS4_FS is not set
1140# CONFIG_FUSE_FS is not set
1141
1142#
1143# CD-ROM/DVD Filesystems
1144#
1145# CONFIG_ISO9660_FS is not set
1146# CONFIG_UDF_FS is not set
1147
1148#
1149# DOS/FAT/NT Filesystems
1150#
1151# CONFIG_MSDOS_FS is not set
1152# CONFIG_VFAT_FS is not set
1153# CONFIG_NTFS_FS is not set
1154
1155#
1156# Pseudo filesystems
1157#
1158CONFIG_PROC_FS=y
1159CONFIG_PROC_SYSCTL=y
1160CONFIG_SYSFS=y
1161# CONFIG_TMPFS is not set
1162# CONFIG_HUGETLB_PAGE is not set
1163CONFIG_RAMFS=y
1164# CONFIG_CONFIGFS_FS is not set
1165
1166#
1167# Miscellaneous filesystems
1168#
1169# CONFIG_ADFS_FS is not set
1170# CONFIG_AFFS_FS is not set
1171# CONFIG_HFS_FS is not set
1172# CONFIG_HFSPLUS_FS is not set
1173# CONFIG_BEFS_FS is not set
1174# CONFIG_BFS_FS is not set
1175# CONFIG_EFS_FS is not set
1176CONFIG_YAFFS_FS=m
1177CONFIG_YAFFS_YAFFS1=y
1178# CONFIG_YAFFS_DOES_ECC is not set
1179CONFIG_YAFFS_YAFFS2=y
1180CONFIG_YAFFS_AUTO_YAFFS2=y
1181# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
1182CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=10
1183# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
1184# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
1185CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
1186CONFIG_JFFS2_FS=m
1187CONFIG_JFFS2_FS_DEBUG=0
1188CONFIG_JFFS2_FS_WRITEBUFFER=y
1189# CONFIG_JFFS2_SUMMARY is not set
1190# CONFIG_JFFS2_FS_XATTR is not set
1191# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
1192CONFIG_JFFS2_ZLIB=y
1193CONFIG_JFFS2_RTIME=y
1194# CONFIG_JFFS2_RUBIN is not set
1195# CONFIG_CRAMFS is not set
1196# CONFIG_VXFS_FS is not set
1197# CONFIG_HPFS_FS is not set
1198# CONFIG_QNX4FS_FS is not set
1199# CONFIG_SYSV_FS is not set
1200# CONFIG_UFS_FS is not set
1201
1202#
1203# Network File Systems
1204#
1205CONFIG_NFS_FS=m
1206CONFIG_NFS_V3=y
1207# CONFIG_NFS_V3_ACL is not set
1208# CONFIG_NFS_V4 is not set
1209# CONFIG_NFS_DIRECTIO is not set
1210# CONFIG_NFSD is not set
1211CONFIG_LOCKD=m
1212CONFIG_LOCKD_V4=y
1213CONFIG_NFS_COMMON=y
1214CONFIG_SUNRPC=m
1215# CONFIG_RPCSEC_GSS_KRB5 is not set
1216# CONFIG_RPCSEC_GSS_SPKM3 is not set
1217CONFIG_SMB_FS=m
1218# CONFIG_SMB_NLS_DEFAULT is not set
1219# CONFIG_CIFS is not set
1220# CONFIG_NCP_FS is not set
1221# CONFIG_CODA_FS is not set
1222# CONFIG_AFS_FS is not set
1223# CONFIG_9P_FS is not set
1224
1225#
1226# Partition Types
1227#
1228# CONFIG_PARTITION_ADVANCED is not set
1229CONFIG_MSDOS_PARTITION=y
1230
1231#
1232# Native Language Support
1233#
1234CONFIG_NLS=m
1235CONFIG_NLS_DEFAULT="iso8859-1"
1236# CONFIG_NLS_CODEPAGE_437 is not set
1237# CONFIG_NLS_CODEPAGE_737 is not set
1238# CONFIG_NLS_CODEPAGE_775 is not set
1239# CONFIG_NLS_CODEPAGE_850 is not set
1240# CONFIG_NLS_CODEPAGE_852 is not set
1241# CONFIG_NLS_CODEPAGE_855 is not set
1242# CONFIG_NLS_CODEPAGE_857 is not set
1243# CONFIG_NLS_CODEPAGE_860 is not set
1244# CONFIG_NLS_CODEPAGE_861 is not set
1245# CONFIG_NLS_CODEPAGE_862 is not set
1246# CONFIG_NLS_CODEPAGE_863 is not set
1247# CONFIG_NLS_CODEPAGE_864 is not set
1248# CONFIG_NLS_CODEPAGE_865 is not set
1249# CONFIG_NLS_CODEPAGE_866 is not set
1250# CONFIG_NLS_CODEPAGE_869 is not set
1251# CONFIG_NLS_CODEPAGE_936 is not set
1252# CONFIG_NLS_CODEPAGE_950 is not set
1253# CONFIG_NLS_CODEPAGE_932 is not set
1254# CONFIG_NLS_CODEPAGE_949 is not set
1255# CONFIG_NLS_CODEPAGE_874 is not set
1256# CONFIG_NLS_ISO8859_8 is not set
1257# CONFIG_NLS_CODEPAGE_1250 is not set
1258# CONFIG_NLS_CODEPAGE_1251 is not set
1259# CONFIG_NLS_ASCII is not set
1260# CONFIG_NLS_ISO8859_1 is not set
1261# CONFIG_NLS_ISO8859_2 is not set
1262# CONFIG_NLS_ISO8859_3 is not set
1263# CONFIG_NLS_ISO8859_4 is not set
1264# CONFIG_NLS_ISO8859_5 is not set
1265# CONFIG_NLS_ISO8859_6 is not set
1266# CONFIG_NLS_ISO8859_7 is not set
1267# CONFIG_NLS_ISO8859_9 is not set
1268# CONFIG_NLS_ISO8859_13 is not set
1269# CONFIG_NLS_ISO8859_14 is not set
1270# CONFIG_NLS_ISO8859_15 is not set
1271# CONFIG_NLS_KOI8_R is not set
1272# CONFIG_NLS_KOI8_U is not set
1273# CONFIG_NLS_UTF8 is not set
1274
1275#
1276# Distributed Lock Manager
1277#
1278# CONFIG_DLM is not set
1279
1280#
1281# Profiling support
1282#
1283# CONFIG_PROFILING is not set
1284
1285#
1286# Kernel hacking
1287#
1288# CONFIG_PRINTK_TIME is not set
1289CONFIG_ENABLE_MUST_CHECK=y
1290# CONFIG_MAGIC_SYSRQ is not set
1291# CONFIG_UNUSED_SYMBOLS is not set
1292# CONFIG_DEBUG_FS is not set
1293# CONFIG_HEADERS_CHECK is not set
1294# CONFIG_DEBUG_KERNEL is not set
1295CONFIG_LOG_BUF_SHIFT=14
1296# CONFIG_DEBUG_BUGVERBOSE is not set
1297# CONFIG_DEBUG_SERIAL_EARLY_INIT is not set
1298CONFIG_DEBUG_HUNT_FOR_ZERO=y
1299# CONFIG_DEBUG_BFIN_NO_KERN_HWTRACE is not set
1300CONFIG_CPLB_INFO=y
1301CONFIG_ACCESS_CHECK=y
1302
1303#
1304# Security options
1305#
1306# CONFIG_KEYS is not set
1307CONFIG_SECURITY=y
1308# CONFIG_SECURITY_NETWORK is not set
1309CONFIG_SECURITY_CAPABILITIES=y
1310
1311#
1312# Cryptographic options
1313#
1314# CONFIG_CRYPTO is not set
1315
1316#
1317# Library routines
1318#
1319CONFIG_BITREVERSE=y
1320CONFIG_CRC_CCITT=m
1321# CONFIG_CRC16 is not set
1322CONFIG_CRC32=y
1323# CONFIG_LIBCRC32C is not set
1324CONFIG_ZLIB_INFLATE=y
1325CONFIG_ZLIB_DEFLATE=m
1326CONFIG_PLIST=y
1327CONFIG_IOMAP_COPY=y
diff --git a/arch/blackfin/kernel/bfin_dma_5xx.c b/arch/blackfin/kernel/bfin_dma_5xx.c
index 0ccb0dc3f833..069a896a8f26 100644
--- a/arch/blackfin/kernel/bfin_dma_5xx.c
+++ b/arch/blackfin/kernel/bfin_dma_5xx.c
@@ -595,7 +595,7 @@ unsigned short get_dma_curr_ycount(unsigned int channel)
595} 595}
596EXPORT_SYMBOL(get_dma_curr_ycount); 596EXPORT_SYMBOL(get_dma_curr_ycount);
597 597
598void *_dma_memcpy(void *dest, const void *src, size_t size) 598static void *__dma_memcpy(void *dest, const void *src, size_t size)
599{ 599{
600 int direction; /* 1 - address decrease, 0 - address increase */ 600 int direction; /* 1 - address decrease, 0 - address increase */
601 int flag_align; /* 1 - address aligned, 0 - address unaligned */ 601 int flag_align; /* 1 - address aligned, 0 - address unaligned */
@@ -744,8 +744,8 @@ void *dma_memcpy(void *dest, const void *src, size_t size)
744 bulk = (size >> 16) << 16; 744 bulk = (size >> 16) << 16;
745 rest = size - bulk; 745 rest = size - bulk;
746 if (bulk) 746 if (bulk)
747 _dma_memcpy(dest, src, bulk); 747 __dma_memcpy(dest, src, bulk);
748 addr = _dma_memcpy(dest+bulk, src+bulk, rest); 748 addr = __dma_memcpy(dest+bulk, src+bulk, rest);
749 return addr; 749 return addr;
750} 750}
751 751
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 3f49fae1cb1f..bb1f4fb2467c 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -138,7 +138,7 @@ static unsigned int sic_iwr_irqs[gpio_bank(MAX_BLACKFIN_GPIOS)] = {IRQ_PROG0_INT
138 138
139inline int check_gpio(unsigned short gpio) 139inline int check_gpio(unsigned short gpio)
140{ 140{
141 if (gpio > MAX_BLACKFIN_GPIOS) 141 if (gpio >= MAX_BLACKFIN_GPIOS)
142 return -EINVAL; 142 return -EINVAL;
143 return 0; 143 return 0;
144} 144}
@@ -494,19 +494,24 @@ u32 gpio_pm_setup(void)
494 gpio_bank_saved[bank].dir = gpio_bankb[bank]->dir; 494 gpio_bank_saved[bank].dir = gpio_bankb[bank]->dir;
495 gpio_bank_saved[bank].edge = gpio_bankb[bank]->edge; 495 gpio_bank_saved[bank].edge = gpio_bankb[bank]->edge;
496 gpio_bank_saved[bank].both = gpio_bankb[bank]->both; 496 gpio_bank_saved[bank].both = gpio_bankb[bank]->both;
497 gpio_bank_saved[bank].reserved = reserved_map[bank];
497 498
498 gpio = i; 499 gpio = i;
499 500
500 while (mask) { 501 while (mask) {
501 if (mask & 1) { 502 if (mask & 1) {
502 bfin_gpio_wakeup_type(gpio, wakeup_flags_map[gpio]); 503 reserved_map[gpio_bank(gpio)] |=
504 gpio_bit(gpio);
505 bfin_gpio_wakeup_type(gpio,
506 wakeup_flags_map[gpio]);
503 set_gpio_data(gpio, 0); /*Clear*/ 507 set_gpio_data(gpio, 0); /*Clear*/
504 } 508 }
505 gpio++; 509 gpio++;
506 mask >>= 1; 510 mask >>= 1;
507 } 511 }
508 512
509 sic_iwr |= 1 << (sic_iwr_irqs[bank] - (IRQ_CORETMR + 1)); 513 sic_iwr |= 1 <<
514 (sic_iwr_irqs[bank] - (IRQ_CORETMR + 1));
510 gpio_bankb[bank]->maskb_set = wakeup_map[gpio_bank(i)]; 515 gpio_bankb[bank]->maskb_set = wakeup_map[gpio_bank(i)];
511 } 516 }
512 } 517 }
@@ -535,6 +540,9 @@ void gpio_pm_restore(void)
535 gpio_bankb[bank]->polar = gpio_bank_saved[bank].polar; 540 gpio_bankb[bank]->polar = gpio_bank_saved[bank].polar;
536 gpio_bankb[bank]->edge = gpio_bank_saved[bank].edge; 541 gpio_bankb[bank]->edge = gpio_bank_saved[bank].edge;
537 gpio_bankb[bank]->both = gpio_bank_saved[bank].both; 542 gpio_bankb[bank]->both = gpio_bank_saved[bank].both;
543
544 reserved_map[bank] = gpio_bank_saved[bank].reserved;
545
538 } 546 }
539 547
540 gpio_bankb[bank]->maskb = gpio_bank_saved[bank].maskb; 548 gpio_bankb[bank]->maskb = gpio_bank_saved[bank].maskb;
diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S
index 5880b270bd50..65c5ba4260b0 100644
--- a/arch/blackfin/kernel/entry.S
+++ b/arch/blackfin/kernel/entry.S
@@ -58,10 +58,12 @@ ENTRY(_ret_from_fork)
58 RESTORE_ALL_SYS 58 RESTORE_ALL_SYS
59 p0 = reti; 59 p0 = reti;
60 jump (p0); 60 jump (p0);
61ENDPROC(_ret_from_fork)
61 62
62ENTRY(_sys_fork) 63ENTRY(_sys_fork)
63 r0 = -EINVAL; 64 r0 = -EINVAL;
64 rts; 65 rts;
66ENDPROC(_sys_fork)
65 67
66ENTRY(_sys_vfork) 68ENTRY(_sys_vfork)
67 r0 = sp; 69 r0 = sp;
@@ -72,6 +74,7 @@ ENTRY(_sys_vfork)
72 SP += 12; 74 SP += 12;
73 rets = [sp++]; 75 rets = [sp++];
74 rts; 76 rts;
77ENDPROC(_sys_vfork)
75 78
76ENTRY(_sys_clone) 79ENTRY(_sys_clone)
77 r0 = sp; 80 r0 = sp;
@@ -82,6 +85,7 @@ ENTRY(_sys_clone)
82 SP += 12; 85 SP += 12;
83 rets = [sp++]; 86 rets = [sp++];
84 rts; 87 rts;
88ENDPROC(_sys_clone)
85 89
86ENTRY(_sys_rt_sigreturn) 90ENTRY(_sys_rt_sigreturn)
87 r0 = sp; 91 r0 = sp;
@@ -92,3 +96,4 @@ ENTRY(_sys_rt_sigreturn)
92 SP += 12; 96 SP += 12;
93 rets = [sp++]; 97 rets = [sp++];
94 rts; 98 rts;
99ENDPROC(_sys_rt_sigreturn)
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c
index df5bf022cf79..80996a1a94ca 100644
--- a/arch/blackfin/kernel/irqchip.c
+++ b/arch/blackfin/kernel/irqchip.c
@@ -91,7 +91,7 @@ int show_interrupts(struct seq_file *p, void *v)
91} 91}
92 92
93/* 93/*
94 * do_IRQ handles all hardware IRQ's. Decoded IRQs should not 94 * do_IRQ handles all hardware IRQs. Decoded IRQs should not
95 * come via this function. Instead, they should provide their 95 * come via this function. Instead, they should provide their
96 * own 'handler' 96 * own 'handler'
97 */ 97 */
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 02dc74301920..a24fa1ab802b 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -61,7 +61,7 @@ EXPORT_SYMBOL(memory_mtd_start);
61EXPORT_SYMBOL(mtd_size); 61EXPORT_SYMBOL(mtd_size);
62#endif 62#endif
63 63
64char command_line[COMMAND_LINE_SIZE]; 64char __initdata command_line[COMMAND_LINE_SIZE];
65 65
66#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE) 66#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
67static void generate_cpl_tables(void); 67static void generate_cpl_tables(void);
@@ -90,7 +90,7 @@ void __init bf53x_cache_init(void)
90#endif 90#endif
91} 91}
92 92
93void bf53x_relocate_l1_mem(void) 93void __init bf53x_relocate_l1_mem(void)
94{ 94{
95 unsigned long l1_code_length; 95 unsigned long l1_code_length;
96 unsigned long l1_data_a_length; 96 unsigned long l1_data_a_length;
@@ -205,7 +205,6 @@ void __init setup_arch(char **cmdline_p)
205#endif 205#endif
206 206
207#if defined(CONFIG_CMDLINE_BOOL) 207#if defined(CONFIG_CMDLINE_BOOL)
208 memset(command_line, 0, sizeof(command_line));
209 strncpy(&command_line[0], CONFIG_CMDLINE, sizeof(command_line)); 208 strncpy(&command_line[0], CONFIG_CMDLINE, sizeof(command_line));
210 command_line[sizeof(command_line) - 1] = 0; 209 command_line[sizeof(command_line) - 1] = 0;
211#endif 210#endif
@@ -213,7 +212,7 @@ void __init setup_arch(char **cmdline_p)
213 /* Keep a copy of command line */ 212 /* Keep a copy of command line */
214 *cmdline_p = &command_line[0]; 213 *cmdline_p = &command_line[0];
215 memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE); 214 memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
216 boot_command_line[COMMAND_LINE_SIZE - 1] = 0; 215 boot_command_line[COMMAND_LINE_SIZE - 1] = '\0';
217 216
218 /* setup memory defaults from the user config */ 217 /* setup memory defaults from the user config */
219 physical_mem_end = 0; 218 physical_mem_end = 0;
@@ -411,7 +410,7 @@ static int __init topology_init(void)
411subsys_initcall(topology_init); 410subsys_initcall(topology_init);
412 411
413#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE) 412#if defined(CONFIG_BLKFIN_DCACHE) || defined(CONFIG_BLKFIN_CACHE)
414u16 lock_kernel_check(u32 start, u32 end) 413static u16 __init lock_kernel_check(u32 start, u32 end)
415{ 414{
416 if ((start <= (u32) _stext && end >= (u32) _end) 415 if ((start <= (u32) _stext && end >= (u32) _end)
417 || (start >= (u32) _stext && end <= (u32) _end)) 416 || (start >= (u32) _stext && end <= (u32) _end))
@@ -471,6 +470,67 @@ close_cplbtab(struct cplb_tab *table)
471 return 0; 470 return 0;
472} 471}
473 472
473/* helper function */
474static void __fill_code_cplbtab(struct cplb_tab *t, int i,
475 u32 a_start, u32 a_end)
476{
477 if (cplb_data[i].psize) {
478 fill_cplbtab(t,
479 cplb_data[i].start,
480 cplb_data[i].end,
481 cplb_data[i].psize,
482 cplb_data[i].i_conf);
483 } else {
484#if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263))
485 if (i == SDRAM_KERN) {
486 fill_cplbtab(t,
487 cplb_data[i].start,
488 cplb_data[i].end,
489 SIZE_4M,
490 cplb_data[i].i_conf);
491 } else {
492#endif
493 fill_cplbtab(t,
494 cplb_data[i].start,
495 a_start,
496 SIZE_1M,
497 cplb_data[i].i_conf);
498 fill_cplbtab(t,
499 a_start,
500 a_end,
501 SIZE_4M,
502 cplb_data[i].i_conf);
503 fill_cplbtab(t, a_end,
504 cplb_data[i].end,
505 SIZE_1M,
506 cplb_data[i].i_conf);
507 }
508 }
509}
510
511static void __fill_data_cplbtab(struct cplb_tab *t, int i,
512 u32 a_start, u32 a_end)
513{
514 if (cplb_data[i].psize) {
515 fill_cplbtab(t,
516 cplb_data[i].start,
517 cplb_data[i].end,
518 cplb_data[i].psize,
519 cplb_data[i].d_conf);
520 } else {
521 fill_cplbtab(t,
522 cplb_data[i].start,
523 a_start, SIZE_1M,
524 cplb_data[i].d_conf);
525 fill_cplbtab(t, a_start,
526 a_end, SIZE_4M,
527 cplb_data[i].d_conf);
528 fill_cplbtab(t, a_end,
529 cplb_data[i].end,
530 SIZE_1M,
531 cplb_data[i].d_conf);
532 }
533}
474static void __init generate_cpl_tables(void) 534static void __init generate_cpl_tables(void)
475{ 535{
476 536
@@ -540,130 +600,78 @@ static void __init generate_cpl_tables(void)
540 cplb_data[RES_MEM].i_conf = SDRAM_INON_CHBL; 600 cplb_data[RES_MEM].i_conf = SDRAM_INON_CHBL;
541 601
542 for (i = ZERO_P; i <= L2_MEM; i++) { 602 for (i = ZERO_P; i <= L2_MEM; i++) {
603 if (!cplb_data[i].valid)
604 continue;
543 605
544 if (cplb_data[i].valid) { 606 as_1m = cplb_data[i].start % SIZE_1M;
545 607
546 as_1m = cplb_data[i].start % SIZE_1M; 608 /*
609 * We need to make sure all sections are properly 1M aligned
610 * However between Kernel Memory and the Kernel mtd section,
611 * depending on the rootfs size, there can be overlapping
612 * memory areas.
613 */
547 614
548 /* We need to make sure all sections are properly 1M aligned 615 if (as_1m && i != L1I_MEM && i != L1D_MEM) {
549 * However between Kernel Memory and the Kernel mtd section, depending on the
550 * rootfs size, there can be overlapping memory areas.
551 */
552
553 if (as_1m && i!=L1I_MEM && i!=L1D_MEM) {
554#ifdef CONFIG_MTD_UCLINUX 616#ifdef CONFIG_MTD_UCLINUX
555 if (i == SDRAM_RAM_MTD) { 617 if (i == SDRAM_RAM_MTD) {
556 if ((cplb_data[SDRAM_KERN].end + 1) > cplb_data[SDRAM_RAM_MTD].start) 618 if ((cplb_data[SDRAM_KERN].end + 1) >
557 cplb_data[SDRAM_RAM_MTD].start = (cplb_data[i].start & (-2*SIZE_1M)) + SIZE_1M; 619 cplb_data[SDRAM_RAM_MTD].start)
558 else 620 cplb_data[SDRAM_RAM_MTD].start =
559 cplb_data[SDRAM_RAM_MTD].start = (cplb_data[i].start & (-2*SIZE_1M)); 621 (cplb_data[i].start &
560 } else 622 (-2*SIZE_1M)) + SIZE_1M;
623 else
624 cplb_data[SDRAM_RAM_MTD].start =
625 (cplb_data[i].start &
626 (-2*SIZE_1M));
627 } else
561#endif 628#endif
562 printk(KERN_WARNING "Unaligned Start of %s at 0x%X\n", 629 printk(KERN_WARNING
563 cplb_data[i].name, cplb_data[i].start); 630 "Unaligned Start of %s at 0x%X\n",
564 } 631 cplb_data[i].name, cplb_data[i].start);
632 }
565 633
566 as = cplb_data[i].start % SIZE_4M; 634 as = cplb_data[i].start % SIZE_4M;
567 ae = cplb_data[i].end % SIZE_4M; 635 ae = cplb_data[i].end % SIZE_4M;
568
569 if (as)
570 a_start = cplb_data[i].start + (SIZE_4M - (as));
571 else
572 a_start = cplb_data[i].start;
573
574 a_end = cplb_data[i].end - ae;
575
576 for (j = INITIAL_T; j <= SWITCH_T; j++) {
577
578 switch (j) {
579 case INITIAL_T:
580 if (cplb_data[i].attr & INITIAL_T) {
581 t_i = &cplb.init_i;
582 t_d = &cplb.init_d;
583 process = 1;
584 } else
585 process = 0;
586 break;
587 case SWITCH_T:
588 if (cplb_data[i].attr & SWITCH_T) {
589 t_i = &cplb.switch_i;
590 t_d = &cplb.switch_d;
591 process = 1;
592 } else
593 process = 0;
594 break;
595 default:
596 process = 0;
597 break;
598 }
599 636
600 if (process) { 637 if (as)
601 if (cplb_data[i].attr & I_CPLB) { 638 a_start = cplb_data[i].start + (SIZE_4M - (as));
602 639 else
603 if (cplb_data[i].psize) { 640 a_start = cplb_data[i].start;
604 fill_cplbtab(t_i,
605 cplb_data[i].start,
606 cplb_data[i].end,
607 cplb_data[i].psize,
608 cplb_data[i].i_conf);
609 } else {
610 /*icplb_table */
611#if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263))
612 if (i == SDRAM_KERN) {
613 fill_cplbtab(t_i,
614 cplb_data[i].start,
615 cplb_data[i].end,
616 SIZE_4M,
617 cplb_data[i].i_conf);
618 } else
619#endif
620 {
621 fill_cplbtab(t_i,
622 cplb_data[i].start,
623 a_start,
624 SIZE_1M,
625 cplb_data[i].i_conf);
626 fill_cplbtab(t_i,
627 a_start,
628 a_end,
629 SIZE_4M,
630 cplb_data[i].i_conf);
631 fill_cplbtab(t_i, a_end,
632 cplb_data[i].end,
633 SIZE_1M,
634 cplb_data[i].i_conf);
635 }
636 }
637 641
638 } 642 a_end = cplb_data[i].end - ae;
639 if (cplb_data[i].attr & D_CPLB) {
640
641 if (cplb_data[i].psize) {
642 fill_cplbtab(t_d,
643 cplb_data[i].start,
644 cplb_data[i].end,
645 cplb_data[i].psize,
646 cplb_data[i].d_conf);
647 } else {
648/*dcplb_table*/
649 fill_cplbtab(t_d,
650 cplb_data[i].start,
651 a_start, SIZE_1M,
652 cplb_data[i].d_conf);
653 fill_cplbtab(t_d, a_start,
654 a_end, SIZE_4M,
655 cplb_data[i].d_conf);
656 fill_cplbtab(t_d, a_end,
657 cplb_data[i].end,
658 SIZE_1M,
659 cplb_data[i].d_conf);
660 643
661 } 644 for (j = INITIAL_T; j <= SWITCH_T; j++) {
662 645
663 } 646 switch (j) {
664 } 647 case INITIAL_T:
648 if (cplb_data[i].attr & INITIAL_T) {
649 t_i = &cplb.init_i;
650 t_d = &cplb.init_d;
651 process = 1;
652 } else
653 process = 0;
654 break;
655 case SWITCH_T:
656 if (cplb_data[i].attr & SWITCH_T) {
657 t_i = &cplb.switch_i;
658 t_d = &cplb.switch_d;
659 process = 1;
660 } else
661 process = 0;
662 break;
663 default:
664 process = 0;
665 break;
665 } 666 }
666 667
668 if (!process)
669 continue;
670 if (cplb_data[i].attr & I_CPLB)
671 __fill_code_cplbtab(t_i, i, a_start, a_end);
672
673 if (cplb_data[i].attr & D_CPLB)
674 __fill_data_cplbtab(t_d, i, a_start, a_end);
667 } 675 }
668 } 676 }
669 677
@@ -681,7 +689,7 @@ static void __init generate_cpl_tables(void)
681 689
682#endif 690#endif
683 691
684static inline u_long get_vco(void) 692static u_long get_vco(void)
685{ 693{
686 u_long msel; 694 u_long msel;
687 u_long vco; 695 u_long vco;
@@ -889,8 +897,8 @@ struct seq_operations cpuinfo_op = {
889 .show = show_cpuinfo, 897 .show = show_cpuinfo,
890}; 898};
891 899
892void cmdline_init(unsigned long r0) 900void __init cmdline_init(const char *r0)
893{ 901{
894 if (r0) 902 if (r0)
895 strncpy(command_line, (char *)r0, COMMAND_LINE_SIZE); 903 strncpy(command_line, r0, COMMAND_LINE_SIZE);
896} 904}
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 9932edee8cb4..5ab87b0b92dd 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -557,7 +557,7 @@ void dump_bfin_regs(struct pt_regs *fp, void *retaddr)
557 break; 557 break;
558#ifndef CONFIG_DEBUG_HWERR 558#ifndef CONFIG_DEBUG_HWERR
559 /* If one of the last few instructions was a STI 559 /* If one of the last few instructions was a STI
560 * it is likily that the error occured awhile ago 560 * it is likely that the error occured awhile ago
561 * and we just noticed 561 * and we just noticed
562 */ 562 */
563 if (x >= 0x0040 && x <= 0x0047 && i <= 0) 563 if (x >= 0x0040 && x <= 0x0047 && i <= 0)
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index 86fe67995802..1ef1e36b3957 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -7,7 +7,7 @@
7 * Description: Master linker script for blackfin architecture 7 * Description: Master linker script for blackfin architecture
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2007 Analog Devices Inc.
11 * 11 *
12 * Bugs: Enter bugs at http://blackfin.uclinux.org/ 12 * Bugs: Enter bugs at http://blackfin.uclinux.org/
13 * 13 *
@@ -32,97 +32,54 @@
32#include <asm-generic/vmlinux.lds.h> 32#include <asm-generic/vmlinux.lds.h>
33#include <asm/mem_map.h> 33#include <asm/mem_map.h>
34 34
35
36OUTPUT_FORMAT("elf32-bfin") 35OUTPUT_FORMAT("elf32-bfin")
37ENTRY(__start) 36ENTRY(__start)
38_jiffies = _jiffies_64; 37_jiffies = _jiffies_64;
39 38
40MEMORY
41{
42 ram : ORIGIN = CONFIG_BOOT_LOAD, LENGTH = (CONFIG_MEM_SIZE * 1024 * 1024) - (CONFIG_BOOT_LOAD)
43 l1_data_a : ORIGIN = L1_DATA_A_START, LENGTH = L1_DATA_A_LENGTH
44 l1_data_b : ORIGIN = L1_DATA_B_START, LENGTH = L1_DATA_B_LENGTH
45 l1_code : ORIGIN = L1_CODE_START, LENGTH = L1_CODE_LENGTH
46 l1_scratch : ORIGIN = L1_SCRATCH_START, LENGTH = L1_SCRATCH_LENGTH
47}
48
49SECTIONS 39SECTIONS
50{ 40{
51 . = CONFIG_BOOT_LOAD; 41 . = CONFIG_BOOT_LOAD;
52
53 .text : 42 .text :
54 { 43 {
55 _text = .; 44 __text = .;
56 __stext = .; 45 _text = .;
46 __stext = .;
57 TEXT_TEXT 47 TEXT_TEXT
58 SCHED_TEXT 48 SCHED_TEXT
49 LOCK_TEXT
59 *(.text.lock) 50 *(.text.lock)
51 *(.fixup)
52
60 . = ALIGN(16); 53 . = ALIGN(16);
61 ___start___ex_table = .; 54 ___start___ex_table = .;
62 *(__ex_table) 55 *(__ex_table)
63 ___stop___ex_table = .; 56 ___stop___ex_table = .;
64
65 *($code)
66 *(.rodata)
67 *(.rodata.*)
68 *(__vermagic) /* Kernel version magic */
69 *(.rodata1)
70 *(.fixup)
71 *(.spinlock.text)
72 57
73 /* Kernel symbol table: Normal symbols */
74 . = ALIGN(4); 58 . = ALIGN(4);
75 ___start___ksymtab = .;
76 *(__ksymtab)
77 ___stop___ksymtab = .;
78
79 /* Kernel symbol table: GPL-only symbols */
80 ___start___ksymtab_gpl = .;
81 *(__ksymtab_gpl)
82 ___stop___ksymtab_gpl = .;
83
84 /* Kernel symbol table: Normal unused symbols */ \
85 ___start___ksymtab_unused = .;
86 *(__ksymtab_unused)
87 ___stop___ksymtab_unused = .;
88
89 /* Kernel symbol table: GPL-only unused symbols */
90 ___start___ksymtab_unused_gpl = .;
91 *(__ksymtab_unused_gpl)
92 ___stop___ksymtab_unused_gpl = .;
93
94
95 /* Kernel symbol table: GPL-future symbols */
96 ___start___ksymtab_gpl_future = .;
97 *(__ksymtab_gpl_future)
98 ___stop___ksymtab_gpl_future = .;
99
100 /* Kernel symbol table: Normal symbols */
101 ___start___kcrctab = .;
102 *(__kcrctab)
103 ___stop___kcrctab = .;
104
105 /* Kernel symbol table: GPL-only symbols */
106 ___start___kcrctab_gpl = .;
107 *(__kcrctab_gpl)
108 ___stop___kcrctab_gpl = .;
109
110 /* Kernel symbol table: GPL-future symbols */
111 ___start___kcrctab_gpl_future = .;
112 *(__kcrctab_gpl_future)
113 ___stop___kcrctab_gpl_future = .;
114
115 /* Kernel symbol table: strings */
116 *(__ksymtab_strings)
117
118 . = ALIGN(4);
119 __etext = .; 59 __etext = .;
120 } > ram 60 }
61
62 RODATA
63
64 .data :
65 {
66 __sdata = .;
67 . = ALIGN(0x2000);
68 *(.data.init_task)
69 DATA_DATA
70 CONSTRUCTORS
71
72 . = ALIGN(32);
73 *(.data.cacheline_aligned)
74
75 . = ALIGN(0x2000);
76 __edata = .;
77 }
121 78
79 ___init_begin = .;
122 .init : 80 .init :
123 { 81 {
124 . = ALIGN(4096); 82 . = ALIGN(4096);
125 ___init_begin = .;
126 __sinittext = .; 83 __sinittext = .;
127 *(.init.text) 84 *(.init.text)
128 __einittext = .; 85 __einittext = .;
@@ -148,39 +105,39 @@ SECTIONS
148 *(.init.ramfs) 105 *(.init.ramfs)
149 ___initramfs_end = .; 106 ___initramfs_end = .;
150 . = ALIGN(4); 107 . = ALIGN(4);
151 ___init_end = .; 108 }
152 } > ram
153 109
154 __l1_lma_start = .; 110 __l1_lma_start = .;
155 111
156 .text_l1 : 112 .text_l1 L1_CODE_START : AT(LOADADDR(.init) + SIZEOF(.init))
157 { 113 {
158 . = ALIGN(4); 114 . = ALIGN(4);
159 __stext_l1 = .; 115 __stext_l1 = .;
160 *(.l1.text) 116 *(.l1.text)
161 117
162 . = ALIGN(4); 118 . = ALIGN(4);
163 __etext_l1 = .; 119 __etext_l1 = .;
164 } > l1_code AT > ram 120 }
165 121
166 .data_l1 : 122 .data_l1 L1_DATA_A_START : AT(LOADADDR(.text_l1) + SIZEOF(.text_l1))
167 { 123 {
168 . = ALIGN(4); 124 . = ALIGN(4);
169 __sdata_l1 = .; 125 __sdata_l1 = .;
170 *(.l1.data) 126 *(.l1.data)
171 __edata_l1 = .; 127 __edata_l1 = .;
172 128
173 . = ALIGN(4); 129 . = ALIGN(4);
174 __sbss_l1 = .; 130 __sbss_l1 = .;
175 *(.l1.bss) 131 *(.l1.bss)
176 132
177 . = ALIGN(32); 133 . = ALIGN(32);
178 *(.data_l1.cacheline_aligned) 134 *(.data_l1.cacheline_aligned)
179 135
180 . = ALIGN(4); 136 . = ALIGN(4);
181 __ebss_l1 = .; 137 __ebss_l1 = .;
182 } > l1_data_a AT > ram 138 }
183 .data_b_l1 : 139
140 .data_b_l1 L1_DATA_B_START : AT(LOADADDR(.data_l1) + SIZEOF(.data_l1))
184 { 141 {
185 . = ALIGN(4); 142 . = ALIGN(4);
186 __sdata_b_l1 = .; 143 __sdata_b_l1 = .;
@@ -193,36 +150,25 @@ SECTIONS
193 150
194 . = ALIGN(4); 151 . = ALIGN(4);
195 __ebss_b_l1 = .; 152 __ebss_b_l1 = .;
196 } > l1_data_b AT > ram 153 }
197 154
198 .data : 155 ___init_end = LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1);
199 {
200 __sdata = .;
201 . = ALIGN(0x2000);
202 *(.data.init_task)
203 DATA_DATA
204 156
205 . = ALIGN(32); 157 .bss LOADADDR(.data_b_l1) + SIZEOF(.data_b_l1) :
206 *(.data.cacheline_aligned)
207
208 . = ALIGN(0x2000);
209 __edata = .;
210 } > ram
211
212 /DISCARD/ : { /* Exit code and data*/
213 *(.exit.text)
214 *(.exit.data)
215 *(.exitcall.exit)
216 } > ram
217
218 .bss :
219 { 158 {
220 . = ALIGN(4); 159 . = ALIGN(4);
221 ___bss_start = .; 160 ___bss_start = .;
222 *(.bss) 161 *(.bss)
223 *(COMMON) 162 *(COMMON)
224 . = ALIGN(4); 163 . = ALIGN(4);
225 ___bss_stop = .; 164 ___bss_stop = .;
226 __end = . ; 165 __end = .;
227 } > ram 166 }
167
168 /DISCARD/ :
169 {
170 *(.exit.text)
171 *(.exit.data)
172 *(.exitcall.exit)
173 }
228} 174}
diff --git a/arch/blackfin/lib/divsi3.S b/arch/blackfin/lib/divsi3.S
index 3e29861852b2..2ac59c70dd94 100644
--- a/arch/blackfin/lib/divsi3.S
+++ b/arch/blackfin/lib/divsi3.S
@@ -44,6 +44,7 @@
44 */ 44 */
45 45
46.global ___divsi3; 46.global ___divsi3;
47.type ___divsi3, STT_FUNC;
47 48
48#ifdef CONFIG_ARITHMETIC_OPS_L1 49#ifdef CONFIG_ARITHMETIC_OPS_L1
49.section .l1.text 50.section .l1.text
@@ -214,3 +215,5 @@ ___divsi3 :
214.Lret_zero: 215.Lret_zero:
215 R0 = 0; 216 R0 = 0;
216 RTS; 217 RTS;
218
219.size ___divsi3, .-___divsi3
diff --git a/arch/blackfin/lib/ins.S b/arch/blackfin/lib/ins.S
index 7d5e9846311d..a17cc77ac36f 100644
--- a/arch/blackfin/lib/ins.S
+++ b/arch/blackfin/lib/ins.S
@@ -46,7 +46,7 @@ ENTRY(_insl)
46.Llong_loop_e: NOP; 46.Llong_loop_e: NOP;
47 sti R3; 47 sti R3;
48 RTS; 48 RTS;
49 49ENDPROC(_insl)
50 50
51ENTRY(_insw) 51ENTRY(_insw)
52 P0 = R0; /* P0 = port */ 52 P0 = R0; /* P0 = port */
@@ -61,6 +61,7 @@ ENTRY(_insw)
61.Lword_loop_e: NOP; 61.Lword_loop_e: NOP;
62 sti R3; 62 sti R3;
63 RTS; 63 RTS;
64ENDPROC(_insw)
64 65
65ENTRY(_insb) 66ENTRY(_insb)
66 P0 = R0; /* P0 = port */ 67 P0 = R0; /* P0 = port */
@@ -75,3 +76,4 @@ ENTRY(_insb)
75.Lbyte_loop_e: NOP; 76.Lbyte_loop_e: NOP;
76 sti R3; 77 sti R3;
77 RTS; 78 RTS;
79ENDPROC(_insb)
diff --git a/arch/blackfin/lib/memchr.S b/arch/blackfin/lib/memchr.S
index 498122250d07..5da428134d32 100644
--- a/arch/blackfin/lib/memchr.S
+++ b/arch/blackfin/lib/memchr.S
@@ -67,4 +67,4 @@ ENTRY(_memchr)
67 R0 += -1; 67 R0 += -1;
68 RTS; 68 RTS;
69 69
70.size _memchr,.-_memchr 70ENDPROC(_memchr)
diff --git a/arch/blackfin/lib/memcmp.S b/arch/blackfin/lib/memcmp.S
index 5b9502368fc6..a6b8ee6a6bf2 100644
--- a/arch/blackfin/lib/memcmp.S
+++ b/arch/blackfin/lib/memcmp.S
@@ -107,4 +107,4 @@ ENTRY(_memcmp)
107 P3 = I1; 107 P3 = I1;
108 RTS; 108 RTS;
109 109
110.size _memcmp,.-_memcmp 110ENDPROC(_memcmp)
diff --git a/arch/blackfin/lib/memcpy.S b/arch/blackfin/lib/memcpy.S
index c1e00eff541c..34b5a91c215c 100644
--- a/arch/blackfin/lib/memcpy.S
+++ b/arch/blackfin/lib/memcpy.S
@@ -140,3 +140,5 @@ ENTRY(_memcpy)
140 B[P0--] = R1; 140 B[P0--] = R1;
141 141
142 RTS; 142 RTS;
143
144ENDPROC(_memcpy)
diff --git a/arch/blackfin/lib/memmove.S b/arch/blackfin/lib/memmove.S
index 2e5fb7f8df13..c371585e9dbd 100644
--- a/arch/blackfin/lib/memmove.S
+++ b/arch/blackfin/lib/memmove.S
@@ -100,4 +100,4 @@ ENTRY(_memmove)
100 P3 = I1; 100 P3 = I1;
101 RTS; 101 RTS;
102 102
103.size _memmove,.-_memmove 103ENDPROC(_memmove)
diff --git a/arch/blackfin/lib/memset.S b/arch/blackfin/lib/memset.S
index ba6d047568dd..8159136a29ea 100644
--- a/arch/blackfin/lib/memset.S
+++ b/arch/blackfin/lib/memset.S
@@ -106,4 +106,4 @@ ENTRY(_memset)
106 B[P0++] = R1; 106 B[P0++] = R1;
107 JUMP .Laligned; 107 JUMP .Laligned;
108 108
109.size _memset,.-_memset 109ENDPROC(_memset)
diff --git a/arch/blackfin/lib/modsi3.S b/arch/blackfin/lib/modsi3.S
index 528b8b1ccb34..ca1dd3973b39 100644
--- a/arch/blackfin/lib/modsi3.S
+++ b/arch/blackfin/lib/modsi3.S
@@ -77,3 +77,5 @@ ___modsi3:
77 R0 = 0; 77 R0 = 0;
78.LRETURN_R0: 78.LRETURN_R0:
79 RTS; 79 RTS;
80
81.size ___modsi3, .-___modsi3
diff --git a/arch/blackfin/lib/outs.S b/arch/blackfin/lib/outs.S
index f8c876fe8930..4c3da8ae094e 100644
--- a/arch/blackfin/lib/outs.S
+++ b/arch/blackfin/lib/outs.S
@@ -40,6 +40,7 @@ ENTRY(_outsl)
40.Llong_loop_s: R0 = [P1++]; 40.Llong_loop_s: R0 = [P1++];
41.Llong_loop_e: [P0] = R0; 41.Llong_loop_e: [P0] = R0;
42 RTS; 42 RTS;
43ENDPROC(_outsl)
43 44
44ENTRY(_outsw) 45ENTRY(_outsw)
45 P0 = R0; /* P0 = port */ 46 P0 = R0; /* P0 = port */
@@ -50,6 +51,7 @@ ENTRY(_outsw)
50.Lword_loop_s: R0 = W[P1++]; 51.Lword_loop_s: R0 = W[P1++];
51.Lword_loop_e: W[P0] = R0; 52.Lword_loop_e: W[P0] = R0;
52 RTS; 53 RTS;
54ENDPROC(_outsw)
53 55
54ENTRY(_outsb) 56ENTRY(_outsb)
55 P0 = R0; /* P0 = port */ 57 P0 = R0; /* P0 = port */
@@ -60,3 +62,4 @@ ENTRY(_outsb)
60.Lbyte_loop_s: R0 = B[P1++]; 62.Lbyte_loop_s: R0 = B[P1++];
61.Lbyte_loop_e: B[P0] = R0; 63.Lbyte_loop_e: B[P0] = R0;
62 RTS; 64 RTS;
65ENDPROC(_outsb)
diff --git a/arch/blackfin/lib/smulsi3_highpart.S b/arch/blackfin/lib/smulsi3_highpart.S
index 10b8f8da576f..e383cd3eca5d 100644
--- a/arch/blackfin/lib/smulsi3_highpart.S
+++ b/arch/blackfin/lib/smulsi3_highpart.S
@@ -28,3 +28,5 @@ ___smulsi3_highpart:
28 28
29 R0 = R0 + R1; 29 R0 = R0 + R1;
30 RTS; 30 RTS;
31
32.size ___smulsi3_highpart, .-___smulsi3_highpart
diff --git a/arch/blackfin/lib/udivsi3.S b/arch/blackfin/lib/udivsi3.S
index d39a12916259..58fd96d74766 100644
--- a/arch/blackfin/lib/udivsi3.S
+++ b/arch/blackfin/lib/udivsi3.S
@@ -296,3 +296,5 @@ ENTRY(___udivsi3)
296 R1 = R0 - R3; 296 R1 = R0 - R3;
297 IF CC R0 = R1; 297 IF CC R0 = R1;
298 RTS; 298 RTS;
299
300ENDPROC(___udivsi3)
diff --git a/arch/blackfin/lib/umodsi3.S b/arch/blackfin/lib/umodsi3.S
index b55ce96ab89f..4f2b76ee7626 100644
--- a/arch/blackfin/lib/umodsi3.S
+++ b/arch/blackfin/lib/umodsi3.S
@@ -34,7 +34,9 @@
34#endif 34#endif
35 35
36.extern ___udivsi3; 36.extern ___udivsi3;
37.type ___udivsi3, STT_FUNC;
37.globl ___umodsi3 38.globl ___umodsi3
39.type ___umodsi3, STT_FUNC;
38___umodsi3: 40___umodsi3:
39 41
40 CC=R0==0; 42 CC=R0==0;
@@ -64,3 +66,5 @@ ___umodsi3:
64 R0 = 0; 66 R0 = 0;
65.LRETURN_R0: 67.LRETURN_R0:
66 RTS; 68 RTS;
69
70.size ___umodsi3, .-___umodsi3
diff --git a/arch/blackfin/lib/umulsi3_highpart.S b/arch/blackfin/lib/umulsi3_highpart.S
index aac8218fb258..67b799351e3e 100644
--- a/arch/blackfin/lib/umulsi3_highpart.S
+++ b/arch/blackfin/lib/umulsi3_highpart.S
@@ -21,3 +21,5 @@ ___umulsi3_highpart:
21 R1 = PACK(R1.l,R0.h); 21 R1 = PACK(R1.l,R0.h);
22 R0 = R1 + R2; 22 R0 = R1 + R2;
23 RTS; 23 RTS;
24
25.size ___umulsi3_highpart, .-___umulsi3_highpart
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index 23a7f607df3f..edd31ce4f8d2 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * File: arch/blackfin/mach-bf533/boards/cm_bf533.c 2 * File: arch/blackfin/mach-bf533/boards/cm_bf533.c
3 * Based on: arch/blackfin/mach-bf533/boards/ezkit.c 3 * Based on: arch/blackfin/mach-bf533/boards/ezkit.c
4 * Author: Aidan Williams <aidan@nicta.com.au> Copright 2005 4 * Author: Aidan Williams <aidan@nicta.com.au> Copyright 2005
5 * 5 *
6 * Created: 2005 6 * Created: 2005
7 * Description: Board description file 7 * Description: Board description file
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index 747298ea907b..0b522d95160d 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * File: arch/blackfin/mach-bf533/ezkit.c 2 * File: arch/blackfin/mach-bf533/ezkit.c
3 * Based on: Orginal Work 3 * Based on: Original Work
4 * Author: Aidan Williams <aidan@nicta.com.au> 4 * Author: Aidan Williams <aidan@nicta.com.au>
5 * 5 *
6 * Created: 2005 6 * Created: 2005
diff --git a/arch/blackfin/mach-bf533/head.S b/arch/blackfin/mach-bf533/head.S
index 4db9e6240906..7e2aa8d0f44f 100644
--- a/arch/blackfin/mach-bf533/head.S
+++ b/arch/blackfin/mach-bf533/head.S
@@ -28,6 +28,7 @@
28 */ 28 */
29 29
30#include <linux/linkage.h> 30#include <linux/linkage.h>
31#include <linux/init.h>
31#include <asm/blackfin.h> 32#include <asm/blackfin.h>
32#if CONFIG_BFIN_KERNEL_CLOCK 33#if CONFIG_BFIN_KERNEL_CLOCK
33#include <asm/mach/mem_init.h> 34#include <asm/mach/mem_init.h>
@@ -45,19 +46,19 @@
45 46
46#define INITIAL_STACK 0xFFB01000 47#define INITIAL_STACK 0xFFB01000
47 48
48.text 49__INIT
49 50
50ENTRY(__start) 51ENTRY(__start)
51ENTRY(__stext)
52 /* R0: argument of command line string, passed from uboot, save it */ 52 /* R0: argument of command line string, passed from uboot, save it */
53 R7 = R0; 53 R7 = R0;
54 /* Set the SYSCFG register */ 54 /* Set the SYSCFG register:
55 * Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
56 */
55 R0 = 0x36; 57 R0 = 0x36;
56 /*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/
57 SYSCFG = R0; 58 SYSCFG = R0;
58 R0 = 0; 59 R0 = 0;
59 60
60 /*Clear Out All the data and pointer Registers*/ 61 /* Clear Out All the data and pointer Registers */
61 R1 = R0; 62 R1 = R0;
62 R2 = R0; 63 R2 = R0;
63 R3 = R0; 64 R3 = R0;
@@ -79,7 +80,7 @@ ENTRY(__stext)
79 L2 = r0; 80 L2 = r0;
80 L3 = r0; 81 L3 = r0;
81 82
82 /* Clear Out All the DAG Registers*/ 83 /* Clear Out All the DAG Registers */
83 B0 = r0; 84 B0 = r0;
84 B1 = r0; 85 B1 = r0;
85 B2 = r0; 86 B2 = r0;
@@ -265,6 +266,7 @@ ENTRY(__stext)
265 266
266.LWAIT_HERE: 267.LWAIT_HERE:
267 jump .LWAIT_HERE; 268 jump .LWAIT_HERE;
269ENDPROC(__start)
268 270
269ENTRY(_real_start) 271ENTRY(_real_start)
270 [ -- sp ] = reti; 272 [ -- sp ] = reti;
@@ -303,7 +305,7 @@ ENTRY(_real_start)
303.L_clear_zero: 305.L_clear_zero:
304 W[p1++] = r0; 306 W[p1++] = r0;
305 307
306/* pass the uboot arguments to the global value command line */ 308 /* pass the uboot arguments to the global value command line */
307 R0 = R7; 309 R0 = R7;
308 call _cmdline_init; 310 call _cmdline_init;
309 311
@@ -322,7 +324,7 @@ ENTRY(_real_start)
322 [p1] = r1; 324 [p1] = r1;
323 325
324 /* 326 /*
325 * load the current thread pointer and stack 327 * load the current thread pointer and stack
326 */ 328 */
327 r1.l = _init_thread_union; 329 r1.l = _init_thread_union;
328 r1.h = _init_thread_union; 330 r1.h = _init_thread_union;
@@ -333,9 +335,10 @@ ENTRY(_real_start)
333 sp = r1; 335 sp = r1;
334 usp = sp; 336 usp = sp;
335 fp = sp; 337 fp = sp;
336 call _start_kernel; 338 jump.l _start_kernel;
337.L_exit: 339ENDPROC(_real_start)
338 jump.s .L_exit; 340
341__FINIT
339 342
340.section .l1.text 343.section .l1.text
341#if CONFIG_BFIN_KERNEL_CLOCK 344#if CONFIG_BFIN_KERNEL_CLOCK
@@ -439,12 +442,13 @@ ENTRY(_start_dma_code)
439 442
440 p0.h = hi(SIC_IWR); 443 p0.h = hi(SIC_IWR);
441 p0.l = lo(SIC_IWR); 444 p0.l = lo(SIC_IWR);
442 r0.l = lo(IWR_ENABLE_ALL) 445 r0.l = lo(IWR_ENABLE_ALL);
443 r0.h = hi(IWR_ENABLE_ALL) 446 r0.h = hi(IWR_ENABLE_ALL);
444 [p0] = r0; 447 [p0] = r0;
445 SSYNC; 448 SSYNC;
446 449
447 RTS; 450 RTS;
451ENDPROC(_start_dma_code)
448#endif /* CONFIG_BFIN_KERNEL_CLOCK */ 452#endif /* CONFIG_BFIN_KERNEL_CLOCK */
449 453
450ENTRY(_bfin_reset) 454ENTRY(_bfin_reset)
diff --git a/arch/blackfin/mach-bf533/ints-priority.c b/arch/blackfin/mach-bf533/ints-priority.c
index 36a693345204..a3e1789167be 100644
--- a/arch/blackfin/mach-bf533/ints-priority.c
+++ b/arch/blackfin/mach-bf533/ints-priority.c
@@ -4,7 +4,7 @@
4 * Author: Michael Hennerich 4 * Author: Michael Hennerich
5 * 5 *
6 * Created: ? 6 * Created: ?
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2006 Analog Devices Inc.
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index 9019c0edbe7c..fd57e7439e0f 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -55,7 +55,7 @@ static struct resource bfin_pcmcia_cf_resources[] = {
55 .end = 0x20312000, 55 .end = 0x20312000,
56 .flags = IORESOURCE_MEM, 56 .flags = IORESOURCE_MEM,
57 },{ 57 },{
58 .start = 0x20311000, /* Attribute Memeory */ 58 .start = 0x20311000, /* Attribute Memory */
59 .end = 0x20311FFF, 59 .end = 0x20311FFF,
60 .flags = IORESOURCE_MEM, 60 .flags = IORESOURCE_MEM,
61 },{ 61 },{
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c
index 40d3a1b70ee7..8aaf76dfce80 100644
--- a/arch/blackfin/mach-bf537/boards/pnav10.c
+++ b/arch/blackfin/mach-bf537/boards/pnav10.c
@@ -59,7 +59,7 @@ static struct resource bfin_pcmcia_cf_resources[] = {
59 .end = 0x20312000, 59 .end = 0x20312000,
60 .flags = IORESOURCE_MEM, 60 .flags = IORESOURCE_MEM,
61 },{ 61 },{
62 .start = 0x20311000, /* Attribute Memeory */ 62 .start = 0x20311000, /* Attribute Memory */
63 .end = 0x20311FFF, 63 .end = 0x20311FFF,
64 .flags = IORESOURCE_MEM, 64 .flags = IORESOURCE_MEM,
65 },{ 65 },{
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index ba2f875a7f7d..3a29b4d15f25 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -108,7 +108,7 @@ static struct resource bfin_pcmcia_cf_resources[] = {
108 .end = 0x20312000, 108 .end = 0x20312000,
109 .flags = IORESOURCE_MEM, 109 .flags = IORESOURCE_MEM,
110 },{ 110 },{
111 .start = 0x20311000, /* Attribute Memeory */ 111 .start = 0x20311000, /* Attribute Memory */
112 .end = 0x20311FFF, 112 .end = 0x20311FFF,
113 .flags = IORESOURCE_MEM, 113 .flags = IORESOURCE_MEM,
114 },{ 114 },{
diff --git a/arch/blackfin/mach-bf537/head.S b/arch/blackfin/mach-bf537/head.S
index 2c2652bee7e5..7d902bbd860f 100644
--- a/arch/blackfin/mach-bf537/head.S
+++ b/arch/blackfin/mach-bf537/head.S
@@ -28,6 +28,7 @@
28 */ 28 */
29 29
30#include <linux/linkage.h> 30#include <linux/linkage.h>
31#include <linux/init.h>
31#include <asm/blackfin.h> 32#include <asm/blackfin.h>
32#if CONFIG_BFIN_KERNEL_CLOCK 33#if CONFIG_BFIN_KERNEL_CLOCK
33#include <asm/mach/mem_init.h> 34#include <asm/mach/mem_init.h>
@@ -40,20 +41,21 @@
40.extern ___bss_start 41.extern ___bss_start
41.extern _bf53x_relocate_l1_mem 42.extern _bf53x_relocate_l1_mem
42 43
43#define INITIAL_STACK 0xFFB01000 44#define INITIAL_STACK 0xFFB01000
44 45
45.text 46__INIT
46 47
47ENTRY(__start) 48ENTRY(__start)
48ENTRY(__stext)
49 /* R0: argument of command line string, passed from uboot, save it */ 49 /* R0: argument of command line string, passed from uboot, save it */
50 R7 = R0; 50 R7 = R0;
51 /* Set the SYSCFG register */ 51 /* Set the SYSCFG register:
52 * Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
53 */
52 R0 = 0x36; 54 R0 = 0x36;
53 SYSCFG = R0; /*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/ 55 SYSCFG = R0;
54 R0 = 0; 56 R0 = 0;
55 57
56 /* Clear Out All the data and pointer Registers*/ 58 /* Clear Out All the data and pointer Registers */
57 R1 = R0; 59 R1 = R0;
58 R2 = R0; 60 R2 = R0;
59 R3 = R0; 61 R3 = R0;
@@ -75,7 +77,7 @@ ENTRY(__stext)
75 L2 = r0; 77 L2 = r0;
76 L3 = r0; 78 L3 = r0;
77 79
78 /* Clear Out All the DAG Registers*/ 80 /* Clear Out All the DAG Registers */
79 B0 = r0; 81 B0 = r0;
80 B1 = r0; 82 B1 = r0;
81 B2 = r0; 83 B2 = r0;
@@ -191,7 +193,7 @@ ENTRY(__stext)
191 193
192 p0.h = hi(UART_DLL); 194 p0.h = hi(UART_DLL);
193 p0.l = lo(UART_DLL); 195 p0.l = lo(UART_DLL);
194 r0 = 0x00(Z); 196 r0 = 0x0(Z);
195 w[p0] = r0.L; 197 w[p0] = r0.L;
196 ssync; 198 ssync;
197 199
@@ -218,6 +220,7 @@ ENTRY(__stext)
218#if CONFIG_BFIN_KERNEL_CLOCK 220#if CONFIG_BFIN_KERNEL_CLOCK
219 call _start_dma_code; 221 call _start_dma_code;
220#endif 222#endif
223
221 /* Code for initializing Async memory banks */ 224 /* Code for initializing Async memory banks */
222 225
223 p2.h = hi(EBIU_AMBCTL1); 226 p2.h = hi(EBIU_AMBCTL1);
@@ -272,6 +275,7 @@ ENTRY(__stext)
272 275
273.LWAIT_HERE: 276.LWAIT_HERE:
274 jump .LWAIT_HERE; 277 jump .LWAIT_HERE;
278ENDPROC(__start)
275 279
276ENTRY(_real_start) 280ENTRY(_real_start)
277 [ -- sp ] = reti; 281 [ -- sp ] = reti;
@@ -291,7 +295,7 @@ ENTRY(_real_start)
291 p2.h = ___bss_stop; 295 p2.h = ___bss_stop;
292 r0 = 0; 296 r0 = 0;
293 p2 -= p1; 297 p2 -= p1;
294 lsetup (.L_clear_bss, .L_clear_bss ) lc0 = p2; 298 lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;
295.L_clear_bss: 299.L_clear_bss:
296 B[p1++] = r0; 300 B[p1++] = r0;
297 301
@@ -306,7 +310,7 @@ ENTRY(_real_start)
306 r0 = r0 >> 1; 310 r0 = r0 >> 1;
307 p2 = r0; 311 p2 = r0;
308 r0 = 0; 312 r0 = 0;
309 lsetup (.L_clear_zero, .L_clear_zero ) lc0 = p2; 313 lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;
310.L_clear_zero: 314.L_clear_zero:
311 W[p1++] = r0; 315 W[p1++] = r0;
312 316
@@ -328,9 +332,8 @@ ENTRY(_real_start)
328 r1 = p3; 332 r1 = p3;
329 [p1] = r1; 333 [p1] = r1;
330 334
331
332 /* 335 /*
333 * load the current thread pointer and stack 336 * load the current thread pointer and stack
334 */ 337 */
335 r1.l = _init_thread_union; 338 r1.l = _init_thread_union;
336 r1.h = _init_thread_union; 339 r1.h = _init_thread_union;
@@ -341,9 +344,10 @@ ENTRY(_real_start)
341 sp = r1; 344 sp = r1;
342 usp = sp; 345 usp = sp;
343 fp = sp; 346 fp = sp;
344 call _start_kernel; 347 jump.l _start_kernel;
345.L_exit: 348ENDPROC(_real_start)
346 jump.s .L_exit; 349
350__FINIT
347 351
348.section .l1.text 352.section .l1.text
349#if CONFIG_BFIN_KERNEL_CLOCK 353#if CONFIG_BFIN_KERNEL_CLOCK
@@ -462,6 +466,7 @@ ENTRY(_start_dma_code)
462 SSYNC; 466 SSYNC;
463 467
464 RTS; 468 RTS;
469ENDPROC(_start_dma_code)
465#endif /* CONFIG_BFIN_KERNEL_CLOCK */ 470#endif /* CONFIG_BFIN_KERNEL_CLOCK */
466 471
467ENTRY(_bfin_reset) 472ENTRY(_bfin_reset)
diff --git a/arch/blackfin/mach-bf537/ints-priority.c b/arch/blackfin/mach-bf537/ints-priority.c
index fd6308eccbe6..2dbf3df465d1 100644
--- a/arch/blackfin/mach-bf537/ints-priority.c
+++ b/arch/blackfin/mach-bf537/ints-priority.c
@@ -4,7 +4,7 @@
4 * Author: Michael Hennerich 4 * Author: Michael Hennerich
5 * 5 *
6 * Created: 6 * Created:
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2006 Analog Devices Inc.
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index 6824e956d153..3dc5c042048c 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * File: arch/blackfin/mach-bf533/boards/cm_bf561.c 2 * File: arch/blackfin/mach-bf533/boards/cm_bf561.c
3 * Based on: arch/blackfin/mach-bf533/boards/ezkit.c 3 * Based on: arch/blackfin/mach-bf533/boards/ezkit.c
4 * Author: Aidan Williams <aidan@nicta.com.au> Copright 2005 4 * Author: Aidan Williams <aidan@nicta.com.au> Copyright 2005
5 * 5 *
6 * Created: 2006 6 * Created: 2006
7 * Description: Board description file 7 * Description: Board description file
@@ -43,7 +43,7 @@
43char *bfin_board_name = "Bluetechnix CM BF561"; 43char *bfin_board_name = "Bluetechnix CM BF561";
44 44
45#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) 45#if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
46/* all SPI perpherals info goes here */ 46/* all SPI peripherals info goes here */
47 47
48#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) 48#if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE)
49static struct mtd_partition bfin_spi_flash_partitions[] = { 49static struct mtd_partition bfin_spi_flash_partitions[] = {
diff --git a/arch/blackfin/mach-bf561/head.S b/arch/blackfin/mach-bf561/head.S
index ad9187a866a5..31cbc75c85cf 100644
--- a/arch/blackfin/mach-bf561/head.S
+++ b/arch/blackfin/mach-bf561/head.S
@@ -28,6 +28,7 @@
28 */ 28 */
29 29
30#include <linux/linkage.h> 30#include <linux/linkage.h>
31#include <linux/init.h>
31#include <asm/blackfin.h> 32#include <asm/blackfin.h>
32#if CONFIG_BFIN_KERNEL_CLOCK 33#if CONFIG_BFIN_KERNEL_CLOCK
33#include <asm/mach/mem_init.h> 34#include <asm/mach/mem_init.h>
@@ -42,18 +43,19 @@
42 43
43#define INITIAL_STACK 0xFFB01000 44#define INITIAL_STACK 0xFFB01000
44 45
45.text 46__INIT
46 47
47ENTRY(__start) 48ENTRY(__start)
48ENTRY(__stext) 49 /* R0: argument of command line string, passed from uboot, save it */
49 /* R0: argument of command line string, passed from uboot, save it */
50 R7 = R0; 50 R7 = R0;
51 /* Set the SYSCFG register */ 51 /* Set the SYSCFG register:
52 * Enable Cycle Counter and Nesting Of Interrupts (3rd Bit)
53 */
52 R0 = 0x36; 54 R0 = 0x36;
53 SYSCFG = R0; /*Enable Cycle Counter and Nesting Of Interrupts(3rd Bit)*/ 55 SYSCFG = R0;
54 R0 = 0; 56 R0 = 0;
55 57
56 /*Clear Out All the data and pointer Registers*/ 58 /* Clear Out All the data and pointer Registers */
57 R1 = R0; 59 R1 = R0;
58 R2 = R0; 60 R2 = R0;
59 R3 = R0; 61 R3 = R0;
@@ -75,7 +77,7 @@ ENTRY(__stext)
75 L2 = r0; 77 L2 = r0;
76 L3 = r0; 78 L3 = r0;
77 79
78 /* Clear Out All the DAG Registers*/ 80 /* Clear Out All the DAG Registers */
79 B0 = r0; 81 B0 = r0;
80 B1 = r0; 82 B1 = r0;
81 B2 = r0; 83 B2 = r0;
@@ -219,6 +221,7 @@ ENTRY(__stext)
219 221
220.LWAIT_HERE: 222.LWAIT_HERE:
221 jump .LWAIT_HERE; 223 jump .LWAIT_HERE;
224ENDPROC(__start)
222 225
223ENTRY(_real_start) 226ENTRY(_real_start)
224 [ -- sp ] = reti; 227 [ -- sp ] = reti;
@@ -238,7 +241,7 @@ ENTRY(_real_start)
238 p2.h = ___bss_stop; 241 p2.h = ___bss_stop;
239 r0 = 0; 242 r0 = 0;
240 p2 -= p1; 243 p2 -= p1;
241 lsetup (.L_clear_bss, .L_clear_bss ) lc0 = p2; 244 lsetup (.L_clear_bss, .L_clear_bss) lc0 = p2;
242.L_clear_bss: 245.L_clear_bss:
243 B[p1++] = r0; 246 B[p1++] = r0;
244 247
@@ -253,11 +256,11 @@ ENTRY(_real_start)
253 r0 = r0 >> 1; 256 r0 = r0 >> 1;
254 p2 = r0; 257 p2 = r0;
255 r0 = 0; 258 r0 = 0;
256 lsetup (.L_clear_zero, .L_clear_zero ) lc0 = p2; 259 lsetup (.L_clear_zero, .L_clear_zero) lc0 = p2;
257.L_clear_zero: 260.L_clear_zero:
258 W[p1++] = r0; 261 W[p1++] = r0;
259 262
260/* pass the uboot arguments to the global value command line */ 263 /* pass the uboot arguments to the global value command line */
261 R0 = R7; 264 R0 = R7;
262 call _cmdline_init; 265 call _cmdline_init;
263 266
@@ -287,9 +290,10 @@ ENTRY(_real_start)
287 sp = r1; 290 sp = r1;
288 usp = sp; 291 usp = sp;
289 fp = sp; 292 fp = sp;
290 call _start_kernel; 293 jump.l _start_kernel;
291.L_exit: 294ENDPROC(_real_start)
292 jump.s .L_exit; 295
296__FINIT
293 297
294.section .l1.text 298.section .l1.text
295#if CONFIG_BFIN_KERNEL_CLOCK 299#if CONFIG_BFIN_KERNEL_CLOCK
@@ -350,7 +354,7 @@ ENTRY(_start_dma_code)
350 if ! CC jump .Lcheck_again; 354 if ! CC jump .Lcheck_again;
351 355
352 /* Configure SCLK & CCLK Dividers */ 356 /* Configure SCLK & CCLK Dividers */
353 r0 = (CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV); 357 r0 = (CONFIG_CCLK_ACT_DIV | CONFIG_SCLK_DIV);
354 p0.h = hi(PLL_DIV); 358 p0.h = hi(PLL_DIV);
355 p0.l = lo(PLL_DIV); 359 p0.l = lo(PLL_DIV);
356 w[p0] = r0.l; 360 w[p0] = r0.l;
@@ -391,6 +395,7 @@ ENTRY(_start_dma_code)
391 SSYNC; 395 SSYNC;
392 396
393 RTS; 397 RTS;
398ENDPROC(_start_dma_code)
394#endif /* CONFIG_BFIN_KERNEL_CLOCK */ 399#endif /* CONFIG_BFIN_KERNEL_CLOCK */
395 400
396ENTRY(_bfin_reset) 401ENTRY(_bfin_reset)
diff --git a/arch/blackfin/mach-bf561/ints-priority.c b/arch/blackfin/mach-bf561/ints-priority.c
index 89c52ff95b27..86e3b0ee93f4 100644
--- a/arch/blackfin/mach-bf561/ints-priority.c
+++ b/arch/blackfin/mach-bf561/ints-priority.c
@@ -4,7 +4,7 @@
4 * Author: Michael Hennerich 4 * Author: Michael Hennerich
5 * 5 *
6 * Created: 6 * Created:
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2006 Analog Devices Inc.
diff --git a/arch/blackfin/mach-common/cache.S b/arch/blackfin/mach-common/cache.S
index bb9446ef66ef..8bd2af1935bd 100644
--- a/arch/blackfin/mach-common/cache.S
+++ b/arch/blackfin/mach-common/cache.S
@@ -70,6 +70,7 @@ ENTRY(_cache_invalidate)
70.Lno_dcache_b: 70.Lno_dcache_b:
71 R7 = [SP++]; 71 R7 = [SP++];
72 RTS; 72 RTS;
73ENDPROC(_cache_invalidate)
73 74
74/* Invalidate the Entire Instruction cache by 75/* Invalidate the Entire Instruction cache by
75 * disabling IMC bit 76 * disabling IMC bit
@@ -106,6 +107,8 @@ ENTRY(_invalidate_entire_icache)
106 107
107 ( R7:5) = [SP++]; 108 ( R7:5) = [SP++];
108 RTS; 109 RTS;
110ENDPROC(_invalidate_entire_icache)
111ENDPROC(_icache_invalidate)
109 112
110/* 113/*
111 * blackfin_cache_flush_range(start, end) 114 * blackfin_cache_flush_range(start, end)
@@ -129,6 +132,7 @@ ENTRY(_blackfin_icache_flush_range)
129 IFLUSH [P0]; 132 IFLUSH [P0];
130 SSYNC; 133 SSYNC;
131 RTS; 134 RTS;
135ENDPROC(_blackfin_icache_flush_range)
132 136
133/* 137/*
134 * blackfin_icache_dcache_flush_range(start, end) 138 * blackfin_icache_dcache_flush_range(start, end)
@@ -155,6 +159,7 @@ ENTRY(_blackfin_icache_dcache_flush_range)
155 FLUSH [P0]; 159 FLUSH [P0];
156 SSYNC; 160 SSYNC;
157 RTS; 161 RTS;
162ENDPROC(_blackfin_icache_dcache_flush_range)
158 163
159/* Throw away all D-cached data in specified region without any obligation to 164/* Throw away all D-cached data in specified region without any obligation to
160 * write them back. However, we must clean the D-cached entries around the 165 * write them back. However, we must clean the D-cached entries around the
@@ -183,6 +188,7 @@ ENTRY(_blackfin_dcache_invalidate_range)
183 FLUSHINV[P0]; 188 FLUSHINV[P0];
184 SSYNC; 189 SSYNC;
185 RTS; 190 RTS;
191ENDPROC(_blackfin_dcache_invalidate_range)
186 192
187/* Invalidate the Entire Data cache by 193/* Invalidate the Entire Data cache by
188 * clearing DMC[1:0] bits 194 * clearing DMC[1:0] bits
@@ -221,6 +227,8 @@ ENTRY(_dcache_invalidate)
221 227
222 ( R7:6) = [SP++]; 228 ( R7:6) = [SP++];
223 RTS; 229 RTS;
230ENDPROC(_dcache_invalidate)
231ENDPROC(_invalidate_entire_dcache)
224 232
225ENTRY(_blackfin_dcache_flush_range) 233ENTRY(_blackfin_dcache_flush_range)
226 R2 = -L1_CACHE_BYTES; 234 R2 = -L1_CACHE_BYTES;
@@ -241,6 +249,7 @@ ENTRY(_blackfin_dcache_flush_range)
241 FLUSH[P0]; 249 FLUSH[P0];
242 SSYNC; 250 SSYNC;
243 RTS; 251 RTS;
252ENDPROC(_blackfin_dcache_flush_range)
244 253
245ENTRY(_blackfin_dflush_page) 254ENTRY(_blackfin_dflush_page)
246 P1 = 1 << (PAGE_SHIFT - L1_CACHE_SHIFT); 255 P1 = 1 << (PAGE_SHIFT - L1_CACHE_SHIFT);
@@ -251,3 +260,4 @@ ENTRY(_blackfin_dflush_page)
251.Lfl1: FLUSH [P0++]; 260.Lfl1: FLUSH [P0++];
252 SSYNC; 261 SSYNC;
253 RTS; 262 RTS;
263ENDPROC(_blackfin_dflush_page)
diff --git a/arch/blackfin/mach-common/cacheinit.S b/arch/blackfin/mach-common/cacheinit.S
index 8c17f099e5eb..7924a90d9658 100644
--- a/arch/blackfin/mach-common/cacheinit.S
+++ b/arch/blackfin/mach-common/cacheinit.S
@@ -86,6 +86,8 @@ ENTRY(_bfin_icache_init)
86 SSYNC; 86 SSYNC;
87 STI R2; 87 STI R2;
88 RTS; 88 RTS;
89
90ENDPROC(_bfin_icache_init)
89#endif 91#endif
90 92
91#if defined(CONFIG_BLKFIN_DCACHE) 93#if defined(CONFIG_BLKFIN_DCACHE)
@@ -134,4 +136,6 @@ ENTRY(_bfin_dcache_init)
134 SSYNC; 136 SSYNC;
135 STI R2; 137 STI R2;
136 RTS; 138 RTS;
139
140ENDPROC(_bfin_dcache_init)
137#endif 141#endif
diff --git a/arch/blackfin/mach-common/cplbhdlr.S b/arch/blackfin/mach-common/cplbhdlr.S
index b979067c49ef..2f3c72c23997 100644
--- a/arch/blackfin/mach-common/cplbhdlr.S
+++ b/arch/blackfin/mach-common/cplbhdlr.S
@@ -42,8 +42,6 @@
42 42
43.align 2 43.align 2
44 44
45.global __cplb_hdr;
46.type __cplb_hdr, STT_FUNC;
47ENTRY(__cplb_hdr) 45ENTRY(__cplb_hdr)
48 R2 = SEQSTAT; 46 R2 = SEQSTAT;
49 47
@@ -128,3 +126,5 @@ ENTRY(__cplb_hdr)
128 call _panic_cplb_error; 126 call _panic_cplb_error;
129 SP += 12; 127 SP += 12;
130 JUMP _handle_bad_cplb; 128 JUMP _handle_bad_cplb;
129
130ENDPROC(__cplb_hdr)
diff --git a/arch/blackfin/mach-common/cplbinfo.c b/arch/blackfin/mach-common/cplbinfo.c
index d65fac39d1bf..caa9623e6bd6 100644
--- a/arch/blackfin/mach-common/cplbinfo.c
+++ b/arch/blackfin/mach-common/cplbinfo.c
@@ -82,7 +82,7 @@ static char *cplb_print_entry(char *buf, int type)
82 int entry = 0, used_cplb = 0; 82 int entry = 0, used_cplb = 0;
83 83
84 if (type == CPLB_I) { 84 if (type == CPLB_I) {
85 buf += sprintf(buf, "Instrction CPLB entry:\n"); 85 buf += sprintf(buf, "Instruction CPLB entry:\n");
86 p_addr = ipdt_table; 86 p_addr = ipdt_table;
87 p_data = ipdt_table + 1; 87 p_data = ipdt_table + 1;
88 p_icount = ipdt_swapcount_table; 88 p_icount = ipdt_swapcount_table;
diff --git a/arch/blackfin/mach-common/cplbmgr.S b/arch/blackfin/mach-common/cplbmgr.S
index f5efc4bc65e6..e4b47e09cf13 100644
--- a/arch/blackfin/mach-common/cplbmgr.S
+++ b/arch/blackfin/mach-common/cplbmgr.S
@@ -592,6 +592,7 @@ ENTRY(_cplb_mgr)
592 ( R7:4,P5:3 ) = [SP++]; 592 ( R7:4,P5:3 ) = [SP++];
593 R0 = CPLB_RELOADED; 593 R0 = CPLB_RELOADED;
594 RTS; 594 RTS;
595ENDPROC(_cplb_mgr)
595 596
596.data 597.data
597.align 4; 598.align 4;
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 7d0368772cda..40045b1386ad 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -103,6 +103,7 @@ ENTRY(_ex_dcplb)
103 if !cc jump _return_from_exception; 103 if !cc jump _return_from_exception;
104 /* fall through */ 104 /* fall through */
105#endif 105#endif
106ENDPROC(_ex_dcplb)
106 107
107ENTRY(_ex_icplb) 108ENTRY(_ex_icplb)
108 (R7:6,P5:4) = [sp++]; 109 (R7:6,P5:4) = [sp++];
@@ -113,6 +114,7 @@ ENTRY(_ex_icplb)
113 RESTORE_ALL_SYS 114 RESTORE_ALL_SYS
114 SP = RETN; 115 SP = RETN;
115 rtx; 116 rtx;
117ENDPROC(_ex_icplb)
116 118
117ENTRY(_ex_spinlock) 119ENTRY(_ex_spinlock)
118 /* Transform this into a syscall - twiddle the syscall vector. */ 120 /* Transform this into a syscall - twiddle the syscall vector. */
@@ -123,6 +125,7 @@ ENTRY(_ex_spinlock)
123 [p5] = r7; 125 [p5] = r7;
124 csync; 126 csync;
125 /* Fall through. */ 127 /* Fall through. */
128ENDPROC(_ex_spinlock)
126 129
127ENTRY(_ex_syscall) 130ENTRY(_ex_syscall)
128 DEBUG_START_HWTRACE 131 DEBUG_START_HWTRACE
@@ -131,6 +134,7 @@ ENTRY(_ex_syscall)
131 raise 15; /* invoked by TRAP #0, for sys call */ 134 raise 15; /* invoked by TRAP #0, for sys call */
132 sp = retn; 135 sp = retn;
133 rtx 136 rtx
137ENDPROC(_ex_syscall)
134 138
135ENTRY(_spinlock_bh) 139ENTRY(_spinlock_bh)
136 SAVE_ALL_SYS 140 SAVE_ALL_SYS
@@ -150,12 +154,14 @@ ENTRY(_spinlock_bh)
150 [SP + PT_R0] = R0; 154 [SP + PT_R0] = R0;
151 RESTORE_ALL_SYS 155 RESTORE_ALL_SYS
152 rti; 156 rti;
157ENDPROC(_spinlock_bh)
153 158
154ENTRY(_ex_soft_bp) 159ENTRY(_ex_soft_bp)
155 r7 = retx; 160 r7 = retx;
156 r7 += -2; 161 r7 += -2;
157 retx = r7; 162 retx = r7;
158 jump.s _ex_trap_c; 163 jump.s _ex_trap_c;
164ENDPROC(_ex_soft_bp)
159 165
160ENTRY(_ex_single_step) 166ENTRY(_ex_single_step)
161 r7 = retx; 167 r7 = retx;
@@ -191,6 +197,7 @@ _return_from_exception:
191 ASTAT = [sp++]; 197 ASTAT = [sp++];
192 sp = retn; 198 sp = retn;
193 rtx; 199 rtx;
200ENDPROC(_ex_soft_bp)
194 201
195ENTRY(_handle_bad_cplb) 202ENTRY(_handle_bad_cplb)
196 /* To get here, we just tried and failed to change a CPLB 203 /* To get here, we just tried and failed to change a CPLB
@@ -250,6 +257,7 @@ ENTRY(_ex_trap_c)
250 SP = RETN; 257 SP = RETN;
251 raise 5; 258 raise 5;
252 rtx; 259 rtx;
260ENDPROC(_ex_trap_c)
253 261
254ENTRY(_exception_to_level5) 262ENTRY(_exception_to_level5)
255 SAVE_ALL_SYS 263 SAVE_ALL_SYS
@@ -314,6 +322,7 @@ ENTRY(_exception_to_level5)
314 call _ret_from_exception; 322 call _ret_from_exception;
315 RESTORE_ALL_SYS 323 RESTORE_ALL_SYS
316 rti; 324 rti;
325ENDPROC(_exception_to_level5)
317 326
318ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/ 327ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
319 /* Since the kernel stack can be anywhere, it's not guaranteed to be 328 /* Since the kernel stack can be anywhere, it's not guaranteed to be
@@ -342,6 +351,7 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/
342 r7 = -ENOSYS; /* signextending enough */ 351 r7 = -ENOSYS; /* signextending enough */
343 [sp + PT_R0] = r7; /* return value from system call */ 352 [sp + PT_R0] = r7; /* return value from system call */
344 jump .Lsyscall_really_exit; 353 jump .Lsyscall_really_exit;
354ENDPROC(_trap)
345 355
346ENTRY(_kernel_execve) 356ENTRY(_kernel_execve)
347 link SIZEOF_PTREGS; 357 link SIZEOF_PTREGS;
@@ -396,6 +406,7 @@ ENTRY(_kernel_execve)
3961: 4061:
397 unlink; 407 unlink;
398 rts; 408 rts;
409ENDPROC(_kernel_execve)
399 410
400ENTRY(_system_call) 411ENTRY(_system_call)
401 /* Store IPEND */ 412 /* Store IPEND */
@@ -503,6 +514,7 @@ ENTRY(_system_call)
503 r5 = [sp + PT_RESERVED]; 514 r5 = [sp + PT_RESERVED];
504 rets = r5; 515 rets = r5;
505 rts; 516 rts;
517ENDPROC(_system_call)
506 518
507_sys_trace: 519_sys_trace:
508 call _syscall_trace; 520 call _syscall_trace;
@@ -531,6 +543,7 @@ _sys_trace:
531 543
532 call _syscall_trace; 544 call _syscall_trace;
533 jump .Lresume_userspace; 545 jump .Lresume_userspace;
546ENDPROC(_sys_trace)
534 547
535ENTRY(_resume) 548ENTRY(_resume)
536 /* 549 /*
@@ -580,6 +593,7 @@ _new_old_task:
580 * in "new" task. 593 * in "new" task.
581 */ 594 */
582 rts; 595 rts;
596ENDPROC(_resume)
583 597
584ENTRY(_ret_from_exception) 598ENTRY(_ret_from_exception)
585 p2.l = lo(IPEND); 599 p2.l = lo(IPEND);
@@ -638,6 +652,7 @@ ENTRY(_ret_from_exception)
638 syscfg = r0; 652 syscfg = r0;
6395: 6535:
640 rts; 654 rts;
655ENDPROC(_ret_from_exception)
641 656
642ENTRY(_return_from_int) 657ENTRY(_return_from_int)
643 /* If someone else already raised IRQ 15, do nothing. */ 658 /* If someone else already raised IRQ 15, do nothing. */
@@ -680,6 +695,7 @@ ENTRY(_return_from_int)
680 rti; 695 rti;
6812: 6962:
682 rts; 697 rts;
698ENDPROC(_return_from_int)
683 699
684ENTRY(_lower_to_irq14) 700ENTRY(_lower_to_irq14)
685#if defined(ANOMALY_05000281) 701#if defined(ANOMALY_05000281)
@@ -745,6 +761,7 @@ _schedule_and_signal:
7451: 7611:
746 RESTORE_CONTEXT 762 RESTORE_CONTEXT
747 rti; 763 rti;
764ENDPROC(_lower_to_irq14)
748 765
749/* Make sure when we start, that the circular buffer is initialized properly 766/* Make sure when we start, that the circular buffer is initialized properly
750 * R0 and P0 are call clobbered, so we can use them here. 767 * R0 and P0 are call clobbered, so we can use them here.
@@ -758,6 +775,7 @@ ENTRY(_init_exception_buff)
758 p0.l = _out_ptr_excause; 775 p0.l = _out_ptr_excause;
759 [p0] = r0; 776 [p0] = r0;
760 rts; 777 rts;
778ENDPROC(_init_exception_buff)
761 779
762/* 780/*
763 * Put these in the kernel data section - that should always be covered by 781 * Put these in the kernel data section - that should always be covered by
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index dd45664f0d02..b69f517a650b 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -66,6 +66,7 @@ ENTRY(_evt_emulation)
66 SP += 12; 66 SP += 12;
67 /* - GDB stub fills this in by itself (if defined) */ 67 /* - GDB stub fills this in by itself (if defined) */
68 rte; 68 rte;
69ENDPROC(_evt_emulation)
69#endif 70#endif
70 71
71/* Common interrupt entry code. First we do CLI, then push 72/* Common interrupt entry code. First we do CLI, then push
@@ -251,3 +252,4 @@ ENTRY(_evt_system_call)
251#endif 252#endif
252 call _system_call; 253 call _system_call;
253 jump .Lcommon_restore_context; 254 jump .Lcommon_restore_context;
255ENDPROC(_evt_system_call)
diff --git a/arch/blackfin/mach-common/ints-priority-dc.c b/arch/blackfin/mach-common/ints-priority-dc.c
index f3cf07036c2a..80943bbd37c2 100644
--- a/arch/blackfin/mach-common/ints-priority-dc.c
+++ b/arch/blackfin/mach-common/ints-priority-dc.c
@@ -4,7 +4,7 @@
4 * Author: 4 * Author:
5 * 5 *
6 * Created: ? 6 * Created: ?
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * 1996 Roman Zippel 10 * 1996 Roman Zippel
diff --git a/arch/blackfin/mach-common/ints-priority-sc.c b/arch/blackfin/mach-common/ints-priority-sc.c
index 34b62288ec3c..2cfc7d5aec5c 100644
--- a/arch/blackfin/mach-common/ints-priority-sc.c
+++ b/arch/blackfin/mach-common/ints-priority-sc.c
@@ -4,7 +4,7 @@
4 * Author: 4 * Author:
5 * 5 *
6 * Created: ? 6 * Created: ?
7 * Description: Set up the interupt priorities 7 * Description: Set up the interrupt priorities
8 * 8 *
9 * Modified: 9 * Modified:
10 * 1996 Roman Zippel 10 * 1996 Roman Zippel
diff --git a/arch/blackfin/mach-common/lock.S b/arch/blackfin/mach-common/lock.S
index 2cbb15b33925..386ac8dda076 100644
--- a/arch/blackfin/mach-common/lock.S
+++ b/arch/blackfin/mach-common/lock.S
@@ -155,6 +155,7 @@ ENTRY(_cache_grab_lock)
155 ( R7:0,P5:0 ) = [SP++]; 155 ( R7:0,P5:0 ) = [SP++];
156 156
157 RTS; 157 RTS;
158ENDPROC(_cache_grab_lock)
158 159
159/* After the execution of critical code, the code is now locked into 160/* After the execution of critical code, the code is now locked into
160 * the cache way. Now we need to set ILOC. 161 * the cache way. Now we need to set ILOC.
@@ -186,6 +187,7 @@ ENTRY(_cache_lock)
186 187
187 ( R7:0,P5:0 ) = [SP++]; 188 ( R7:0,P5:0 ) = [SP++];
188 RTS; 189 RTS;
190ENDPROC(_cache_lock)
189 191
190#endif /* BLKFIN_CACHE_LOCK */ 192#endif /* BLKFIN_CACHE_LOCK */
191 193
@@ -193,7 +195,6 @@ ENTRY(_cache_lock)
193 */ 195 */
194 196
195ENTRY(_read_iloc) 197ENTRY(_read_iloc)
196
197 P1.H = (IMEM_CONTROL >> 16); 198 P1.H = (IMEM_CONTROL >> 16);
198 P1.L = (IMEM_CONTROL & 0xFFFF); 199 P1.L = (IMEM_CONTROL & 0xFFFF);
199 R1 = 0xF; 200 R1 = 0xF;
@@ -202,3 +203,4 @@ ENTRY(_read_iloc)
202 R0 = R0 & R1; 203 R0 = R0 & R1;
203 204
204 RTS; 205 RTS;
206ENDPROC(_read_iloc)
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index afed5246dd9e..150ef5d088dc 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -39,7 +39,7 @@
39#include <asm/io.h> 39#include <asm/io.h>
40#include <asm/dpmc.h> 40#include <asm/dpmc.h>
41#include <asm/irq.h> 41#include <asm/irq.h>
42 42#include <asm/gpio.h>
43 43
44#ifdef CONFIG_PM_WAKEUP_GPIO_POLAR_H 44#ifdef CONFIG_PM_WAKEUP_GPIO_POLAR_H
45#define WAKEUP_TYPE PM_WAKE_HIGH 45#define WAKEUP_TYPE PM_WAKE_HIGH
diff --git a/arch/blackfin/mm/blackfin_sram.c b/arch/blackfin/mm/blackfin_sram.c
index dd0c6501c424..68107924639e 100644
--- a/arch/blackfin/mm/blackfin_sram.c
+++ b/arch/blackfin/mm/blackfin_sram.c
@@ -7,7 +7,7 @@
7 * Description: SRAM driver for Blackfin ADSP-BF5xx 7 * Description: SRAM driver for Blackfin ADSP-BF5xx
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2007 Analog Devices Inc.
11 * 11 *
12 * Bugs: Enter bugs at http://blackfin.uclinux.org/ 12 * Bugs: Enter bugs at http://blackfin.uclinux.org/
13 * 13 *
@@ -63,6 +63,7 @@ struct l1_sram_piece {
63 void *paddr; 63 void *paddr;
64 int size; 64 int size;
65 int flag; 65 int flag;
66 pid_t pid;
66}; 67};
67 68
68static struct l1_sram_piece l1_ssram[CONFIG_L1_MAX_PIECE]; 69static struct l1_sram_piece l1_ssram[CONFIG_L1_MAX_PIECE];
@@ -80,7 +81,7 @@ static struct l1_sram_piece l1_inst_sram[CONFIG_L1_MAX_PIECE];
80#endif 81#endif
81 82
82/* L1 Scratchpad SRAM initialization function */ 83/* L1 Scratchpad SRAM initialization function */
83void l1sram_init(void) 84void __init l1sram_init(void)
84{ 85{
85 printk(KERN_INFO "Blackfin Scratchpad data SRAM: %d KB\n", 86 printk(KERN_INFO "Blackfin Scratchpad data SRAM: %d KB\n",
86 L1_SCRATCH_LENGTH >> 10); 87 L1_SCRATCH_LENGTH >> 10);
@@ -94,42 +95,43 @@ void l1sram_init(void)
94 spin_lock_init(&l1sram_lock); 95 spin_lock_init(&l1sram_lock);
95} 96}
96 97
97void l1_data_sram_init(void) 98void __init l1_data_sram_init(void)
98{ 99{
99#if L1_DATA_A_LENGTH != 0 100#if L1_DATA_A_LENGTH != 0
100 printk(KERN_INFO "Blackfin DATA_A SRAM: %d KB\n",
101 L1_DATA_A_LENGTH >> 10);
102
103 memset(&l1_data_A_sram, 0x00, sizeof(l1_data_A_sram)); 101 memset(&l1_data_A_sram, 0x00, sizeof(l1_data_A_sram));
104 l1_data_A_sram[0].paddr = (void*)L1_DATA_A_START + 102 l1_data_A_sram[0].paddr = (void *)L1_DATA_A_START +
105 (_ebss_l1 - _sdata_l1); 103 (_ebss_l1 - _sdata_l1);
106 l1_data_A_sram[0].size = L1_DATA_A_LENGTH - (_ebss_l1 - _sdata_l1); 104 l1_data_A_sram[0].size = L1_DATA_A_LENGTH - (_ebss_l1 - _sdata_l1);
107 l1_data_A_sram[0].flag = SRAM_SLT_FREE; 105 l1_data_A_sram[0].flag = SRAM_SLT_FREE;
106
107 printk(KERN_INFO "Blackfin Data A SRAM: %d KB (%d KB free)\n",
108 L1_DATA_A_LENGTH >> 10, l1_data_A_sram[0].size >> 10);
108#endif 109#endif
109#if L1_DATA_B_LENGTH != 0 110#if L1_DATA_B_LENGTH != 0
110 printk(KERN_INFO "Blackfin DATA_B SRAM: %d KB\n",
111 L1_DATA_B_LENGTH >> 10);
112
113 memset(&l1_data_B_sram, 0x00, sizeof(l1_data_B_sram)); 111 memset(&l1_data_B_sram, 0x00, sizeof(l1_data_B_sram));
114 l1_data_B_sram[0].paddr = (void*)L1_DATA_B_START; 112 l1_data_B_sram[0].paddr = (void *)L1_DATA_B_START +
115 l1_data_B_sram[0].size = L1_DATA_B_LENGTH; 113 (_ebss_b_l1 - _sdata_b_l1);
114 l1_data_B_sram[0].size = L1_DATA_B_LENGTH - (_ebss_b_l1 - _sdata_b_l1);
116 l1_data_B_sram[0].flag = SRAM_SLT_FREE; 115 l1_data_B_sram[0].flag = SRAM_SLT_FREE;
116
117 printk(KERN_INFO "Blackfin Data B SRAM: %d KB (%d KB free)\n",
118 L1_DATA_B_LENGTH >> 10, l1_data_B_sram[0].size >> 10);
117#endif 119#endif
118 120
119 /* mutex initialize */ 121 /* mutex initialize */
120 spin_lock_init(&l1_data_sram_lock); 122 spin_lock_init(&l1_data_sram_lock);
121} 123}
122 124
123void l1_inst_sram_init(void) 125void __init l1_inst_sram_init(void)
124{ 126{
125#if L1_CODE_LENGTH != 0 127#if L1_CODE_LENGTH != 0
126 printk(KERN_INFO "Blackfin Instruction SRAM: %d KB\n",
127 L1_CODE_LENGTH >> 10);
128
129 memset(&l1_inst_sram, 0x00, sizeof(l1_inst_sram)); 128 memset(&l1_inst_sram, 0x00, sizeof(l1_inst_sram));
130 l1_inst_sram[0].paddr = (void*)L1_CODE_START + (_etext_l1 - _stext_l1); 129 l1_inst_sram[0].paddr = (void*)L1_CODE_START + (_etext_l1 - _stext_l1);
131 l1_inst_sram[0].size = L1_CODE_LENGTH - (_etext_l1 - _stext_l1); 130 l1_inst_sram[0].size = L1_CODE_LENGTH - (_etext_l1 - _stext_l1);
132 l1_inst_sram[0].flag = SRAM_SLT_FREE; 131 l1_inst_sram[0].flag = SRAM_SLT_FREE;
132
133 printk(KERN_INFO "Blackfin Instruction SRAM: %d KB (%d KB free)\n",
134 L1_CODE_LENGTH >> 10, l1_inst_sram[0].size >> 10);
133#endif 135#endif
134 136
135 /* mutex initialize */ 137 /* mutex initialize */
@@ -149,12 +151,13 @@ static void *_l1_sram_alloc(size_t size, struct l1_sram_piece *pfree, int count)
149 size = (size + 3) & ~3; 151 size = (size + 3) & ~3;
150 152
151 /* not use the good method to match the best slot !!! */ 153 /* not use the good method to match the best slot !!! */
152 /* search an available memeory slot */ 154 /* search an available memory slot */
153 for (i = 0; i < count; i++) { 155 for (i = 0; i < count; i++) {
154 if ((pfree[i].flag == SRAM_SLT_FREE) 156 if ((pfree[i].flag == SRAM_SLT_FREE)
155 && (pfree[i].size >= size)) { 157 && (pfree[i].size >= size)) {
156 addr = pfree[i].paddr; 158 addr = pfree[i].paddr;
157 pfree[i].flag = SRAM_SLT_ALLOCATED; 159 pfree[i].flag = SRAM_SLT_ALLOCATED;
160 pfree[i].pid = current->pid;
158 index = i; 161 index = i;
159 break; 162 break;
160 } 163 }
@@ -162,10 +165,11 @@ static void *_l1_sram_alloc(size_t size, struct l1_sram_piece *pfree, int count)
162 if (i >= count) 165 if (i >= count)
163 return NULL; 166 return NULL;
164 167
165 /* updated the NULL memeory slot !!! */ 168 /* updated the NULL memory slot !!! */
166 if (pfree[i].size > size) { 169 if (pfree[i].size > size) {
167 for (i = 0; i < count; i++) { 170 for (i = 0; i < count; i++) {
168 if (pfree[i].flag == SRAM_SLT_NULL) { 171 if (pfree[i].flag == SRAM_SLT_NULL) {
172 pfree[i].pid = 0;
169 pfree[i].flag = SRAM_SLT_FREE; 173 pfree[i].flag = SRAM_SLT_FREE;
170 pfree[i].paddr = addr + size; 174 pfree[i].paddr = addr + size;
171 pfree[i].size = pfree[index].size - size; 175 pfree[i].size = pfree[index].size - size;
@@ -186,7 +190,7 @@ static void *_l1_sram_alloc_max(struct l1_sram_piece *pfree, int count,
186 int i, index = -1; 190 int i, index = -1;
187 void *addr = NULL; 191 void *addr = NULL;
188 192
189 /* search an available memeory slot */ 193 /* search an available memory slot */
190 for (i = 0; i < count; i++) { 194 for (i = 0; i < count; i++) {
191 if (pfree[i].flag == SRAM_SLT_FREE && pfree[i].size > best) { 195 if (pfree[i].flag == SRAM_SLT_FREE && pfree[i].size > best) {
192 addr = pfree[i].paddr; 196 addr = pfree[i].paddr;
@@ -198,13 +202,15 @@ static void *_l1_sram_alloc_max(struct l1_sram_piece *pfree, int count,
198 return NULL; 202 return NULL;
199 *psize = best; 203 *psize = best;
200 204
205 pfree[index].pid = current->pid;
201 pfree[index].flag = SRAM_SLT_ALLOCATED; 206 pfree[index].flag = SRAM_SLT_ALLOCATED;
202 return addr; 207 return addr;
203} 208}
204 209
205/* L1 memory free function */ 210/* L1 memory free function */
206static int _l1_sram_free(const void *addr, 211static int _l1_sram_free(const void *addr,
207 struct l1_sram_piece *pfree, int count) 212 struct l1_sram_piece *pfree,
213 int count)
208{ 214{
209 int i, index = 0; 215 int i, index = 0;
210 216
@@ -222,12 +228,14 @@ static int _l1_sram_free(const void *addr,
222 if (i >= count) 228 if (i >= count)
223 return -1; 229 return -1;
224 230
231 pfree[index].pid = 0;
225 pfree[index].flag = SRAM_SLT_FREE; 232 pfree[index].flag = SRAM_SLT_FREE;
226 233
227 /* link the next address slot */ 234 /* link the next address slot */
228 for (i = 0; i < count; i++) { 235 for (i = 0; i < count; i++) {
229 if (((pfree[index].paddr + pfree[index].size) == pfree[i].paddr) 236 if (((pfree[index].paddr + pfree[index].size) == pfree[i].paddr)
230 && (pfree[i].flag == SRAM_SLT_FREE)) { 237 && (pfree[i].flag == SRAM_SLT_FREE)) {
238 pfree[i].pid = 0;
231 pfree[i].flag = SRAM_SLT_NULL; 239 pfree[i].flag = SRAM_SLT_NULL;
232 pfree[index].size += pfree[i].size; 240 pfree[index].size += pfree[i].size;
233 pfree[index].flag = SRAM_SLT_FREE; 241 pfree[index].flag = SRAM_SLT_FREE;
@@ -538,3 +546,64 @@ void *sram_alloc_with_lsl(size_t size, unsigned long flags)
538 return addr; 546 return addr;
539} 547}
540EXPORT_SYMBOL(sram_alloc_with_lsl); 548EXPORT_SYMBOL(sram_alloc_with_lsl);
549
550#ifdef CONFIG_PROC_FS
551/* Once we get a real allocator, we'll throw all of this away.
552 * Until then, we need some sort of visibility into the L1 alloc.
553 */
554static void _l1sram_proc_read(char *buf, int *len, const char *desc,
555 struct l1_sram_piece *pfree, const int array_size)
556{
557 int i;
558
559 *len += sprintf(&buf[*len], "--- L1 %-14s Size PID State\n", desc);
560 for (i = 0; i < array_size; ++i) {
561 const char *alloc_type;
562 switch (pfree[i].flag) {
563 case SRAM_SLT_NULL: alloc_type = "NULL"; break;
564 case SRAM_SLT_FREE: alloc_type = "FREE"; break;
565 case SRAM_SLT_ALLOCATED: alloc_type = "ALLOCATED"; break;
566 default: alloc_type = "????"; break;
567 }
568 *len += sprintf(&buf[*len], "%p-%p %8i %4i %s\n",
569 pfree[i].paddr, pfree[i].paddr + pfree[i].size,
570 pfree[i].size, pfree[i].pid, alloc_type);
571 }
572}
573static int l1sram_proc_read(char *buf, char **start, off_t offset, int count,
574 int *eof, void *data)
575{
576 int len = 0;
577
578 _l1sram_proc_read(buf, &len, "Scratchpad",
579 l1_ssram, ARRAY_SIZE(l1_ssram));
580#if L1_DATA_A_LENGTH != 0
581 _l1sram_proc_read(buf, &len, "Data A",
582 l1_data_A_sram, ARRAY_SIZE(l1_data_A_sram));
583#endif
584#if L1_DATA_B_LENGTH != 0
585 _l1sram_proc_read(buf, &len, "Data B",
586 l1_data_B_sram, ARRAY_SIZE(l1_data_B_sram));
587#endif
588#if L1_CODE_LENGTH != 0
589 _l1sram_proc_read(buf, &len, "Instruction",
590 l1_inst_sram, ARRAY_SIZE(l1_inst_sram));
591#endif
592
593 return len;
594}
595
596static int __init l1sram_proc_init(void)
597{
598 struct proc_dir_entry *ptr;
599 ptr = create_proc_entry("sram", S_IFREG | S_IRUGO, NULL);
600 if (!ptr) {
601 printk(KERN_WARNING "unable to create /proc/sram\n");
602 return -1;
603 }
604 ptr->owner = THIS_MODULE;
605 ptr->read_proc = l1sram_proc_read;
606 return 0;
607}
608late_initcall(l1sram_proc_init);
609#endif
diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c
index d6cf1059560d..570356dbe028 100644
--- a/arch/blackfin/mm/init.c
+++ b/arch/blackfin/mm/init.c
@@ -7,7 +7,7 @@
7 * Description: 7 * Description:
8 * 8 *
9 * Modified: 9 * Modified:
10 * Copyright 2004-2006 Analog Devices Inc. 10 * Copyright 2004-2007 Analog Devices Inc.
11 * 11 *
12 * Bugs: Enter bugs at http://blackfin.uclinux.org/ 12 * Bugs: Enter bugs at http://blackfin.uclinux.org/
13 * 13 *
@@ -53,7 +53,7 @@ static unsigned long empty_bad_page;
53 53
54unsigned long empty_zero_page; 54unsigned long empty_zero_page;
55 55
56void show_mem(void) 56void __init show_mem(void)
57{ 57{
58 unsigned long i; 58 unsigned long i;
59 int free = 0, total = 0, reserved = 0, shared = 0; 59 int free = 0, total = 0, reserved = 0, shared = 0;
@@ -86,7 +86,7 @@ void show_mem(void)
86 * The parameters are pointers to where to stick the starting and ending 86 * The parameters are pointers to where to stick the starting and ending
87 * addresses of available kernel virtual memory. 87 * addresses of available kernel virtual memory.
88 */ 88 */
89void paging_init(void) 89void __init paging_init(void)
90{ 90{
91 /* 91 /*
92 * make sure start_mem is page aligned, otherwise bootmem and 92 * make sure start_mem is page aligned, otherwise bootmem and
@@ -125,7 +125,7 @@ void paging_init(void)
125 } 125 }
126} 126}
127 127
128void mem_init(void) 128void __init mem_init(void)
129{ 129{
130 unsigned int codek = 0, datak = 0, initk = 0; 130 unsigned int codek = 0, datak = 0, initk = 0;
131 unsigned long tmp; 131 unsigned long tmp;
@@ -169,7 +169,7 @@ void mem_init(void)
169} 169}
170 170
171#ifdef CONFIG_BLK_DEV_INITRD 171#ifdef CONFIG_BLK_DEV_INITRD
172void free_initrd_mem(unsigned long start, unsigned long end) 172void __init free_initrd_mem(unsigned long start, unsigned long end)
173{ 173{
174 int pages = 0; 174 int pages = 0;
175 for (; start < end; start += PAGE_SIZE) { 175 for (; start < end; start += PAGE_SIZE) {
@@ -183,14 +183,14 @@ void free_initrd_mem(unsigned long start, unsigned long end)
183} 183}
184#endif 184#endif
185 185
186void free_initmem(void) 186void __init free_initmem(void)
187{ 187{
188#ifdef CONFIG_RAMKERNEL 188#ifdef CONFIG_RAMKERNEL
189 unsigned long addr; 189 unsigned long addr;
190/* 190 /*
191 * the following code should be cool even if these sections 191 * the following code should be cool even if these sections
192 * are not page aligned. 192 * are not page aligned.
193 */ 193 */
194 addr = PAGE_ALIGN((unsigned long)(__init_begin)); 194 addr = PAGE_ALIGN((unsigned long)(__init_begin));
195 /* next to check that the page we free is not a partial page */ 195 /* next to check that the page we free is not a partial page */
196 for (; addr + PAGE_SIZE < (unsigned long)(__init_end); 196 for (; addr + PAGE_SIZE < (unsigned long)(__init_end);
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-30 05:32:03 -0500