Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

authored by

Jean-Christophe PLAGNIOL-VILLARD and committed by
Nicolas Ferre
1441bd32 efd09165

+22 -24
+13 -16
arch/arm/mach-at91/Kconfig
··· 17 17 bool 18 18 default !ARCH_AT91X40 19 19 20 + config SOC_AT91SAM9 21 + bool 22 + select GENERIC_CLOCKEVENTS 23 + select CPU_ARM926T 24 + 20 25 menu "Atmel AT91 System-on-Chip" 21 26 22 27 choice ··· 35 30 36 31 config ARCH_AT91SAM9260 37 32 bool "AT91SAM9260 or AT91SAM9XE" 38 - select CPU_ARM926T 39 - select GENERIC_CLOCKEVENTS 33 + select SOC_AT91SAM9 40 34 select HAVE_AT91_DBGU0 41 35 select HAVE_NET_MACB 42 36 43 37 config ARCH_AT91SAM9261 44 38 bool "AT91SAM9261" 45 - select CPU_ARM926T 46 - select GENERIC_CLOCKEVENTS 39 + select SOC_AT91SAM9 47 40 select HAVE_FB_ATMEL 48 41 select HAVE_AT91_DBGU0 49 42 50 43 config ARCH_AT91SAM9G10 51 44 bool "AT91SAM9G10" 52 - select CPU_ARM926T 53 - select GENERIC_CLOCKEVENTS 45 + select SOC_AT91SAM9 54 46 select HAVE_AT91_DBGU0 55 47 select HAVE_FB_ATMEL 56 48 57 49 config ARCH_AT91SAM9263 58 50 bool "AT91SAM9263" 59 - select CPU_ARM926T 60 - select GENERIC_CLOCKEVENTS 51 + select SOC_AT91SAM9 61 52 select HAVE_FB_ATMEL 62 53 select HAVE_NET_MACB 63 54 select HAVE_AT91_DBGU1 64 55 65 56 config ARCH_AT91SAM9RL 66 57 bool "AT91SAM9RL" 67 - select CPU_ARM926T 68 - select GENERIC_CLOCKEVENTS 58 + select SOC_AT91SAM9 69 59 select HAVE_FB_ATMEL 70 60 select HAVE_AT91_DBGU0 71 61 72 62 config ARCH_AT91SAM9G20 73 63 bool "AT91SAM9G20" 74 - select CPU_ARM926T 75 - select GENERIC_CLOCKEVENTS 64 + select SOC_AT91SAM9 76 65 select HAVE_AT91_DBGU0 77 66 select HAVE_NET_MACB 78 67 79 68 config ARCH_AT91SAM9G45 80 69 bool "AT91SAM9G45 or AT91SAM9M10 families" 81 - select CPU_ARM926T 82 - select GENERIC_CLOCKEVENTS 70 + select SOC_AT91SAM9 83 71 select HAVE_FB_ATMEL 84 72 select HAVE_NET_MACB 85 73 select HAVE_AT91_DBGU1 ··· 82 84 83 85 config ARCH_AT91SAM9X5 84 86 bool "AT91SAM9x5 family" 85 - select CPU_ARM926T 86 - select GENERIC_CLOCKEVENTS 87 + select SOC_AT91SAM9 87 88 select HAVE_FB_ATMEL 88 89 select HAVE_NET_MACB 89 90 select HAVE_AT91_DBGU0
+9 -8
arch/arm/mach-at91/Makefile
··· 10 10 obj-$(CONFIG_AT91_PMC_UNIT) += clock.o 11 11 obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o 12 12 obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o 13 + obj-$(CONFIG_SOC_AT91SAM9) += at91sam926x_time.o sam9_smc.o 13 14 14 15 # CPU-specific support 15 16 obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200.o at91rm9200_time.o at91rm9200_devices.o 16 - obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o 17 - obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o 18 - obj-$(CONFIG_ARCH_AT91SAM9G10) += at91sam9261.o at91sam926x_time.o at91sam9261_devices.o sam9_smc.o 19 - obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam926x_time.o at91sam9263_devices.o sam9_smc.o 20 - obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam926x_time.o at91sam9rl_devices.o sam9_smc.o 21 - obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam926x_time.o at91sam9260_devices.o sam9_smc.o 22 - obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam926x_time.o at91sam9g45_devices.o sam9_smc.o 23 - obj-$(CONFIG_ARCH_AT91SAM9X5) += at91sam9x5.o at91sam926x_time.o sam9_smc.o 17 + obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260.o at91sam9260_devices.o 18 + obj-$(CONFIG_ARCH_AT91SAM9261) += at91sam9261.o at91sam9261_devices.o 19 + obj-$(CONFIG_ARCH_AT91SAM9G10) += at91sam9261.o at91sam9261_devices.o 20 + obj-$(CONFIG_ARCH_AT91SAM9263) += at91sam9263.o at91sam9263_devices.o 21 + obj-$(CONFIG_ARCH_AT91SAM9RL) += at91sam9rl.o at91sam9rl_devices.o 22 + obj-$(CONFIG_ARCH_AT91SAM9G20) += at91sam9260.o at91sam9260_devices.o 23 + obj-$(CONFIG_ARCH_AT91SAM9G45) += at91sam9g45.o at91sam9g45_devices.o 24 + obj-$(CONFIG_ARCH_AT91SAM9X5) += at91sam9x5.o 24 25 obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o 25 26 26 27 # AT91RM9200 board-specific support