Commit 1441bd32 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

ARM: at91: add SOC_AT91SAM9 kconfig option to factorise select 



This will allow to simplify the switch to multi soc in the same kernel.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent efd09165

arch/arm/mach-at91/Kconfig

+13 −16
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ config AT91_SAM9G45_RESET 
	bool

	default !ARCH_AT91X40



config SOC_AT91SAM9

	bool

	select GENERIC_CLOCKEVENTS

	select CPU_ARM926T



menu "Atmel AT91 System-on-Chip"



choice
@@ -30,51 +35,44 @@ config ARCH_AT91RM9200 


config ARCH_AT91SAM9260

	bool "AT91SAM9260 or AT91SAM9XE"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select SOC_AT91SAM9

	select HAVE_AT91_DBGU0

	select HAVE_NET_MACB



config ARCH_AT91SAM9261

	bool "AT91SAM9261"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select SOC_AT91SAM9

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU0



config ARCH_AT91SAM9G10

	bool "AT91SAM9G10"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select SOC_AT91SAM9

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL



config ARCH_AT91SAM9263

	bool "AT91SAM9263"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select SOC_AT91SAM9

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1



config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select SOC_AT91SAM9

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU0



config ARCH_AT91SAM9G20

	bool "AT91SAM9G20"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select SOC_AT91SAM9

	select HAVE_AT91_DBGU0

	select HAVE_NET_MACB



config ARCH_AT91SAM9G45

	bool "AT91SAM9G45 or AT91SAM9M10 families"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select SOC_AT91SAM9

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1
@@ -84,8 +82,7 @@ config ARCH_AT91SAM9G45 


config ARCH_AT91SAM9X5

	bool "AT91SAM9x5 family"

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select SOC_AT91SAM9

	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU0

arch/arm/mach-at91/Makefile

+9 −8
Original line number Diff line number Diff line
@@ -10,17 +10,18 @@ obj- := 
obj-$(CONFIG_AT91_PMC_UNIT)	+= clock.o

obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o

obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o

obj-$(CONFIG_SOC_AT91SAM9)	+= at91sam926x_time.o sam9_smc.o



# CPU-specific support

obj-$(CONFIG_ARCH_AT91RM9200)	+= at91rm9200.o at91rm9200_time.o at91rm9200_devices.o

obj-$(CONFIG_ARCH_AT91SAM9260)	+= at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9261)	+= at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9G10)	+= at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9263)	+= at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9G20)	+= at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9G45)	+= at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9X5)	+= at91sam9x5.o at91sam926x_time.o sam9_smc.o

obj-$(CONFIG_ARCH_AT91SAM9260)	+= at91sam9260.o at91sam9260_devices.o

obj-$(CONFIG_ARCH_AT91SAM9261)	+= at91sam9261.o at91sam9261_devices.o

obj-$(CONFIG_ARCH_AT91SAM9G10)	+= at91sam9261.o at91sam9261_devices.o

obj-$(CONFIG_ARCH_AT91SAM9263)	+= at91sam9263.o at91sam9263_devices.o

obj-$(CONFIG_ARCH_AT91SAM9RL)	+= at91sam9rl.o at91sam9rl_devices.o

obj-$(CONFIG_ARCH_AT91SAM9G20)	+= at91sam9260.o at91sam9260_devices.o

obj-$(CONFIG_ARCH_AT91SAM9G45)	+= at91sam9g45.o at91sam9g45_devices.o

obj-$(CONFIG_ARCH_AT91SAM9X5)	+= at91sam9x5.o

obj-$(CONFIG_ARCH_AT91X40)	+= at91x40.o at91x40_time.o



# AT91RM9200 board-specific support