summaryrefslogtreecommitdiff
path: root/arch/avr32/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 21:23:31 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-23 21:23:31 +0400
commit54d822a6169b76b807b8cdbbf76ff2812a88947f (patch)
treefc54a011db76dcb51a0faebb9f6aafb14a643db2 /arch/avr32/Kconfig
parent22484856402bfa1ff3defe47f6029ab0418240d9 (diff)
parentd9214556b11a8d18ff588e60824c12041d30f791 (diff)
downloadlinux-54d822a6169b76b807b8cdbbf76ff2812a88947f.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: Fix GPIO initcall breakage avr32: Scale loops_per_jiffy when cpu frequency changes avr32: Fix bug in LCD pin setup on port C avr32: Add defconfig for the favr-32 board avr32: Add defconfig for the mimc200 board avr32: Add MIMC200 board support avr32: Fix MIMC200 board use of SPD network pins avr32: add support for EarthLCD Favr-32 board avr32: Add support for EVKLCD10X addon boards avr32: Kconfig: Remove pointless if around atstk1000 include
Diffstat (limited to 'arch/avr32/Kconfig')
-rw-r--r--arch/avr32/Kconfig12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 33a5b2969eb4..26eca87f6735 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -121,11 +121,19 @@ config BOARD_ATSTK1000
config BOARD_ATNGW100
bool "ATNGW100 Network Gateway"
select CPU_AT32AP7000
+
+config BOARD_FAVR_32
+ bool "Favr-32 LCD-board"
+ select CPU_AT32AP7000
+
+config BOARD_MIMC200
+ bool "MIMC200 CPU board"
+ select CPU_AT32AP7000
endchoice
-if BOARD_ATSTK1000
source "arch/avr32/boards/atstk1000/Kconfig"
-endif
+source "arch/avr32/boards/atngw100/Kconfig"
+source "arch/avr32/boards/favr-32/Kconfig"
choice
prompt "Boot loader type"