Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef1a6884 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable 

Conflicts:
	arch/arm/mach-at91/Kconfig
parents 1508c995 0912e535

arch/arm/mach-at91/Kconfig

+54 −37
Original line number Diff line number Diff line 
if ARCH_AT91



config HAVE_AT91_DATAFLASH_CARD

	bool



config HAVE_NAND_ATMEL_BUSWIDTH_16

	bool



config HAVE_AT91_USART3

	bool



config HAVE_AT91_USART4

	bool



config HAVE_AT91_USART5

	bool



menu "Atmel AT91 System-on-Chip"



choice
@@ -10,54 +25,69 @@ config ARCH_AT91RM9200 
	select CPU_ARM920T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USART3



config ARCH_AT91SAM9260

	bool "AT91SAM9260 or AT91SAM9XE"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USART3

	select HAVE_AT91_USART4

	select HAVE_AT91_USART5



config ARCH_AT91SAM9261

	bool "AT91SAM9261"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL



config ARCH_AT91SAM9G10

	bool "AT91SAM9G10"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL



config ARCH_AT91SAM9263

	bool "AT91SAM9263"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL



config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USART3

	select HAVE_FB_ATMEL



config ARCH_AT91SAM9G20

	bool "AT91SAM9G20"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USART3

	select HAVE_AT91_USART4

	select HAVE_AT91_USART5



config ARCH_AT91SAM9G45

	bool "AT91SAM9G45"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_USART3

	select HAVE_FB_ATMEL



config ARCH_AT91CAP9

	bool "AT91CAP9"

	select CPU_ARM926T

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL



config ARCH_AT91X40

	bool "AT91x40"
@@ -76,89 +106,79 @@ comment "AT91RM9200 Board Type" 


config MACH_ONEARM

	bool "Ajeco 1ARM Single Board Computer"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Ajeco's 1ARM Single Board Computer.

	  <http://www.ajeco.fi/products.htm>



config ARCH_AT91RM9200DK

	bool "Atmel AT91RM9200-DK Development board"

	depends on ARCH_AT91RM9200

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using Atmel's AT91RM9200-DK Development board.

	  (Discontinued)



config MACH_AT91RM9200EK

	bool "Atmel AT91RM9200-EK Evaluation Kit"

	depends on ARCH_AT91RM9200

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507>



config MACH_CSB337

	bool "Cogent CSB337"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Cogent's CSB337 board.

	  <http://www.cogcomp.com/csb_csb337.htm>



config MACH_CSB637

	bool "Cogent CSB637"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Cogent's CSB637 board.

	  <http://www.cogcomp.com/csb_csb637.htm>



config MACH_CARMEVA

	bool "Conitec ARM&EVA"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Conitec's AT91RM9200-MCU-Module.

	  <http://www.conitec.net/english/linuxboard.htm>



config MACH_ATEB9200

	bool "Embest ATEB9200"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Embest's ATEB9200 board.

	  <http://www.embedinfo.com/english/product/ATEB9200.asp>



config MACH_KB9200

	bool "KwikByte KB920x"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using KwikByte's KB920x board.

	  <http://kwikbyte.com/KB9202_description_new.htm>



config MACH_PICOTUX2XX

	bool "picotux 200"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using a picotux 200.

	  <http://www.picotux.com/>



config MACH_KAFA

	bool "Sperry-Sun KAFA board"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using Sperry-Sun's KAFA board.



config MACH_ECBAT91

	bool "emQbit ECB_AT91 SBC"

	depends on ARCH_AT91RM9200

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using emQbit's ECB_AT91 board.

	  <http://wiki.emqbit.com/free-ecb-at91>



config MACH_YL9200

	bool "ucDragon YL-9200"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using the ucDragon YL-9200 board.



config MACH_CPUAT91

	bool "Eukrea CPUAT91"

	depends on ARCH_AT91RM9200

	help

	  Select this if you are using the Eukrea Electromatique's

	  CPUAT91 board <http://www.eukrea.com/>.
@@ -173,7 +193,6 @@ comment "AT91SAM9260 Variants" 


config ARCH_AT91SAM9260_SAM9XE

	bool "AT91SAM9XE"

	depends on ARCH_AT91SAM9260

	help

	  Select this if you are using Atmel's AT91SAM9XE System-on-Chip.

	  They are basically AT91SAM9260s with various sizes of embedded Flash.
@@ -182,28 +201,27 @@ comment "AT91SAM9260 / AT91SAM9XE Board Type" 


config MACH_AT91SAM9260EK

	bool "Atmel AT91SAM9260-EK / AT91SAM9XE Evaluation Kit"

	depends on ARCH_AT91SAM9260

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>



config MACH_CAM60

	bool "KwikByte KB9260 (CAM60) board"

	depends on ARCH_AT91SAM9260

	help

	  Select this if you are using KwikByte's KB9260 (CAM60) board based on the Atmel AT91SAM9260.

	  <http://www.kwikbyte.com/KB9260.html>



config MACH_SAM9_L9260

	bool "Olimex SAM9-L9260 board"

	depends on ARCH_AT91SAM9260

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using Olimex's SAM9-L9260 board based on the Atmel AT91SAM9260.

	  <http://www.olimex.com/dev/sam9-L9260.html>



config MACH_AFEB9260

	bool "Custom afeb9260 board v1"

	depends on ARCH_AT91SAM9260

	help

	  Select this if you are using custom afeb9260 board based on

	  open hardware design. Select this for revision 1 of the board.
@@ -212,21 +230,18 @@ config MACH_AFEB9260 


config MACH_USB_A9260

	bool "CALAO USB-A9260"

	depends on ARCH_AT91SAM9260

	help

	  Select this if you are using a Calao Systems USB-A9260.

	  <http://www.calao-systems.com>



config MACH_QIL_A9260

	bool "CALAO QIL-A9260 board"

	depends on ARCH_AT91SAM9260

	help

	  Select this if you are using a Calao Systems QIL-A9260 Board.

	  <http://www.calao-systems.com>



config MACH_CPU9260

	bool "Eukrea CPU9260 board"

	depends on ARCH_AT91SAM9260

	help

	  Select this if you are using a Eukrea Electromatique's

	  CPU9260 Board <http://www.eukrea.com/>
@@ -241,7 +256,8 @@ comment "AT91SAM9261 Board Type" 


config MACH_AT91SAM9261EK

	bool "Atmel AT91SAM9261-EK Evaluation Kit"

	depends on ARCH_AT91SAM9261

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
@@ -256,7 +272,8 @@ comment "AT91SAM9G10 Board Type" 


config MACH_AT91SAM9G10EK

	bool "Atmel AT91SAM9G10-EK Evaluation Kit"

	depends on ARCH_AT91SAM9G10

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
@@ -271,21 +288,21 @@ comment "AT91SAM9263 Board Type" 


config MACH_AT91SAM9263EK

	bool "Atmel AT91SAM9263-EK Evaluation Kit"

	depends on ARCH_AT91SAM9263

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>



config MACH_USB_A9263

	bool "CALAO USB-A9263"

	depends on ARCH_AT91SAM9263

	help

	  Select this if you are using a Calao Systems USB-A9263.

	  <http://www.calao-systems.com>



config MACH_NEOCORE926

	bool "Adeneo NEOCORE926"

	depends on ARCH_AT91SAM9263

	select HAVE_AT91_DATAFLASH_CARD

	help

	  Select this if you are using the Adeneo Neocore 926 board.
@@ -299,7 +316,6 @@ comment "AT91SAM9RL Board Type" 


config MACH_AT91SAM9RLEK

	bool "Atmel AT91SAM9RL-EK Evaluation Kit"

	depends on ARCH_AT91SAM9RL

	help

	  Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.
@@ -313,14 +329,15 @@ comment "AT91SAM9G20 Board Type" 


config MACH_AT91SAM9G20EK

	bool "Atmel AT91SAM9G20-EK Evaluation Kit"

	depends on ARCH_AT91SAM9G20

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit

	  that embeds only one SD/MMC slot.



config MACH_AT91SAM9G20EK_2MMC

	bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"

	depends on ARCH_AT91SAM9G20

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit

	  with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and
@@ -328,7 +345,6 @@ config MACH_AT91SAM9G20EK_2MMC 


config MACH_CPU9G20

	bool "Eukrea CPU9G20 board"

	depends on ARCH_AT91SAM9G20

	help

	  Select this if you are using a Eukrea Electromatique's

	  CPU9G20 Board <http://www.eukrea.com/>
@@ -343,7 +359,7 @@ comment "AT91SAM9G45 Board Type" 


config MACH_AT91SAM9G45EKES

	bool "Atmel AT91SAM9G45-EKES Evaluation Kit"

	depends on ARCH_AT91SAM9G45

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91SAM9G45-EKES Evaluation Kit.

	  "ES" at the end of the name means that this board is an
@@ -359,7 +375,8 @@ comment "AT91CAP9 Board Type" 


config MACH_AT91CAP9ADK

	bool "Atmel AT91CAP9A-DK Evaluation Kit"

	depends on ARCH_AT91CAP9

	select HAVE_AT91_DATAFLASH_CARD

	select HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  Select this if you are using Atmel's AT91CAP9A-DK Evaluation Kit.

	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4138>
@@ -388,13 +405,13 @@ comment "AT91 Board Options" 


config MTD_AT91_DATAFLASH_CARD

	bool "Enable DataFlash Card support"

	depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_ECBAT91 || MACH_SAM9_L9260 || MACH_AT91CAP9ADK || MACH_NEOCORE926)

	depends on HAVE_AT91_DATAFLASH_CARD

	help

	  Enable support for the DataFlash card.



config MTD_NAND_ATMEL_BUSWIDTH_16

	bool "Enable 16-bit data bus interface to NAND flash"

	depends on (MACH_AT91SAM9260EK || MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK || MACH_AT91SAM9263EK || MACH_AT91SAM9G20EK || MACH_AT91SAM9G20EK_2MMC || MACH_AT91SAM9G45EKES || MACH_AT91CAP9ADK)

	depends on HAVE_NAND_ATMEL_BUSWIDTH_16

	help

	  On AT91SAM926x boards both types of NAND flash can be present

	  (8 and 16 bit data bus width).
@@ -456,15 +473,15 @@ config AT91_EARLY_USART2 


config AT91_EARLY_USART3

	bool "USART3"

	depends on (ARCH_AT91RM9200 || ARCH_AT91SAM9RL || ARCH_AT91SAM9260 || ARCH_AT91SAM9G20 || ARCH_AT91SAM9G45)

	depends on HAVE_AT91_USART3



config AT91_EARLY_USART4

	bool "USART4"

	depends on ARCH_AT91SAM9260 || ARCH_AT91SAM9G20

	depends on HAVE_AT91_USART4



config AT91_EARLY_USART5

	bool "USART5"

	depends on ARCH_AT91SAM9260 || ARCH_AT91SAM9G20

	depends on HAVE_AT91_USART5



endchoice

arch/avr32/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ config PLATFORM_AT32AP 
	select PERFORMANCE_COUNTERS

	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_ALLOCATOR

	select HAVE_FB_ATMEL



#

# CPU types

drivers/video/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
menu "Graphics support"

	depends on HAS_IOMEM



config HAVE_FB_ATMEL

	bool



source "drivers/char/agp/Kconfig"



source "drivers/gpu/vga/Kconfig"
@@ -937,7 +940,7 @@ config FB_S1D13XXX 


config FB_ATMEL

	tristate "AT91/AT32 LCD Controller support"

	depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32)

	depends on FB && HAVE_FB_ATMEL

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT