Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / arch / xtensa / Kconfig

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7d5d9fd..e5b872b 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -98,12 +98,6 @@ config XTENSA_VARIANT_DC233C
        help
          This variant refers to Tensilica's Diamond 233L Standard core Rev.C (LE).
 
-config XTENSA_VARIANT_S6000
-       bool "s6000 - Stretch software configurable processor"
-       select VARIANT_IRQ_SWITCH
-       select ARCH_REQUIRE_GPIOLIB
-       select XTENSA_CALIBRATE_CCOUNT
-
 config XTENSA_VARIANT_CUSTOM
        bool "Custom Xtensa processor configuration"
        select MAY_HAVE_SMP
@@ -126,7 +120,6 @@ config XTENSA_VARIANT_NAME
        default "dc232b"                        if XTENSA_VARIANT_DC232B
        default "dc233c"                        if XTENSA_VARIANT_DC233C
        default "fsf"                           if XTENSA_VARIANT_FSF
-       default "s6000"                         if XTENSA_VARIANT_S6000
        default XTENSA_VARIANT_CUSTOM_NAME      if XTENSA_VARIANT_CUSTOM
 
 config XTENSA_VARIANT_MMU
@@ -191,7 +184,6 @@ config HOTPLUG_CPU
 
 config INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
        bool "Initialize Xtensa MMU inside the Linux kernel code"
-       depends on MMU
        default y
        help
          Earlier version initialized the MMU in the exception vector
@@ -311,15 +303,10 @@ config XTENSA_PLATFORM_XT2000
          XT2000 is the name of Tensilica's feature-rich emulation platform.
          This hardware is capable of running a full Linux distribution.
 
-config XTENSA_PLATFORM_S6105
-       bool "S6105"
-       select HAVE_IDE
-       select SERIAL_CONSOLE
-       select NO_IOPORT_MAP
-
 config XTENSA_PLATFORM_XTFPGA
        bool "XTFPGA"
        select ETHOC if ETHERNET
+       select PLATFORM_WANT_DEFAULT_MEM
        select SERIAL_CONSOLE
        select XTENSA_CALIBRATE_CCOUNT
        help
@@ -406,6 +393,71 @@ source "drivers/pcmcia/Kconfig"
 
 source "drivers/pci/hotplug/Kconfig"
 
+config PLATFORM_WANT_DEFAULT_MEM
+       def_bool n
+
+config DEFAULT_MEM_START
+       hex "Physical address of the default memory area start"
+       depends on PLATFORM_WANT_DEFAULT_MEM
+       default 0x00000000 if MMU
+       default 0x40000000 if !MMU
+       help
+         This is a fallback start address of the default memory area, it is
+         used when no physical memory size is passed through DTB or through
+         boot parameter from bootloader.
+
+         In noMMU configuration the following parameters are derived from it:
+         - kernel load address;
+         - kernel entry point address;
+         - relocatable vectors base address;
+         - uBoot load address;
+         - TASK_SIZE.
+
+         If unsure, leave the default value here.
+
+config DEFAULT_MEM_SIZE
+       hex "Maximal size of the default memory area"
+       depends on PLATFORM_WANT_DEFAULT_MEM
+       default 0x04000000
+       help
+         This is a fallback size of the default memory area, it is used when
+         no physical memory size is passed through DTB or through boot
+         parameter from bootloader.
+
+         It's also used for TASK_SIZE calculation in noMMU configuration.
+
+         If unsure, leave the default value here.
+
+config XTFPGA_LCD
+       bool "Enable XTFPGA LCD driver"
+       depends on XTENSA_PLATFORM_XTFPGA
+       default n
+       help
+         There's a 2x16 LCD on most of XTFPGA boards, kernel may output
+         progress messages there during bootup/shutdown. It may be useful
+         during board bringup.
+
+         If unsure, say N.
+
+config XTFPGA_LCD_BASE_ADDR
+       hex "XTFPGA LCD base address"
+       depends on XTFPGA_LCD
+       default "0x0d0c0000"
+       help
+         Base address of the LCD controller inside KIO region.
+         Different boards from XTFPGA family have LCD controller at different
+         addresses. Please consult prototyping user guide for your board for
+         the correct address. Wrong address here may lead to hardware lockup.
+
+config XTFPGA_LCD_8BIT_ACCESS
+       bool "Use 8-bit access to XTFPGA LCD"
+       depends on XTFPGA_LCD
+       default n
+       help
+         LCD may be connected with 4- or 8-bit interface, 8-bit access may
+         only be used with 8-bit interface. Please consult prototyping user
+         guide for your board for the correct interface width.
+
 endmenu
 
 menu "Executable file formats"
@@ -414,6 +466,12 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+menu "Power management options"
+
+source "kernel/power/Kconfig"
+
+endmenu
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"