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

[safe/jmp/linux-2.6] / arch / avr32 / Kconfig

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 856fcf3..f2b3193 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -72,6 +72,8 @@ config GENERIC_BUG
 
 source "init/Kconfig"
 
+source "kernel/Kconfig.freezer"
+
 menu "System Type and features"
 
 source "kernel/time/Kconfig"
@@ -90,6 +92,7 @@ config PLATFORM_AT32AP
        select PERFORMANCE_COUNTERS
        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_ALLOCATOR
+       select HAVE_FB_ATMEL
 
 #
 # CPU types
@@ -109,6 +112,11 @@ config CPU_AT32AP7002
        bool
        select CPU_AT32AP700X
 
+# AP700X boards
+config BOARD_ATNGW100_COMMON
+       bool
+       select CPU_AT32AP7000
+
 choice
        prompt "AVR32 board type"
        default BOARD_ATSTK1000
@@ -116,18 +124,59 @@ choice
 config BOARD_ATSTK1000
        bool "ATSTK1000 evaluation board"
 
-config BOARD_ATNGW100
+config BOARD_ATNGW100_MKI
        bool "ATNGW100 Network Gateway"
+       select BOARD_ATNGW100_COMMON
+
+config BOARD_ATNGW100_MKII
+       bool "ATNGW100 mkII Network Gateway"
+       select BOARD_ATNGW100_COMMON
+
+config BOARD_HAMMERHEAD
+       bool "Hammerhead board"
        select CPU_AT32AP7000
+       select USB_ARCH_HAS_HCD
+       help
+         The Hammerhead platform is built around an AVR32 32-bit microcontroller from Atmel.
+         It offers versatile peripherals, such as ethernet, usb device, usb host etc.
+
+         The board also incorporates a power supply and is a Power over Ethernet (PoE) Powered
+         Device (PD).
+
+         Additionally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is
+         mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which
+         will cover even the most exceptional need of memory bandwidth. Together with the onboard
+         video decoder the board is ready for video processing.
+
+         For more information see: http://www.miromico.com/hammerhead
 
 config BOARD_FAVR_32
        bool "Favr-32 LCD-board"
        select CPU_AT32AP7000
+
+config BOARD_MERISC
+       bool "Merisc board"
+       select CPU_AT32AP7000
+       help
+         Merisc is the family name for a range of AVR32-based boards.
+
+         The boards are designed to be used in a man-machine
+         interfacing environment, utilizing a touch-based graphical
+         user interface. They host a vast range of I/O peripherals as
+         well as a large SDRAM & Flash memory bank.
+
+         For more information see: http://www.martinsson.se/merisc
+
+config BOARD_MIMC200
+       bool "MIMC200 CPU board"
+       select CPU_AT32AP7000
 endchoice
 
 source "arch/avr32/boards/atstk1000/Kconfig"
 source "arch/avr32/boards/atngw100/Kconfig"
+source "arch/avr32/boards/hammerhead/Kconfig"
 source "arch/avr32/boards/favr-32/Kconfig"
+source "arch/avr32/boards/merisc/Kconfig"
 
 choice
        prompt "Boot loader type"
@@ -156,7 +205,7 @@ source "kernel/Kconfig.preempt"
 config QUICKLIST
        def_bool y
 
-config HAVE_ARCH_BOOTMEM_NODE
+config HAVE_ARCH_BOOTMEM
        def_bool n
 
 config ARCH_HAVE_MEMORY_PRESENT