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

Commit 21ea52aa authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD
Browse files

ARM: at91: always enable sam9 restart 



This is need for multiple SoC in the same kernel image and DT.
As we will chose the restart function via binding.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent eb5e76ff

arch/arm/mach-at91/Kconfig

+2 −8
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ config HAVE_AT91_USART5 


config AT91_SAM9_ALT_RESET

	bool

	default !ARCH_AT91X40



config AT91_SAM9G45_RESET

	bool

	default !ARCH_AT91X40



menu "Atmel AT91 System-on-Chip"
@@ -45,7 +47,6 @@ config ARCH_AT91SAM9260 
	select HAVE_AT91_USART4

	select HAVE_AT91_USART5

	select HAVE_NET_MACB

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9261

	bool "AT91SAM9261"
@@ -53,7 +54,6 @@ config ARCH_AT91SAM9261 
	select GENERIC_CLOCKEVENTS

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU0

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9G10

	bool "AT91SAM9G10"
@@ -61,7 +61,6 @@ config ARCH_AT91SAM9G10 
	select GENERIC_CLOCKEVENTS

	select HAVE_AT91_DBGU0

	select HAVE_FB_ATMEL

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9263

	bool "AT91SAM9263"
@@ -70,7 +69,6 @@ config ARCH_AT91SAM9263 
	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9RL

	bool "AT91SAM9RL"
@@ -79,7 +77,6 @@ config ARCH_AT91SAM9RL 
	select HAVE_AT91_USART3

	select HAVE_FB_ATMEL

	select HAVE_AT91_DBGU0

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9G20

	bool "AT91SAM9G20"
@@ -90,7 +87,6 @@ config ARCH_AT91SAM9G20 
	select HAVE_AT91_USART4

	select HAVE_AT91_USART5

	select HAVE_NET_MACB

	select AT91_SAM9_ALT_RESET



config ARCH_AT91SAM9G45

	bool "AT91SAM9G45"
@@ -100,7 +96,6 @@ config ARCH_AT91SAM9G45 
	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU1

	select AT91_SAM9G45_RESET



config ARCH_AT91SAM9X5

	bool "AT91SAM9x5 family"
@@ -109,7 +104,6 @@ config ARCH_AT91SAM9X5 
	select HAVE_FB_ATMEL

	select HAVE_NET_MACB

	select HAVE_AT91_DBGU0

	select AT91_SAM9G45_RESET



config ARCH_AT91X40

	bool "AT91x40"