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

Commit 58a0cd78 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 3963/1: AT91: Update configuration files 



A number of configuration file changes.

These are mainly to replace references to ARCH_AT91RM9200 and
ARCH_AT91SAM9261 with the common/generic ARCH_AT91.  That way we don't
need to mention every specific AT91 processor explicitly.

Also adds the configuration option for AT91SAM9260-EK and AT91SAM9261-EK
boards.

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 022cbd73

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ config LEDS 
		   ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \

		   ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \

		   ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \

		   ARCH_AT91RM9200 || MACH_TRIZEPS4

		   ARCH_AT91 || MACH_TRIZEPS4

	help

	  If you say Y here, the LEDs on your machine will be used

	  to provide useful information about your current system status.

arch/arm/configs/csb637_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -623,7 +623,7 @@ CONFIG_AT91RM9200_WATCHDOG=y 
# CONFIG_USBPCWATCHDOG is not set

# CONFIG_NVRAM is not set

CONFIG_RTC=y

# CONFIG_AT91_RTC is not set

# CONFIG_AT91RM9200_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

arch/arm/configs/kb9202_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_WATCHDOG is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

# CONFIG_AT91_RTC is not set

# CONFIG_AT91RM9200_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

arch/arm/mach-at91rm9200/Kconfig

+30 −0
Original line number Diff line number Diff line
@@ -92,6 +92,13 @@ if ARCH_AT91SAM9260 


comment "AT91SAM9260 Board Type"



config MACH_AT91SAM9260EK

	bool "Atmel AT91SAM9260-EK Evaluation Kit"

	depends on ARCH_AT91SAM9260

	help

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

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



endif



# ----------------------------------------------------------
@@ -100,8 +107,31 @@ if ARCH_AT91SAM9261 


comment "AT91SAM9261 Board Type"



config MACH_AT91SAM9261EK

	bool "Atmel AT91SAM9261-EK Evaluation Kit"

	depends on ARCH_AT91SAM9261

	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>



endif



# ----------------------------------------------------------



comment "AT91 Board Options"



config MTD_AT91_DATAFLASH_CARD

	bool "Enable DataFlash Card support"

	depends on (ARCH_AT91RM9200DK || MACH_AT91RM9200EK || MACH_AT91SAM9260EK || MACH_AT91SAM9261EK)

	help

	  Enable support for the DataFlash card.



config MTD_NAND_AT91_BUSWIDTH_16

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

	depends on (MACH_AT91SAM9261EK || MACH_AT91SAM9260EK)

	help

	  On AT91SAM926x boards both types of NAND flash can be present

	  (8 and 16 bit data bus width).



# ----------------------------------------------------------

drivers/mmc/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -91,11 +91,11 @@ config MMC_AU1X 


	  If unsure, say N.



config MMC_AT91RM9200

	tristate "AT91RM9200 SD/MMC Card Interface support"

	depends on ARCH_AT91RM9200 && MMC

config MMC_AT91

	tristate "AT91 SD/MMC Card Interface support"

	depends on ARCH_AT91 && MMC

	help

	  This selects the AT91RM9200 MCI controller.

	  This selects the AT91 MCI controller.



	  If unsure, say N.