diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:01:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:01:00 -0800 |
| commit | 050cbb09dac0402672edeaeac06094ef8ff1749a (patch) | |
| tree | 89cbe4ac48e8e8f80ff5849e2cc33f045f5ccd52 /arch/avr32/Kconfig | |
| parent | 17c330f98383629cfd359ee62b3adde1d2a3ff7c (diff) | |
| parent | 0386f9e68fc92a3650088b86d908b07de4fb1744 (diff) | |
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: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006
avr32: add default configurations for ATNGW100 mkII and EVKLCD10X
avr32: add support for ATNGW100 mkII board
avr32: convert to asm-generic/hardirq.h
avr32: add two new at91 to cpu.h definition
avr32: clean up linker script using standard macros.
avr32: MRMT: correct setup of SPI slaves
avr32: function for independently setting up SPI slaves
avr32: re-instate MCI WP/CD pin assignments for ATNGW100
Diffstat (limited to 'arch/avr32/Kconfig')
| -rw-r--r-- | arch/avr32/Kconfig | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig index d856354f427..f2b31933318 100644 --- a/arch/avr32/Kconfig +++ b/arch/avr32/Kconfig @@ -112,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 @@ -119,9 +124,13 @@ 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" |