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 05fe305..f2b3193 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -92,6 +92,7 @@ config PLATFORM_AT32AP
        select PERFORMANCE_COUNTERS
        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_ALLOCATOR
+       select HAVE_FB_ATMEL
 
 #
 # CPU types
@@ -111,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
@@ -118,22 +124,26 @@ choice
 config BOARD_ATSTK1000
        bool "ATSTK1000 evaluation board"
 
-config BOARD_ATNGW100
+config BOARD_ATNGW100_MKI
        bool "ATNGW100 Network Gateway"
-       select CPU_AT32AP7000
+       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 a AVR32 32-bit microcontroller from Atmel.
+         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 incooperates a power supply and is a Power over Ethernet (PoE) Powered
+         The board also incorporates a power supply and is a Power over Ethernet (PoE) Powered
          Device (PD).
 
-         Additonally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is
+         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.
@@ -144,6 +154,19 @@ 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
@@ -153,6 +176,7 @@ 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"