1 files changed, 59 insertions, 67 deletions

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index ae6a60f10120..c078849df7f9 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -5,6 +5,10 @@
 
 mainmenu "Blackfin Kernel Configuration"
 
+config SYMBOL_PREFIX
+        string
+        default "_"
+
 config MMU
         def_bool n
 
@@ -19,15 +23,21 @@ config RWSEM_XCHGADD_ALGORITHM
 
 config BLACKFIN
         def_bool y
+        select HAVE_ARCH_KGDB
+        select HAVE_ARCH_TRACEHOOK
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_FUNCTION_TRACER
+        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
         select HAVE_IDE
-        select HAVE_KERNEL_GZIP
-        select HAVE_KERNEL_BZIP2
-        select HAVE_KERNEL_LZMA
+        select HAVE_KERNEL_GZIP if RAMKERNEL
+        select HAVE_KERNEL_BZIP2 if RAMKERNEL
+        select HAVE_KERNEL_LZMA if RAMKERNEL
         select HAVE_OPROFILE
         select ARCH_WANT_OPTIONAL_GPIOLIB
 
+config GENERIC_CSUM
+        def_bool y
+
 config GENERIC_BUG
         def_bool y
         depends on BUG
@@ -38,9 +48,6 @@ config ZONE_DMA
 config GENERIC_FIND_NEXT_BIT
         def_bool y
 
-config GENERIC_HWEIGHT
-        def_bool y
-
 config GENERIC_HARDIRQS
         def_bool y
 
@@ -173,7 +180,7 @@ config BF539
         help
           BF539 Processor Support.
 
-config BF542
+config BF542_std
         bool "BF542"
         help
           BF542 Processor Support.
@@ -183,7 +190,7 @@ config BF542M
         help
           BF542 Processor Support.
 
-config BF544
+config BF544_std
         bool "BF544"
         help
           BF544 Processor Support.
@@ -193,7 +200,7 @@ config BF544M
         help
           BF544 Processor Support.
 
-config BF547
+config BF547_std
         bool "BF547"
         help
           BF547 Processor Support.
@@ -203,7 +210,7 @@ config BF547M
         help
           BF547 Processor Support.
 
-config BF548
+config BF548_std
         bool "BF548"
         help
           BF548 Processor Support.
@@ -213,7 +220,7 @@ config BF548M
         help
           BF548 Processor Support.
 
-config BF549
+config BF549_std
         bool "BF549"
         help
           BF549 Processor Support.
@@ -232,7 +239,7 @@ endchoice
 
 config SMP
         depends on BF561
-        select GENERIC_CLOCKEVENTS
+        select TICKSOURCE_CORETMR
         bool "Symmetric multi-processing support"
         ---help---
           This enables support for systems with more than one CPU,
@@ -246,11 +253,20 @@ config NR_CPUS
         depends on SMP
         default 2 if BF561
 
+config HOTPLUG_CPU
+        bool "Support for hot-pluggable CPUs"
+        depends on SMP && HOTPLUG
+        default y
+
 config IRQ_PER_CPU
         bool
         depends on SMP
         default y
 
+config HAVE_LEGACY_PER_CPU_AREA
+        def_bool y
+        depends on SMP
+
 config BF_REV_MIN
         int
         default 0 if (BF51x || BF52x || (BF54x && !BF54xM))
@@ -307,31 +323,11 @@ config BF_REV_NONE
 
 endchoice
 
-config BF51x
-        bool
-        depends on (BF512 || BF514 || BF516 || BF518)
-        default y
-
-config BF52x
-        bool
-        depends on (BF522 || BF523 || BF524 || BF525 || BF526 || BF527)
-        default y
-
 config BF53x
         bool
         depends on (BF531 || BF532 || BF533 || BF534 || BF536 || BF537)
         default y
 
-config BF54xM
-        bool
-        depends on (BF542M || BF544M || BF547M || BF548M || BF549M)
-        default y
-
-config BF54x
-        bool
-        depends on (BF542 || BF544 || BF547 || BF548 || BF549 || BF54xM)
-        default y
-
 config MEM_GENERIC_BOARD
         bool
         depends on GENERIC_BOARD
@@ -362,7 +358,7 @@ config MEM_MT48LC8M32B2B5_7
 
 config MEM_MT48LC32M16A2TG_75
         bool
-        depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP)
+        depends on (BFIN527_EZKIT || BFIN527_EZKIT_V2 || BFIN532_IP0X || BLACKSTAMP)
         default y
 
 config MEM_MT48LC32M8A2_75
@@ -414,10 +410,18 @@ config BOOT_LOAD
 config ROM_BASE
         hex "Kernel ROM Base"
         depends on ROMKERNEL
-        default "0x20040000"
+        default "0x20040040"
         range 0x20000000 0x20400000 if !(BF54x || BF561)
         range 0x20000000 0x30000000 if (BF54x || BF561)
         help
+          Make sure your ROM base does not include any file-header
+          information that is prepended to the kernel.
+
+          For example, the bootable U-Boot format (created with
+          mkimage) has a 64 byte header (0x40).  So while the image
+          you write to flash might start at say 0x20080000, you have
+          to add 0x40 to get the kernel's ROM base as it will come
+          after the header.
 
 comment "Clock/PLL Setup"
 
@@ -461,7 +465,7 @@ config VCO_MULT
         range 1 64
         default "22" if BFIN533_EZKIT
         default "45" if BFIN533_STAMP
-        default "20" if (BFIN537_STAMP || BFIN527_EZKIT || BFIN548_EZKIT || BFIN548_BLUETECHNIX_CM || BFIN538_EZKIT)
+        default "20" if (BFIN537_STAMP || BFIN527_EZKIT || BFIN527_EZKIT_V2 || BFIN548_EZKIT || BFIN548_BLUETECHNIX_CM || BFIN538_EZKIT)
         default "22" if BFIN533_BLUETECHNIX_CM
         default "20" if (BFIN537_BLUETECHNIX_CM_E || BFIN537_BLUETECHNIX_CM_U || BFIN527_BLUETECHNIX_CM || BFIN561_BLUETECHNIX_CM)
         default "20" if BFIN561_EZKIT
@@ -622,23 +626,23 @@ config GENERIC_CLOCKEVENTS
         bool "Generic clock events"
         default y
 
-choice
-        prompt "Kernel Tick Source"
+menu "Clock event device"
         depends on GENERIC_CLOCKEVENTS
-        default TICKSOURCE_CORETMR
-
 config TICKSOURCE_GPTMR0
-        bool "Gptimer0 (SCLK domain)"
+        bool "GPTimer0"
+        depends on !SMP
         select BFIN_GPTIMERS
 
 config TICKSOURCE_CORETMR
-        bool "Core timer (CCLK domain)"
-
-endchoice
+        bool "Core timer"
+        default y
+endmenu
 
-config CYCLES_CLOCKSOURCE
-        bool "Use 'CYCLES' as a clocksource"
+menu "Clock souce"
         depends on GENERIC_CLOCKEVENTS
+config CYCLES_CLOCKSOURCE
+        bool "CYCLES"
+        default y
         depends on !BFIN_SCRATCH_REG_CYCLES
         depends on !SMP
         help
@@ -649,10 +653,10 @@ config CYCLES_CLOCKSOURCE
           writing the registers will most likely crash the kernel.
 
 config GPTMR0_CLOCKSOURCE
-        bool "Use GPTimer0 as a clocksource"
+        bool "GPTimer0"
         select BFIN_GPTIMERS
-        depends on GENERIC_CLOCKEVENTS
         depends on !TICKSOURCE_GPTMR0
+endmenu
 
 config ARCH_USES_GETTIMEOFFSET
         depends on !GENERIC_CLOCKEVENTS
@@ -913,6 +917,12 @@ config DMA_UNCACHED_2M
         bool "Enable 2M DMA region"
 config DMA_UNCACHED_1M
         bool "Enable 1M DMA region"
+config DMA_UNCACHED_512K
+        bool "Enable 512K DMA region"
+config DMA_UNCACHED_256K
+        bool "Enable 256K DMA region"
+config DMA_UNCACHED_128K
+        bool "Enable 128K DMA region"
 config DMA_UNCACHED_NONE
         bool "Disable DMA region"
 endchoice
@@ -1123,24 +1133,6 @@ config PCI
 
 source "drivers/pci/Kconfig"
 
-config HOTPLUG
-        bool "Support for hot-pluggable device"
-          help
-          Say Y here if you want to plug devices into your computer while
-          the system is running, and be able to use them quickly.  In many
-          cases, the devices can likewise be unplugged at any time too.
-
-          One well known example of this is PCMCIA- or PC-cards, credit-card
-          size devices such as network cards, modems or hard drives which are
-          plugged into slots found on all modern laptop computers.  Another
-          example, used on modern desktops as well as laptops, is USB.
-
-          Enable HOTPLUG and build a modular kernel.  Get agent software
-          (from <http://linux-hotplug.sourceforge.net/>) and install it.
-          Then your kernel will automatically call out to a user mode "policy
-          agent" (/sbin/hotplug) to load modules and set up software needed
-          to use devices as you hotplug them.
-
 source "drivers/pcmcia/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
@@ -1154,7 +1146,6 @@ source "fs/Kconfig.binfmt"
 endmenu
 
 menu "Power management options"
-        depends on !SMP
 
 source "kernel/power/Kconfig"
 
@@ -1247,7 +1238,6 @@ config PM_BFIN_WAKE_GP
 endmenu
 
 menu "CPU Frequency scaling"
-        depends on !SMP
 
 source "drivers/cpufreq/Kconfig"
 
@@ -1274,6 +1264,8 @@ source "net/Kconfig"
 
 source "drivers/Kconfig"
 
+source "drivers/firmware/Kconfig"
+
 source "fs/Kconfig"
 
 source "arch/blackfin/Kconfig.debug"