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

Commit 8fc5ffa0 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 3675/2: Preparing for AT91SAM926 support 



Patch from Andrew Victor

This prepares the way for adding support for the new Atmel AT91SAM926x
processors.

Major changes:
- Rename time.c to at91rm9200_time.c
- Rename common.c to at91rm9200.c
- Introduce ARCH_AT91, of which ARCH_AT91RM9200, ARCH_AT91SAM9260 and
ARCH_AT91SAM9261 are dependent.

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

arch/arm/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -121,11 +121,11 @@ config ARCH_VERSATILE 
	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_AT91RM9200

	bool "Atmel AT91RM9200"

config ARCH_AT91

	bool "Atmel AT91"

	help

	  Say Y here if you intend to run this kernel on an Atmel

	  AT91RM9200-based board.

	  This enables support for systems based on the Atmel AT91RM9200

	  and AT91SAM9xxx processors.



config ARCH_CLPS7500

	bool "Cirrus CL-PS7500FE"

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ endif 
 machine-$(CONFIG_ARCH_H720X)	   := h720x

 machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000

 machine-$(CONFIG_ARCH_REALVIEW)   := realview

 machine-$(CONFIG_ARCH_AT91RM9200) := at91rm9200

 machine-$(CONFIG_ARCH_AT91)       := at91rm9200

 machine-$(CONFIG_ARCH_EP93XX)     := ep93xx

 machine-$(CONFIG_ARCH_PNX4008)    := pnx4008

 machine-$(CONFIG_ARCH_NETX)       := netx

arch/arm/configs/at91rm9200dk_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91RM9200=y



#

arch/arm/configs/at91rm9200ek_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91RM9200=y



#

arch/arm/configs/ateb9200_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set

CONFIG_ARCH_AT91=y

CONFIG_ARCH_AT91RM9200=y



#