1 files changed, 15 insertions, 12 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index fef96f47876c..f34861920634 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -33,6 +33,7 @@ config BLACKFIN
         select HAVE_PERF_EVENTS
         select ARCH_HAVE_CUSTOM_GPIO_H
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select ARCH_WANT_IPC_PARSE_VERSION
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_PROBE
@@ -352,6 +353,11 @@ config MEM_MT48H32M16LFCJ_75
         depends on (BFIN526_EZBRD)
         default y
 
+config MEM_MT47H64M16
+        bool
+        depends on (BFIN609_EZKIT)
+        default y
+
 source "arch/blackfin/mach-bf518/Kconfig"
 source "arch/blackfin/mach-bf527/Kconfig"
 source "arch/blackfin/mach-bf533/Kconfig"
@@ -399,8 +405,9 @@ config ROM_BASE
         hex "Kernel ROM Base"
         depends on ROMKERNEL
         default "0x20040040"
-        range 0x20000000 0x20400000 if !(BF54x || BF561)
+        range 0x20000000 0x20400000 if !(BF54x || BF561 || BF60x)
         range 0x20000000 0x30000000 if (BF54x || BF561)
+        range 0xB0000000 0xC0000000 if (BF60x)
         help
           Make sure your ROM base does not include any file-header
           information that is prepended to the kernel.
@@ -996,19 +1003,15 @@ config BFIN_GPTIMERS
           To compile this driver as a module, choose M here: the module
           will be called gptimers.
 
-config HAVE_PWM
-        tristate "Enable PWM API support"
-        depends on BFIN_GPTIMERS
-        help
-          Enable support for the Pulse Width Modulation framework (as
-          found in linux/pwm.h).
-
-          To compile this driver as a module, choose M here: the module
-          will be called pwm.
-
 choice
         prompt "Uncached DMA region"
         default DMA_UNCACHED_1M
+config DMA_UNCACHED_32M
+        bool "Enable 32M DMA region"
+config DMA_UNCACHED_16M
+        bool "Enable 16M DMA region"
+config DMA_UNCACHED_8M
+        bool "Enable 8M DMA region"
 config DMA_UNCACHED_4M
         bool "Enable 4M DMA region"
 config DMA_UNCACHED_2M
@@ -1038,7 +1041,7 @@ config BFIN_EXTMEM_ICACHEABLE
 config BFIN_L2_ICACHEABLE
         bool "Enable ICACHE for L2 SRAM"
         depends on BFIN_ICACHE
-        depends on BF54x || BF561
+        depends on (BF54x || BF561 || BF60x) && !SMP
         default n
 
 config BFIN_DCACHE