Commit 2c0b50fc authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-cleanup2' of... 

Merge tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup

Pull "Second batch of cleanup/SoC for 3.19" from Nicolas Ferre:

- fixes following legacy board removal
- removal of an unused config option CONFIG_MACH_SAMA5_DT
- move of some header files out of include/mach directory

* tag 'at91-cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91

:
  ARM: at91: move sdramc/ddrsdr header to include/soc/at91
  ARM: at91: remove CONFIG_MACH_SAMA5_DT
  ARM: at91: remove unused CONFIG_ARCH_AT91SAM9G45 option
  ARM: at91: remove useless init_time for DT-only SoCs
  ARM: at91: fix build breakage due to legacy board removals

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 86dd04a2 f0a0a58e

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -861,6 +861,7 @@ W: http://maxim.org.za/at91_26.html 
W:	http://www.linux4sam.org

S:	Supported

F:	arch/arm/mach-at91/

F:	include/soc/at91/

F:	arch/arm/boot/dts/at91*.dts

F:	arch/arm/boot/dts/at91*.dtsi

F:	arch/arm/boot/dts/sama*.dts

arch/arm/configs/sama5_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ CONFIG_ARCH_AT91=y 
CONFIG_SOC_SAM_V7=y

CONFIG_SOC_SAMA5D3=y

CONFIG_SOC_SAMA5D4=y

CONFIG_MACH_SAMA5_DT=y

CONFIG_AEABI=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_ZBOOT_ROM_TEXT=0x0

arch/arm/mach-at91/Kconfig

+1 −9
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ config SOC_SAMA5 
	select USE_OF

	select MEMORY

	select ATMEL_SDRAMC

	select PHYLIB if NETDEVICES



menu "Atmel AT91 System-on-Chip"
@@ -207,15 +208,6 @@ config MACH_AT91SAM9_DT 
	  Select this if you want to experiment device-tree with

	  an Atmel Evaluation Kit.



config MACH_SAMA5_DT

	bool "Atmel SAMA5 Evaluation Kits with device-tree support"

	depends on SOC_SAMA5

	select USE_OF

	select PHYLIB if NETDEVICES

	help

	  Select this if you want to experiment device-tree with

	  an Atmel Evaluation Kit.



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



comment "AT91 Feature Selections"

arch/arm/mach-at91/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o 
obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o



# SAMA5 board with device-tree

obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o

obj-$(CONFIG_SOC_SAMA5)		+= board-dt-sama5.o



# Drivers

obj-y				+= leds.o

arch/arm/mach-at91/Makefile.boot

+0 −6
Original line number Diff line number Diff line
@@ -3,12 +3,6 @@ 
#   PARAMS_PHYS must be within 4MB of ZRELADDR

#   INITRD_PHYS must be in RAM



ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)

   zreladdr-y	+= 0x70008000

params_phys-y	:= 0x70000100

initrd_phys-y	:= 0x70410000

else

   zreladdr-y	+= 0x20008000

params_phys-y	:= 0x20000100

initrd_phys-y	:= 0x20410000
 
endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE