diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-11-18 04:48:22 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-11-18 04:48:22 -0500 |
commit | 57a55077dd0ed60030ead4a971b95cac0e8953c3 (patch) | |
tree | 2a9c7b44be42c86eb66a2fa0130991605f3a5981 /arch/blackfin | |
parent | abeb21efb10cd9e980f611c9bb408f172ed44465 (diff) |
Blackfin arch: update defconfig file for all boards
- do not bother generating deprecated /sys files by default now since
mdev does not need it
- Don't built-in char sport driver and build it as a module in defconfig
- disable CONFIG_DEVKMEM by default
- enable spi flash driver on boards that have one
- switch config to the NAND platfrom driver rather than the bfin async one
- do not make BFIN_DMA_5XX optional since a large portion of our code relies
on dma functions existing
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin')
21 files changed, 38 insertions, 47 deletions
diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig index f4c4fd7d0e7b..123281b9d38d 100644 --- a/arch/blackfin/configs/BF518F-EZBRD_defconfig +++ b/arch/blackfin/configs/BF518F-EZBRD_defconfig | |||
@@ -313,7 +313,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
313 | CONFIG_ZONE_DMA_FLAG=1 | 313 | CONFIG_ZONE_DMA_FLAG=1 |
314 | CONFIG_VIRT_TO_BUS=y | 314 | CONFIG_VIRT_TO_BUS=y |
315 | CONFIG_BFIN_GPTIMERS=y | 315 | CONFIG_BFIN_GPTIMERS=y |
316 | CONFIG_BFIN_DMA_5XX=y | ||
317 | # CONFIG_DMA_UNCACHED_4M is not set | 316 | # CONFIG_DMA_UNCACHED_4M is not set |
318 | # CONFIG_DMA_UNCACHED_2M is not set | 317 | # CONFIG_DMA_UNCACHED_2M is not set |
319 | CONFIG_DMA_UNCACHED_1M=y | 318 | CONFIG_DMA_UNCACHED_1M=y |
diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig index 4443a47e516f..48a6c35203d9 100644 --- a/arch/blackfin/configs/BF526-EZBRD_defconfig +++ b/arch/blackfin/configs/BF526-EZBRD_defconfig | |||
@@ -37,8 +37,8 @@ CONFIG_IKCONFIG_PROC=y | |||
37 | CONFIG_LOG_BUF_SHIFT=14 | 37 | CONFIG_LOG_BUF_SHIFT=14 |
38 | # CONFIG_CGROUPS is not set | 38 | # CONFIG_CGROUPS is not set |
39 | # CONFIG_GROUP_SCHED is not set | 39 | # CONFIG_GROUP_SCHED is not set |
40 | CONFIG_SYSFS_DEPRECATED=y | 40 | # CONFIG_SYSFS_DEPRECATED is not set |
41 | CONFIG_SYSFS_DEPRECATED_V2=y | 41 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
42 | # CONFIG_RELAY is not set | 42 | # CONFIG_RELAY is not set |
43 | # CONFIG_NAMESPACES is not set | 43 | # CONFIG_NAMESPACES is not set |
44 | CONFIG_BLK_DEV_INITRD=y | 44 | CONFIG_BLK_DEV_INITRD=y |
@@ -312,7 +312,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
312 | CONFIG_ZONE_DMA_FLAG=1 | 312 | CONFIG_ZONE_DMA_FLAG=1 |
313 | CONFIG_VIRT_TO_BUS=y | 313 | CONFIG_VIRT_TO_BUS=y |
314 | CONFIG_BFIN_GPTIMERS=y | 314 | CONFIG_BFIN_GPTIMERS=y |
315 | CONFIG_BFIN_DMA_5XX=y | ||
316 | # CONFIG_DMA_UNCACHED_4M is not set | 315 | # CONFIG_DMA_UNCACHED_4M is not set |
317 | # CONFIG_DMA_UNCACHED_2M is not set | 316 | # CONFIG_DMA_UNCACHED_2M is not set |
318 | CONFIG_DMA_UNCACHED_1M=y | 317 | CONFIG_DMA_UNCACHED_1M=y |
@@ -534,7 +533,8 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y | |||
534 | # Self-contained MTD device drivers | 533 | # Self-contained MTD device drivers |
535 | # | 534 | # |
536 | # CONFIG_MTD_DATAFLASH is not set | 535 | # CONFIG_MTD_DATAFLASH is not set |
537 | # CONFIG_MTD_M25P80 is not set | 536 | CONFIG_MTD_M25P80=y |
537 | CONFIG_M25PXX_USE_FAST_READ=y | ||
538 | # CONFIG_MTD_SLRAM is not set | 538 | # CONFIG_MTD_SLRAM is not set |
539 | # CONFIG_MTD_PHRAM is not set | 539 | # CONFIG_MTD_PHRAM is not set |
540 | # CONFIG_MTD_MTDRAM is not set | 540 | # CONFIG_MTD_MTDRAM is not set |
@@ -717,7 +717,7 @@ CONFIG_VT=y | |||
717 | CONFIG_VT_CONSOLE=y | 717 | CONFIG_VT_CONSOLE=y |
718 | CONFIG_HW_CONSOLE=y | 718 | CONFIG_HW_CONSOLE=y |
719 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 719 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
720 | CONFIG_DEVKMEM=y | 720 | # CONFIG_DEVKMEM is not set |
721 | # CONFIG_SERIAL_NONSTANDARD is not set | 721 | # CONFIG_SERIAL_NONSTANDARD is not set |
722 | 722 | ||
723 | # | 723 | # |
diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig index 4a2a660a6b35..060bac21b79b 100644 --- a/arch/blackfin/configs/BF527-EZKIT_defconfig +++ b/arch/blackfin/configs/BF527-EZKIT_defconfig | |||
@@ -41,7 +41,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
41 | CONFIG_FAIR_GROUP_SCHED=y | 41 | CONFIG_FAIR_GROUP_SCHED=y |
42 | CONFIG_FAIR_USER_SCHED=y | 42 | CONFIG_FAIR_USER_SCHED=y |
43 | # CONFIG_FAIR_CGROUP_SCHED is not set | 43 | # CONFIG_FAIR_CGROUP_SCHED is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | 44 | # CONFIG_SYSFS_DEPRECATED is not set |
45 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
46 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
47 | CONFIG_INITRAMFS_SOURCE="" | 47 | CONFIG_INITRAMFS_SOURCE="" |
@@ -290,7 +290,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
290 | CONFIG_ZONE_DMA_FLAG=1 | 290 | CONFIG_ZONE_DMA_FLAG=1 |
291 | CONFIG_VIRT_TO_BUS=y | 291 | CONFIG_VIRT_TO_BUS=y |
292 | CONFIG_BFIN_GPTIMERS=y | 292 | CONFIG_BFIN_GPTIMERS=y |
293 | CONFIG_BFIN_DMA_5XX=y | ||
294 | # CONFIG_DMA_UNCACHED_4M is not set | 293 | # CONFIG_DMA_UNCACHED_4M is not set |
295 | # CONFIG_DMA_UNCACHED_2M is not set | 294 | # CONFIG_DMA_UNCACHED_2M is not set |
296 | CONFIG_DMA_UNCACHED_1M=y | 295 | CONFIG_DMA_UNCACHED_1M=y |
@@ -563,7 +562,8 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y | |||
563 | # Self-contained MTD device drivers | 562 | # Self-contained MTD device drivers |
564 | # | 563 | # |
565 | # CONFIG_MTD_DATAFLASH is not set | 564 | # CONFIG_MTD_DATAFLASH is not set |
566 | # CONFIG_MTD_M25P80 is not set | 565 | CONFIG_MTD_M25P80=y |
566 | CONFIG_M25PXX_USE_FAST_READ=y | ||
567 | # CONFIG_MTD_SLRAM is not set | 567 | # CONFIG_MTD_SLRAM is not set |
568 | # CONFIG_MTD_PHRAM is not set | 568 | # CONFIG_MTD_PHRAM is not set |
569 | # CONFIG_MTD_MTDRAM is not set | 569 | # CONFIG_MTD_MTDRAM is not set |
@@ -744,6 +744,7 @@ CONFIG_VT=y | |||
744 | CONFIG_VT_CONSOLE=y | 744 | CONFIG_VT_CONSOLE=y |
745 | CONFIG_HW_CONSOLE=y | 745 | CONFIG_HW_CONSOLE=y |
746 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 746 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
747 | # CONFIG_DEVKMEM is not set | ||
747 | # CONFIG_SERIAL_NONSTANDARD is not set | 748 | # CONFIG_SERIAL_NONSTANDARD is not set |
748 | 749 | ||
749 | # | 750 | # |
diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig index deeb5e45effb..10a201d56c0a 100644 --- a/arch/blackfin/configs/BF533-EZKIT_defconfig +++ b/arch/blackfin/configs/BF533-EZKIT_defconfig | |||
@@ -41,7 +41,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
41 | CONFIG_FAIR_GROUP_SCHED=y | 41 | CONFIG_FAIR_GROUP_SCHED=y |
42 | CONFIG_FAIR_USER_SCHED=y | 42 | CONFIG_FAIR_USER_SCHED=y |
43 | # CONFIG_FAIR_CGROUP_SCHED is not set | 43 | # CONFIG_FAIR_CGROUP_SCHED is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | 44 | # CONFIG_SYSFS_DEPRECATED is not set |
45 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
46 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
47 | CONFIG_INITRAMFS_SOURCE="" | 47 | CONFIG_INITRAMFS_SOURCE="" |
@@ -253,7 +253,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
253 | CONFIG_ZONE_DMA_FLAG=1 | 253 | CONFIG_ZONE_DMA_FLAG=1 |
254 | CONFIG_VIRT_TO_BUS=y | 254 | CONFIG_VIRT_TO_BUS=y |
255 | # CONFIG_BFIN_GPTIMERS is not set | 255 | # CONFIG_BFIN_GPTIMERS is not set |
256 | CONFIG_BFIN_DMA_5XX=y | ||
257 | # CONFIG_DMA_UNCACHED_4M is not set | 256 | # CONFIG_DMA_UNCACHED_4M is not set |
258 | # CONFIG_DMA_UNCACHED_2M is not set | 257 | # CONFIG_DMA_UNCACHED_2M is not set |
259 | CONFIG_DMA_UNCACHED_1M=y | 258 | CONFIG_DMA_UNCACHED_1M=y |
@@ -647,6 +646,7 @@ CONFIG_BFIN_SPORT=y | |||
647 | # CONFIG_BFIN_TIMER_LATENCY is not set | 646 | # CONFIG_BFIN_TIMER_LATENCY is not set |
648 | CONFIG_SIMPLE_GPIO=m | 647 | CONFIG_SIMPLE_GPIO=m |
649 | # CONFIG_VT is not set | 648 | # CONFIG_VT is not set |
649 | # CONFIG_DEVKMEM is not set | ||
650 | # CONFIG_SERIAL_NONSTANDARD is not set | 650 | # CONFIG_SERIAL_NONSTANDARD is not set |
651 | 651 | ||
652 | # | 652 | # |
diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig index c23267ed880b..5523b39e4f3f 100644 --- a/arch/blackfin/configs/BF533-STAMP_defconfig +++ b/arch/blackfin/configs/BF533-STAMP_defconfig | |||
@@ -41,7 +41,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
41 | CONFIG_FAIR_GROUP_SCHED=y | 41 | CONFIG_FAIR_GROUP_SCHED=y |
42 | CONFIG_FAIR_USER_SCHED=y | 42 | CONFIG_FAIR_USER_SCHED=y |
43 | # CONFIG_FAIR_CGROUP_SCHED is not set | 43 | # CONFIG_FAIR_CGROUP_SCHED is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | 44 | # CONFIG_SYSFS_DEPRECATED is not set |
45 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
46 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
47 | CONFIG_INITRAMFS_SOURCE="" | 47 | CONFIG_INITRAMFS_SOURCE="" |
@@ -253,7 +253,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
253 | CONFIG_ZONE_DMA_FLAG=1 | 253 | CONFIG_ZONE_DMA_FLAG=1 |
254 | CONFIG_VIRT_TO_BUS=y | 254 | CONFIG_VIRT_TO_BUS=y |
255 | # CONFIG_BFIN_GPTIMERS is not set | 255 | # CONFIG_BFIN_GPTIMERS is not set |
256 | CONFIG_BFIN_DMA_5XX=y | ||
257 | # CONFIG_DMA_UNCACHED_4M is not set | 256 | # CONFIG_DMA_UNCACHED_4M is not set |
258 | # CONFIG_DMA_UNCACHED_2M is not set | 257 | # CONFIG_DMA_UNCACHED_2M is not set |
259 | CONFIG_DMA_UNCACHED_1M=y | 258 | CONFIG_DMA_UNCACHED_1M=y |
@@ -654,6 +653,7 @@ CONFIG_BFIN_SPORT=y | |||
654 | CONFIG_TWI_LCD=m | 653 | CONFIG_TWI_LCD=m |
655 | CONFIG_SIMPLE_GPIO=m | 654 | CONFIG_SIMPLE_GPIO=m |
656 | # CONFIG_VT is not set | 655 | # CONFIG_VT is not set |
656 | # CONFIG_DEVKMEM is not set | ||
657 | # CONFIG_SERIAL_NONSTANDARD is not set | 657 | # CONFIG_SERIAL_NONSTANDARD is not set |
658 | 658 | ||
659 | # | 659 | # |
diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig index 63a0f854745c..a56cf3307428 100644 --- a/arch/blackfin/configs/BF537-STAMP_defconfig +++ b/arch/blackfin/configs/BF537-STAMP_defconfig | |||
@@ -41,7 +41,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
41 | CONFIG_FAIR_GROUP_SCHED=y | 41 | CONFIG_FAIR_GROUP_SCHED=y |
42 | CONFIG_FAIR_USER_SCHED=y | 42 | CONFIG_FAIR_USER_SCHED=y |
43 | # CONFIG_FAIR_CGROUP_SCHED is not set | 43 | # CONFIG_FAIR_CGROUP_SCHED is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | 44 | # CONFIG_SYSFS_DEPRECATED is not set |
45 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
46 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
47 | CONFIG_INITRAMFS_SOURCE="" | 47 | CONFIG_INITRAMFS_SOURCE="" |
@@ -260,7 +260,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
260 | CONFIG_ZONE_DMA_FLAG=1 | 260 | CONFIG_ZONE_DMA_FLAG=1 |
261 | CONFIG_VIRT_TO_BUS=y | 261 | CONFIG_VIRT_TO_BUS=y |
262 | # CONFIG_BFIN_GPTIMERS is not set | 262 | # CONFIG_BFIN_GPTIMERS is not set |
263 | CONFIG_BFIN_DMA_5XX=y | ||
264 | # CONFIG_DMA_UNCACHED_4M is not set | 263 | # CONFIG_DMA_UNCACHED_4M is not set |
265 | # CONFIG_DMA_UNCACHED_2M is not set | 264 | # CONFIG_DMA_UNCACHED_2M is not set |
266 | CONFIG_DMA_UNCACHED_1M=y | 265 | CONFIG_DMA_UNCACHED_1M=y |
@@ -553,15 +552,11 @@ CONFIG_MTD_NAND=m | |||
553 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set | 552 | # CONFIG_MTD_NAND_VERIFY_WRITE is not set |
554 | # CONFIG_MTD_NAND_ECC_SMC is not set | 553 | # CONFIG_MTD_NAND_ECC_SMC is not set |
555 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set | 554 | # CONFIG_MTD_NAND_MUSEUM_IDS is not set |
556 | CONFIG_MTD_NAND_BFIN=m | 555 | # CONFIG_MTD_NAND_BFIN is not set |
557 | CONFIG_BFIN_NAND_BASE=0x20212000 | ||
558 | CONFIG_BFIN_NAND_CLE=2 | ||
559 | CONFIG_BFIN_NAND_ALE=1 | ||
560 | CONFIG_BFIN_NAND_READY=3 | ||
561 | CONFIG_MTD_NAND_IDS=m | 556 | CONFIG_MTD_NAND_IDS=m |
562 | # CONFIG_MTD_NAND_DISKONCHIP is not set | 557 | # CONFIG_MTD_NAND_DISKONCHIP is not set |
563 | # CONFIG_MTD_NAND_NANDSIM is not set | 558 | # CONFIG_MTD_NAND_NANDSIM is not set |
564 | # CONFIG_MTD_NAND_PLATFORM is not set | 559 | CONFIG_MTD_NAND_PLATFORM=m |
565 | # CONFIG_MTD_ONENAND is not set | 560 | # CONFIG_MTD_ONENAND is not set |
566 | 561 | ||
567 | # | 562 | # |
@@ -691,11 +686,12 @@ CONFIG_TWI_KEYPAD=m | |||
691 | # CONFIG_BF5xx_PPIFCD is not set | 686 | # CONFIG_BF5xx_PPIFCD is not set |
692 | # CONFIG_BFIN_SIMPLE_TIMER is not set | 687 | # CONFIG_BFIN_SIMPLE_TIMER is not set |
693 | # CONFIG_BF5xx_PPI is not set | 688 | # CONFIG_BF5xx_PPI is not set |
694 | CONFIG_BFIN_SPORT=y | 689 | CONFIG_BFIN_SPORT=m |
695 | # CONFIG_BFIN_TIMER_LATENCY is not set | 690 | # CONFIG_BFIN_TIMER_LATENCY is not set |
696 | CONFIG_TWI_LCD=m | 691 | CONFIG_TWI_LCD=m |
697 | CONFIG_SIMPLE_GPIO=m | 692 | CONFIG_SIMPLE_GPIO=m |
698 | # CONFIG_VT is not set | 693 | # CONFIG_VT is not set |
694 | # CONFIG_DEVKMEM is not set | ||
699 | # CONFIG_SERIAL_NONSTANDARD is not set | 695 | # CONFIG_SERIAL_NONSTANDARD is not set |
700 | 696 | ||
701 | # | 697 | # |
diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig index b780777ae740..66639887506a 100644 --- a/arch/blackfin/configs/BF538-EZKIT_defconfig +++ b/arch/blackfin/configs/BF538-EZKIT_defconfig | |||
@@ -294,7 +294,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
294 | CONFIG_ZONE_DMA_FLAG=1 | 294 | CONFIG_ZONE_DMA_FLAG=1 |
295 | CONFIG_VIRT_TO_BUS=y | 295 | CONFIG_VIRT_TO_BUS=y |
296 | CONFIG_BFIN_GPTIMERS=y | 296 | CONFIG_BFIN_GPTIMERS=y |
297 | CONFIG_BFIN_DMA_5XX=y | ||
298 | # CONFIG_DMA_UNCACHED_4M is not set | 297 | # CONFIG_DMA_UNCACHED_4M is not set |
299 | # CONFIG_DMA_UNCACHED_2M is not set | 298 | # CONFIG_DMA_UNCACHED_2M is not set |
300 | CONFIG_DMA_UNCACHED_1M=y | 299 | CONFIG_DMA_UNCACHED_1M=y |
diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig index bf63660815b9..3e75ac663013 100644 --- a/arch/blackfin/configs/BF548-EZKIT_defconfig +++ b/arch/blackfin/configs/BF548-EZKIT_defconfig | |||
@@ -41,7 +41,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
41 | CONFIG_FAIR_GROUP_SCHED=y | 41 | CONFIG_FAIR_GROUP_SCHED=y |
42 | CONFIG_FAIR_USER_SCHED=y | 42 | CONFIG_FAIR_USER_SCHED=y |
43 | # CONFIG_FAIR_CGROUP_SCHED is not set | 43 | # CONFIG_FAIR_CGROUP_SCHED is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | 44 | # CONFIG_SYSFS_DEPRECATED is not set |
45 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
46 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
47 | CONFIG_INITRAMFS_SOURCE="" | 47 | CONFIG_INITRAMFS_SOURCE="" |
@@ -326,7 +326,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
326 | CONFIG_ZONE_DMA_FLAG=1 | 326 | CONFIG_ZONE_DMA_FLAG=1 |
327 | CONFIG_VIRT_TO_BUS=y | 327 | CONFIG_VIRT_TO_BUS=y |
328 | # CONFIG_BFIN_GPTIMERS is not set | 328 | # CONFIG_BFIN_GPTIMERS is not set |
329 | CONFIG_BFIN_DMA_5XX=y | ||
330 | # CONFIG_DMA_UNCACHED_4M is not set | 329 | # CONFIG_DMA_UNCACHED_4M is not set |
331 | CONFIG_DMA_UNCACHED_2M=y | 330 | CONFIG_DMA_UNCACHED_2M=y |
332 | # CONFIG_DMA_UNCACHED_1M is not set | 331 | # CONFIG_DMA_UNCACHED_1M is not set |
@@ -608,7 +607,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
608 | # Self-contained MTD device drivers | 607 | # Self-contained MTD device drivers |
609 | # | 608 | # |
610 | # CONFIG_MTD_DATAFLASH is not set | 609 | # CONFIG_MTD_DATAFLASH is not set |
611 | # CONFIG_MTD_M25P80 is not set | 610 | CONFIG_MTD_M25P80=y |
611 | CONFIG_M25PXX_USE_FAST_READ=y | ||
612 | # CONFIG_MTD_SLRAM is not set | 612 | # CONFIG_MTD_SLRAM is not set |
613 | # CONFIG_MTD_PHRAM is not set | 613 | # CONFIG_MTD_PHRAM is not set |
614 | # CONFIG_MTD_MTDRAM is not set | 614 | # CONFIG_MTD_MTDRAM is not set |
@@ -825,6 +825,7 @@ CONFIG_VT=y | |||
825 | CONFIG_VT_CONSOLE=y | 825 | CONFIG_VT_CONSOLE=y |
826 | CONFIG_HW_CONSOLE=y | 826 | CONFIG_HW_CONSOLE=y |
827 | # CONFIG_VT_HW_CONSOLE_BINDING is not set | 827 | # CONFIG_VT_HW_CONSOLE_BINDING is not set |
828 | # CONFIG_DEVKMEM is not set | ||
828 | # CONFIG_SERIAL_NONSTANDARD is not set | 829 | # CONFIG_SERIAL_NONSTANDARD is not set |
829 | 830 | ||
830 | # | 831 | # |
diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig index 3c70d6230a12..0c473b801915 100644 --- a/arch/blackfin/configs/BF561-EZKIT_defconfig +++ b/arch/blackfin/configs/BF561-EZKIT_defconfig | |||
@@ -41,7 +41,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
41 | CONFIG_FAIR_GROUP_SCHED=y | 41 | CONFIG_FAIR_GROUP_SCHED=y |
42 | CONFIG_FAIR_USER_SCHED=y | 42 | CONFIG_FAIR_USER_SCHED=y |
43 | # CONFIG_FAIR_CGROUP_SCHED is not set | 43 | # CONFIG_FAIR_CGROUP_SCHED is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | 44 | # CONFIG_SYSFS_DEPRECATED is not set |
45 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
46 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
47 | CONFIG_INITRAMFS_SOURCE="" | 47 | CONFIG_INITRAMFS_SOURCE="" |
@@ -296,7 +296,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
296 | CONFIG_ZONE_DMA_FLAG=1 | 296 | CONFIG_ZONE_DMA_FLAG=1 |
297 | CONFIG_VIRT_TO_BUS=y | 297 | CONFIG_VIRT_TO_BUS=y |
298 | # CONFIG_BFIN_GPTIMERS is not set | 298 | # CONFIG_BFIN_GPTIMERS is not set |
299 | CONFIG_BFIN_DMA_5XX=y | ||
300 | # CONFIG_DMA_UNCACHED_4M is not set | 299 | # CONFIG_DMA_UNCACHED_4M is not set |
301 | # CONFIG_DMA_UNCACHED_2M is not set | 300 | # CONFIG_DMA_UNCACHED_2M is not set |
302 | CONFIG_DMA_UNCACHED_1M=y | 301 | CONFIG_DMA_UNCACHED_1M=y |
@@ -692,6 +691,7 @@ CONFIG_INPUT_EVDEV=m | |||
692 | # CONFIG_BFIN_TIMER_LATENCY is not set | 691 | # CONFIG_BFIN_TIMER_LATENCY is not set |
693 | CONFIG_SIMPLE_GPIO=m | 692 | CONFIG_SIMPLE_GPIO=m |
694 | # CONFIG_VT is not set | 693 | # CONFIG_VT is not set |
694 | # CONFIG_DEVKMEM is not set | ||
695 | # CONFIG_SERIAL_NONSTANDARD is not set | 695 | # CONFIG_SERIAL_NONSTANDARD is not set |
696 | 696 | ||
697 | # | 697 | # |
diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig index 2921f9952d5f..e5d987f55591 100644 --- a/arch/blackfin/configs/BlackStamp_defconfig +++ b/arch/blackfin/configs/BlackStamp_defconfig | |||
@@ -276,7 +276,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
276 | CONFIG_ZONE_DMA_FLAG=1 | 276 | CONFIG_ZONE_DMA_FLAG=1 |
277 | CONFIG_VIRT_TO_BUS=y | 277 | CONFIG_VIRT_TO_BUS=y |
278 | CONFIG_BFIN_GPTIMERS=y | 278 | CONFIG_BFIN_GPTIMERS=y |
279 | CONFIG_BFIN_DMA_5XX=y | ||
280 | # CONFIG_DMA_UNCACHED_4M is not set | 279 | # CONFIG_DMA_UNCACHED_4M is not set |
281 | # CONFIG_DMA_UNCACHED_2M is not set | 280 | # CONFIG_DMA_UNCACHED_2M is not set |
282 | CONFIG_DMA_UNCACHED_1M=y | 281 | CONFIG_DMA_UNCACHED_1M=y |
diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig index b6a14635fb91..4f713f0ee2a5 100644 --- a/arch/blackfin/configs/CM-BF527_defconfig +++ b/arch/blackfin/configs/CM-BF527_defconfig | |||
@@ -42,7 +42,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
42 | CONFIG_FAIR_GROUP_SCHED=y | 42 | CONFIG_FAIR_GROUP_SCHED=y |
43 | CONFIG_FAIR_USER_SCHED=y | 43 | CONFIG_FAIR_USER_SCHED=y |
44 | # CONFIG_FAIR_CGROUP_SCHED is not set | 44 | # CONFIG_FAIR_CGROUP_SCHED is not set |
45 | CONFIG_SYSFS_DEPRECATED=y | 45 | # CONFIG_SYSFS_DEPRECATED is not set |
46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
47 | CONFIG_BLK_DEV_INITRD=y | 47 | CONFIG_BLK_DEV_INITRD=y |
48 | CONFIG_INITRAMFS_SOURCE="" | 48 | CONFIG_INITRAMFS_SOURCE="" |
@@ -292,7 +292,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
292 | CONFIG_ZONE_DMA_FLAG=1 | 292 | CONFIG_ZONE_DMA_FLAG=1 |
293 | CONFIG_VIRT_TO_BUS=y | 293 | CONFIG_VIRT_TO_BUS=y |
294 | CONFIG_BFIN_GPTIMERS=y | 294 | CONFIG_BFIN_GPTIMERS=y |
295 | CONFIG_BFIN_DMA_5XX=y | ||
296 | # CONFIG_DMA_UNCACHED_4M is not set | 295 | # CONFIG_DMA_UNCACHED_4M is not set |
297 | # CONFIG_DMA_UNCACHED_2M is not set | 296 | # CONFIG_DMA_UNCACHED_2M is not set |
298 | CONFIG_DMA_UNCACHED_1M=y | 297 | CONFIG_DMA_UNCACHED_1M=y |
@@ -650,6 +649,7 @@ CONFIG_BFIN_OTP=y | |||
650 | # CONFIG_TWI_LCD is not set | 649 | # CONFIG_TWI_LCD is not set |
651 | CONFIG_SIMPLE_GPIO=m | 650 | CONFIG_SIMPLE_GPIO=m |
652 | # CONFIG_VT is not set | 651 | # CONFIG_VT is not set |
652 | # CONFIG_DEVKMEM is not set | ||
653 | # CONFIG_SERIAL_NONSTANDARD is not set | 653 | # CONFIG_SERIAL_NONSTANDARD is not set |
654 | 654 | ||
655 | # | 655 | # |
diff --git a/arch/blackfin/configs/CM-BF533_defconfig b/arch/blackfin/configs/CM-BF533_defconfig index c3ba9066b935..df0a966cd417 100644 --- a/arch/blackfin/configs/CM-BF533_defconfig +++ b/arch/blackfin/configs/CM-BF533_defconfig | |||
@@ -42,7 +42,7 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
42 | CONFIG_IKCONFIG=y | 42 | CONFIG_IKCONFIG=y |
43 | CONFIG_IKCONFIG_PROC=y | 43 | CONFIG_IKCONFIG_PROC=y |
44 | CONFIG_LOG_BUF_SHIFT=14 | 44 | CONFIG_LOG_BUF_SHIFT=14 |
45 | CONFIG_SYSFS_DEPRECATED=y | 45 | # CONFIG_SYSFS_DEPRECATED is not set |
46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
47 | # CONFIG_BLK_DEV_INITRD is not set | 47 | # CONFIG_BLK_DEV_INITRD is not set |
48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -254,7 +254,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
254 | CONFIG_ZONE_DMA_FLAG=1 | 254 | CONFIG_ZONE_DMA_FLAG=1 |
255 | CONFIG_LARGE_ALLOCS=y | 255 | CONFIG_LARGE_ALLOCS=y |
256 | # CONFIG_BFIN_GPTIMERS is not set | 256 | # CONFIG_BFIN_GPTIMERS is not set |
257 | CONFIG_BFIN_DMA_5XX=y | ||
258 | # CONFIG_DMA_UNCACHED_2M is not set | 257 | # CONFIG_DMA_UNCACHED_2M is not set |
259 | CONFIG_DMA_UNCACHED_1M=y | 258 | CONFIG_DMA_UNCACHED_1M=y |
260 | # CONFIG_DMA_UNCACHED_NONE is not set | 259 | # CONFIG_DMA_UNCACHED_NONE is not set |
@@ -598,6 +597,7 @@ CONFIG_NETDEV_10000=y | |||
598 | CONFIG_BFIN_SPORT=y | 597 | CONFIG_BFIN_SPORT=y |
599 | # CONFIG_BFIN_TIMER_LATENCY is not set | 598 | # CONFIG_BFIN_TIMER_LATENCY is not set |
600 | # CONFIG_VT is not set | 599 | # CONFIG_VT is not set |
600 | # CONFIG_DEVKMEM is not set | ||
601 | # CONFIG_SERIAL_NONSTANDARD is not set | 601 | # CONFIG_SERIAL_NONSTANDARD is not set |
602 | 602 | ||
603 | # | 603 | # |
diff --git a/arch/blackfin/configs/CM-BF537E_defconfig b/arch/blackfin/configs/CM-BF537E_defconfig index cdc6b7feb59e..1b50d382f6e9 100644 --- a/arch/blackfin/configs/CM-BF537E_defconfig +++ b/arch/blackfin/configs/CM-BF537E_defconfig | |||
@@ -42,7 +42,7 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
42 | CONFIG_IKCONFIG=y | 42 | CONFIG_IKCONFIG=y |
43 | CONFIG_IKCONFIG_PROC=y | 43 | CONFIG_IKCONFIG_PROC=y |
44 | CONFIG_LOG_BUF_SHIFT=14 | 44 | CONFIG_LOG_BUF_SHIFT=14 |
45 | CONFIG_SYSFS_DEPRECATED=y | 45 | # CONFIG_SYSFS_DEPRECATED is not set |
46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
47 | # CONFIG_BLK_DEV_INITRD is not set | 47 | # CONFIG_BLK_DEV_INITRD is not set |
48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -262,7 +262,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
262 | CONFIG_ZONE_DMA_FLAG=1 | 262 | CONFIG_ZONE_DMA_FLAG=1 |
263 | CONFIG_LARGE_ALLOCS=y | 263 | CONFIG_LARGE_ALLOCS=y |
264 | # CONFIG_BFIN_GPTIMERS is not set | 264 | # CONFIG_BFIN_GPTIMERS is not set |
265 | CONFIG_BFIN_DMA_5XX=y | ||
266 | # CONFIG_DMA_UNCACHED_2M is not set | 265 | # CONFIG_DMA_UNCACHED_2M is not set |
267 | CONFIG_DMA_UNCACHED_1M=y | 266 | CONFIG_DMA_UNCACHED_1M=y |
268 | # CONFIG_DMA_UNCACHED_NONE is not set | 267 | # CONFIG_DMA_UNCACHED_NONE is not set |
@@ -627,6 +626,7 @@ CONFIG_NETDEV_10000=y | |||
627 | CONFIG_BFIN_SPORT=y | 626 | CONFIG_BFIN_SPORT=y |
628 | # CONFIG_BFIN_TIMER_LATENCY is not set | 627 | # CONFIG_BFIN_TIMER_LATENCY is not set |
629 | # CONFIG_VT is not set | 628 | # CONFIG_VT is not set |
629 | # CONFIG_DEVKMEM is not set | ||
630 | # CONFIG_SERIAL_NONSTANDARD is not set | 630 | # CONFIG_SERIAL_NONSTANDARD is not set |
631 | 631 | ||
632 | # | 632 | # |
diff --git a/arch/blackfin/configs/CM-BF537U_defconfig b/arch/blackfin/configs/CM-BF537U_defconfig index f074bdcd1ce5..2ca768d15b56 100644 --- a/arch/blackfin/configs/CM-BF537U_defconfig +++ b/arch/blackfin/configs/CM-BF537U_defconfig | |||
@@ -42,7 +42,7 @@ CONFIG_SYSVIPC_SYSCTL=y | |||
42 | CONFIG_IKCONFIG=y | 42 | CONFIG_IKCONFIG=y |
43 | CONFIG_IKCONFIG_PROC=y | 43 | CONFIG_IKCONFIG_PROC=y |
44 | CONFIG_LOG_BUF_SHIFT=14 | 44 | CONFIG_LOG_BUF_SHIFT=14 |
45 | CONFIG_SYSFS_DEPRECATED=y | 45 | # CONFIG_SYSFS_DEPRECATED is not set |
46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
47 | # CONFIG_BLK_DEV_INITRD is not set | 47 | # CONFIG_BLK_DEV_INITRD is not set |
48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -262,7 +262,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
262 | CONFIG_ZONE_DMA_FLAG=1 | 262 | CONFIG_ZONE_DMA_FLAG=1 |
263 | CONFIG_LARGE_ALLOCS=y | 263 | CONFIG_LARGE_ALLOCS=y |
264 | # CONFIG_BFIN_GPTIMERS is not set | 264 | # CONFIG_BFIN_GPTIMERS is not set |
265 | CONFIG_BFIN_DMA_5XX=y | ||
266 | # CONFIG_DMA_UNCACHED_2M is not set | 265 | # CONFIG_DMA_UNCACHED_2M is not set |
267 | CONFIG_DMA_UNCACHED_1M=y | 266 | CONFIG_DMA_UNCACHED_1M=y |
268 | # CONFIG_DMA_UNCACHED_NONE is not set | 267 | # CONFIG_DMA_UNCACHED_NONE is not set |
@@ -607,6 +606,7 @@ CONFIG_NETDEV_10000=y | |||
607 | CONFIG_BFIN_SPORT=y | 606 | CONFIG_BFIN_SPORT=y |
608 | # CONFIG_BFIN_TIMER_LATENCY is not set | 607 | # CONFIG_BFIN_TIMER_LATENCY is not set |
609 | # CONFIG_VT is not set | 608 | # CONFIG_VT is not set |
609 | # CONFIG_DEVKMEM is not set | ||
610 | # CONFIG_SERIAL_NONSTANDARD is not set | 610 | # CONFIG_SERIAL_NONSTANDARD is not set |
611 | 611 | ||
612 | # | 612 | # |
diff --git a/arch/blackfin/configs/CM-BF548_defconfig b/arch/blackfin/configs/CM-BF548_defconfig index 5c44fdb8e6e3..a0d32a1afc1f 100644 --- a/arch/blackfin/configs/CM-BF548_defconfig +++ b/arch/blackfin/configs/CM-BF548_defconfig | |||
@@ -41,7 +41,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
41 | CONFIG_FAIR_GROUP_SCHED=y | 41 | CONFIG_FAIR_GROUP_SCHED=y |
42 | CONFIG_FAIR_USER_SCHED=y | 42 | CONFIG_FAIR_USER_SCHED=y |
43 | # CONFIG_FAIR_CGROUP_SCHED is not set | 43 | # CONFIG_FAIR_CGROUP_SCHED is not set |
44 | CONFIG_SYSFS_DEPRECATED=y | 44 | # CONFIG_SYSFS_DEPRECATED is not set |
45 | # CONFIG_RELAY is not set | 45 | # CONFIG_RELAY is not set |
46 | CONFIG_BLK_DEV_INITRD=y | 46 | CONFIG_BLK_DEV_INITRD=y |
47 | CONFIG_INITRAMFS_SOURCE="" | 47 | CONFIG_INITRAMFS_SOURCE="" |
@@ -325,7 +325,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
325 | CONFIG_ZONE_DMA_FLAG=1 | 325 | CONFIG_ZONE_DMA_FLAG=1 |
326 | CONFIG_VIRT_TO_BUS=y | 326 | CONFIG_VIRT_TO_BUS=y |
327 | # CONFIG_BFIN_GPTIMERS is not set | 327 | # CONFIG_BFIN_GPTIMERS is not set |
328 | CONFIG_BFIN_DMA_5XX=y | ||
329 | # CONFIG_DMA_UNCACHED_2M is not set | 328 | # CONFIG_DMA_UNCACHED_2M is not set |
330 | CONFIG_DMA_UNCACHED_1M=y | 329 | CONFIG_DMA_UNCACHED_1M=y |
331 | # CONFIG_DMA_UNCACHED_NONE is not set | 330 | # CONFIG_DMA_UNCACHED_NONE is not set |
@@ -732,6 +731,7 @@ CONFIG_BFIN_OTP=y | |||
732 | # CONFIG_TWI_LCD is not set | 731 | # CONFIG_TWI_LCD is not set |
733 | # CONFIG_SIMPLE_GPIO is not set | 732 | # CONFIG_SIMPLE_GPIO is not set |
734 | # CONFIG_VT is not set | 733 | # CONFIG_VT is not set |
734 | # CONFIG_DEVKMEM is not set | ||
735 | # CONFIG_SERIAL_NONSTANDARD is not set | 735 | # CONFIG_SERIAL_NONSTANDARD is not set |
736 | 736 | ||
737 | # | 737 | # |
diff --git a/arch/blackfin/configs/CM-BF561_defconfig b/arch/blackfin/configs/CM-BF561_defconfig index 086fe5dda495..46eeca8bf9f5 100644 --- a/arch/blackfin/configs/CM-BF561_defconfig +++ b/arch/blackfin/configs/CM-BF561_defconfig | |||
@@ -42,7 +42,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
42 | CONFIG_FAIR_GROUP_SCHED=y | 42 | CONFIG_FAIR_GROUP_SCHED=y |
43 | CONFIG_FAIR_USER_SCHED=y | 43 | CONFIG_FAIR_USER_SCHED=y |
44 | # CONFIG_FAIR_CGROUP_SCHED is not set | 44 | # CONFIG_FAIR_CGROUP_SCHED is not set |
45 | CONFIG_SYSFS_DEPRECATED=y | 45 | # CONFIG_SYSFS_DEPRECATED is not set |
46 | # CONFIG_RELAY is not set | 46 | # CONFIG_RELAY is not set |
47 | # CONFIG_BLK_DEV_INITRD is not set | 47 | # CONFIG_BLK_DEV_INITRD is not set |
48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 48 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -300,7 +300,6 @@ CONFIG_ZONE_DMA_FLAG=1 | |||
300 | CONFIG_VIRT_TO_BUS=y | 300 | CONFIG_VIRT_TO_BUS=y |
301 | CONFIG_LARGE_ALLOCS=y | 301 | CONFIG_LARGE_ALLOCS=y |
302 | # CONFIG_BFIN_GPTIMERS is not set | 302 | # CONFIG_BFIN_GPTIMERS is not set |
303 | CONFIG_BFIN_DMA_5XX=y | ||
304 | # CONFIG_DMA_UNCACHED_2M is not set | 303 | # CONFIG_DMA_UNCACHED_2M is not set |
305 | CONFIG_DMA_UNCACHED_1M=y | 304 | CONFIG_DMA_UNCACHED_1M=y |
306 | # CONFIG_DMA_UNCACHED_NONE is not set | 305 | # CONFIG_DMA_UNCACHED_NONE is not set |
@@ -612,6 +611,7 @@ CONFIG_NETDEV_10000=y | |||
612 | # CONFIG_BFIN_TIMER_LATENCY is not set | 611 | # CONFIG_BFIN_TIMER_LATENCY is not set |
613 | # CONFIG_SIMPLE_GPIO is not set | 612 | # CONFIG_SIMPLE_GPIO is not set |
614 | # CONFIG_VT is not set | 613 | # CONFIG_VT is not set |
614 | # CONFIG_DEVKMEM is not set | ||
615 | # CONFIG_SERIAL_NONSTANDARD is not set | 615 | # CONFIG_SERIAL_NONSTANDARD is not set |
616 | 616 | ||
617 | # | 617 | # |
diff --git a/arch/blackfin/configs/H8606_defconfig b/arch/blackfin/configs/H8606_defconfig index 1fc31f1b762b..4426c82a04f9 100644 --- a/arch/blackfin/configs/H8606_defconfig +++ b/arch/blackfin/configs/H8606_defconfig | |||
@@ -250,7 +250,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
250 | CONFIG_ZONE_DMA_FLAG=1 | 250 | CONFIG_ZONE_DMA_FLAG=1 |
251 | CONFIG_LARGE_ALLOCS=y | 251 | CONFIG_LARGE_ALLOCS=y |
252 | CONFIG_BFIN_GPTIMERS=y | 252 | CONFIG_BFIN_GPTIMERS=y |
253 | CONFIG_BFIN_DMA_5XX=y | ||
254 | # CONFIG_DMA_UNCACHED_2M is not set | 253 | # CONFIG_DMA_UNCACHED_2M is not set |
255 | CONFIG_DMA_UNCACHED_1M=y | 254 | CONFIG_DMA_UNCACHED_1M=y |
256 | # CONFIG_DMA_UNCACHED_NONE is not set | 255 | # CONFIG_DMA_UNCACHED_NONE is not set |
diff --git a/arch/blackfin/configs/IP0X_defconfig b/arch/blackfin/configs/IP0X_defconfig index 285d2241df26..ec9b1b90e413 100644 --- a/arch/blackfin/configs/IP0X_defconfig +++ b/arch/blackfin/configs/IP0X_defconfig | |||
@@ -262,7 +262,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
262 | CONFIG_ZONE_DMA_FLAG=1 | 262 | CONFIG_ZONE_DMA_FLAG=1 |
263 | CONFIG_LARGE_ALLOCS=y | 263 | CONFIG_LARGE_ALLOCS=y |
264 | # CONFIG_BFIN_GPTIMERS is not set | 264 | # CONFIG_BFIN_GPTIMERS is not set |
265 | CONFIG_BFIN_DMA_5XX=y | ||
266 | # CONFIG_DMA_UNCACHED_2M is not set | 265 | # CONFIG_DMA_UNCACHED_2M is not set |
267 | CONFIG_DMA_UNCACHED_1M=y | 266 | CONFIG_DMA_UNCACHED_1M=y |
268 | # CONFIG_DMA_UNCACHED_NONE is not set | 267 | # CONFIG_DMA_UNCACHED_NONE is not set |
diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig index bffca7de65d4..559deed13920 100644 --- a/arch/blackfin/configs/PNAV-10_defconfig +++ b/arch/blackfin/configs/PNAV-10_defconfig | |||
@@ -257,7 +257,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
257 | CONFIG_ZONE_DMA_FLAG=1 | 257 | CONFIG_ZONE_DMA_FLAG=1 |
258 | CONFIG_LARGE_ALLOCS=y | 258 | CONFIG_LARGE_ALLOCS=y |
259 | # CONFIG_BFIN_GPTIMERS is not set | 259 | # CONFIG_BFIN_GPTIMERS is not set |
260 | CONFIG_BFIN_DMA_5XX=y | ||
261 | # CONFIG_DMA_UNCACHED_2M is not set | 260 | # CONFIG_DMA_UNCACHED_2M is not set |
262 | CONFIG_DMA_UNCACHED_1M=y | 261 | CONFIG_DMA_UNCACHED_1M=y |
263 | # CONFIG_DMA_UNCACHED_NONE is not set | 262 | # CONFIG_DMA_UNCACHED_NONE is not set |
diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig index b1309f878fcd..9fa880e1ebff 100644 --- a/arch/blackfin/configs/SRV1_defconfig +++ b/arch/blackfin/configs/SRV1_defconfig | |||
@@ -271,7 +271,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
271 | # CONFIG_RESOURCES_64BIT is not set | 271 | # CONFIG_RESOURCES_64BIT is not set |
272 | CONFIG_ZONE_DMA_FLAG=1 | 272 | CONFIG_ZONE_DMA_FLAG=1 |
273 | CONFIG_LARGE_ALLOCS=y | 273 | CONFIG_LARGE_ALLOCS=y |
274 | CONFIG_BFIN_DMA_5XX=y | ||
275 | CONFIG_DMA_UNCACHED_2M=y | 274 | CONFIG_DMA_UNCACHED_2M=y |
276 | # CONFIG_DMA_UNCACHED_1M is not set | 275 | # CONFIG_DMA_UNCACHED_1M is not set |
277 | # CONFIG_DMA_UNCACHED_NONE is not set | 276 | # CONFIG_DMA_UNCACHED_NONE is not set |
diff --git a/arch/blackfin/configs/TCM-BF537_defconfig b/arch/blackfin/configs/TCM-BF537_defconfig index c482ee171f9e..6431192073c6 100644 --- a/arch/blackfin/configs/TCM-BF537_defconfig +++ b/arch/blackfin/configs/TCM-BF537_defconfig | |||
@@ -39,7 +39,7 @@ CONFIG_LOG_BUF_SHIFT=14 | |||
39 | CONFIG_FAIR_GROUP_SCHED=y | 39 | CONFIG_FAIR_GROUP_SCHED=y |
40 | CONFIG_FAIR_USER_SCHED=y | 40 | CONFIG_FAIR_USER_SCHED=y |
41 | # CONFIG_FAIR_CGROUP_SCHED is not set | 41 | # CONFIG_FAIR_CGROUP_SCHED is not set |
42 | CONFIG_SYSFS_DEPRECATED=y | 42 | # CONFIG_SYSFS_DEPRECATED is not set |
43 | # CONFIG_RELAY is not set | 43 | # CONFIG_RELAY is not set |
44 | # CONFIG_BLK_DEV_INITRD is not set | 44 | # CONFIG_BLK_DEV_INITRD is not set |
45 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 45 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
@@ -257,7 +257,6 @@ CONFIG_SPLIT_PTLOCK_CPUS=4 | |||
257 | CONFIG_ZONE_DMA_FLAG=1 | 257 | CONFIG_ZONE_DMA_FLAG=1 |
258 | CONFIG_VIRT_TO_BUS=y | 258 | CONFIG_VIRT_TO_BUS=y |
259 | # CONFIG_BFIN_GPTIMERS is not set | 259 | # CONFIG_BFIN_GPTIMERS is not set |
260 | CONFIG_BFIN_DMA_5XX=y | ||
261 | # CONFIG_DMA_UNCACHED_4M is not set | 260 | # CONFIG_DMA_UNCACHED_4M is not set |
262 | # CONFIG_DMA_UNCACHED_2M is not set | 261 | # CONFIG_DMA_UNCACHED_2M is not set |
263 | CONFIG_DMA_UNCACHED_1M=y | 262 | CONFIG_DMA_UNCACHED_1M=y |
@@ -456,6 +455,7 @@ CONFIG_BFIN_SPORT=y | |||
456 | # CONFIG_BFIN_TIMER_LATENCY is not set | 455 | # CONFIG_BFIN_TIMER_LATENCY is not set |
457 | # CONFIG_SIMPLE_GPIO is not set | 456 | # CONFIG_SIMPLE_GPIO is not set |
458 | # CONFIG_VT is not set | 457 | # CONFIG_VT is not set |
458 | # CONFIG_DEVKMEM is not set | ||
459 | # CONFIG_SERIAL_NONSTANDARD is not set | 459 | # CONFIG_SERIAL_NONSTANDARD is not set |
460 | 460 | ||
461 | # | 461 | # |