kmsg_dump: fix build for CONFIG_PRINTK=n

[safe/jmp/linux-2.6] / arch / arm / plat-omap / Kconfig

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index f2dc363..64b3f52 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -11,14 +11,59 @@ choice
 
 config ARCH_OMAP1
        bool "TI OMAP1"
 
 config ARCH_OMAP1
        bool "TI OMAP1"

+       select COMMON_CLKDEV

 
 config ARCH_OMAP2
        bool "TI OMAP2"
 
 config ARCH_OMAP2
        bool "TI OMAP2"

+       select CPU_V6
+       select COMMON_CLKDEV
+
+config ARCH_OMAP3
+       bool "TI OMAP3"
+       select CPU_V7
+       select COMMON_CLKDEV
+
+config ARCH_OMAP4
+       bool "TI OMAP4"
+       select CPU_V7
+       select ARM_GIC

 
 endchoice
 
 comment "OMAP Feature Selections"
 
 
 endchoice
 
 comment "OMAP Feature Selections"
 

+config OMAP_DEBUG_DEVICES
+       bool
+       help
+         For debug cards on TI reference boards.
+
+config OMAP_DEBUG_LEDS
+       bool
+       depends on OMAP_DEBUG_DEVICES
+       default y if LEDS || LEDS_OMAP_DEBUG
+
+config OMAP_DEBUG_POWERDOMAIN
+       bool "Emit debug messages from powerdomain layer"
+       depends on ARCH_OMAP2 || ARCH_OMAP3
+       help
+         Say Y here if you want to compile in powerdomain layer
+         debugging messages for OMAP2/3.   These messages can
+         provide more detail as to why some powerdomain calls
+         may be failing, and will also emit a descriptive message
+         for every powerdomain register write.  However, the
+         extra detail costs some memory.
+
+config OMAP_DEBUG_CLOCKDOMAIN
+       bool "Emit debug messages from clockdomain layer"
+       depends on ARCH_OMAP2 || ARCH_OMAP3
+       help
+         Say Y here if you want to compile in clockdomain layer
+         debugging messages for OMAP2/3.   These messages can
+         provide more detail as to why some clockdomain calls
+         may be failing, and will also emit a descriptive message
+         for every clockdomain register write.  However, the
+         extra detail costs some memory.
+

 config OMAP_RESET_CLOCKS
        bool "Reset unused clocks during boot"
        depends on ARCH_OMAP
 config OMAP_RESET_CLOCKS
        bool "Reset unused clocks during boot"
        depends on ARCH_OMAP


@@ -57,6 +102,28 @@ config OMAP_MUX_WARNINGS
          to change the pin multiplexing setup.  When there are no warnings
          printed, it's safe to deselect OMAP_MUX for your product.
 
          to change the pin multiplexing setup.  When there are no warnings
          printed, it's safe to deselect OMAP_MUX for your product.
 

+config OMAP_MCBSP
+       bool "McBSP support"
+       depends on ARCH_OMAP
+       default y
+       help
+         Say Y here if you want support for the OMAP Multichannel
+         Buffered Serial Port.
+
+config OMAP_MBOX_FWK
+       tristate "Mailbox framework support"
+       depends on ARCH_OMAP
+       help
+         Say Y here if you want to use OMAP Mailbox framework support for
+         DSP, IVA1.0 and IVA2 in OMAP1/2/3.
+
+config OMAP_IOMMU
+       tristate
+
+config OMAP_IOMMU_DEBUG
+       depends on OMAP_IOMMU
+       tristate
+

 choice
         prompt "System timer"
        default OMAP_MPU_TIMER
 choice
         prompt "System timer"
        default OMAP_MPU_TIMER


@@ -70,13 +137,13 @@ config OMAP_MPU_TIMER
 
 config OMAP_32K_TIMER
        bool "Use 32KHz timer"
 
 config OMAP_32K_TIMER
        bool "Use 32KHz timer"

-       depends on ARCH_OMAP16XX || ARCH_OMAP24XX
+       depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4

        help
          Select this option if you want to enable the OMAP 32KHz timer.
          This timer saves power compared to the OMAP_MPU_TIMER, and has
          support for no tick during idle. The 32KHz timer provides less
          intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is
        help
          Select this option if you want to enable the OMAP 32KHz timer.
          This timer saves power compared to the OMAP_MPU_TIMER, and has
          support for no tick during idle. The 32KHz timer provides less
          intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is

-         currently only available for OMAP16XX and 24XX.
+         currently only available for OMAP16XX, 24XX, 34XX and OMAP4.

 
 endchoice
 
 
 endchoice
 


@@ -91,7 +158,7 @@ config OMAP_32K_TIMER_HZ
 
 config OMAP_DM_TIMER
        bool "Use dual-mode timer"
 
 config OMAP_DM_TIMER
        bool "Use dual-mode timer"

-       depends on ARCH_OMAP16XX || ARCH_OMAP24XX
+       depends on ARCH_OMAP16XX || ARCH_OMAP24XX || ARCH_OMAP34XX || ARCH_OMAP4

        help
         Select this option if you want to use OMAP Dual-Mode timers.
 
        help
         Select this option if you want to use OMAP Dual-Mode timers.
 


@@ -113,13 +180,26 @@ endchoice
 
 config OMAP_SERIAL_WAKE
        bool "Enable wake-up events for serial ports"
 
 config OMAP_SERIAL_WAKE
        bool "Enable wake-up events for serial ports"

-       depends on OMAP_MUX
+       depends on ARCH_OMAP1 && OMAP_MUX

        default y
        help
          Select this option if you want to have your system wake up
          to data on the serial RX line. This allows you to wake the
          system from serial console.
 
        default y
        help
          Select this option if you want to have your system wake up
          to data on the serial RX line. This allows you to wake the
          system from serial console.
 

+choice
+       prompt "OMAP PM layer selection"
+       depends on ARCH_OMAP
+       default OMAP_PM_NOOP
+
+config OMAP_PM_NONE
+       bool "No PM layer"
+
+config OMAP_PM_NOOP
+       bool "No-op/debug PM layer"
+
+endchoice
+

 endmenu
 
 endif
 endmenu
 
 endif