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

Commit f962396c authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Arnd Bergmann
Browse files

ARM: davinci: support multiplatform build for ARM v5 



Add modifications necessary to make davinci part of the ARM v5
multiplatform build.

Move the arch-specific configuration out of arch/arm/Kconfig and
into mach-davinci/Kconfig. Remove the sub-menu for DaVinci
implementations (they'll be visible directly under the system type.
Select all necessary options not already selected by ARCH_MULTI_V5.
Update davinci_all_defconfig. Explicitly include the mach-specific
headers in mach-davinci/Makefile.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent a6fe8c77

arch/arm/Kconfig

+0 −22
Original line number Diff line number Diff line
@@ -509,28 +509,6 @@ config ARCH_S3C24XX 
	  (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the

	  Samsung SMDK2410 development board (and derivatives).



config ARCH_DAVINCI

	bool "TI DaVinci"

	select ARCH_HAS_HOLES_MEMORYMODEL

	select COMMON_CLK

	select CPU_ARM926T

	select DAVINCI_TIMER

	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GENERIC_IRQ_CHIP

	select GENERIC_IRQ_MULTI_HANDLER

	select GPIOLIB

	select HAVE_IDE

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM && OF

	select REGMAP_MMIO

	select RESET_CONTROLLER

	select SPARSE_IRQ

	select USE_OF

	select ZONE_DMA

	help

	  Support for TI's DaVinci platform.



config ARCH_OMAP1

	bool "TI OMAP1"

	depends on MMU

arch/arm/configs/davinci_all_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ CONFIG_MODVERSIONS=y 
CONFIG_PARTITION_ADVANCED=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_MULTIPLATFORM=y

CONFIG_ARCH_MULTI_V7=n

CONFIG_ARCH_MULTI_V5=y

CONFIG_ARCH_DAVINCI=y

CONFIG_ARCH_DAVINCI_DM644x=y

CONFIG_ARCH_DAVINCI_DM355=y
@@ -129,9 +132,11 @@ CONFIG_SPI=y 
CONFIG_SPI_DAVINCI=m

CONFIG_PINCTRL_DA850_PUPD=m

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_PCA953X_IRQ=y

CONFIG_RESET_CONTROLLER=y

CONFIG_POWER_RESET=y

CONFIG_POWER_RESET_GPIO=y

CONFIG_SYSCON_REBOOT_MODE=m

arch/arm/mach-davinci/Kconfig

+13 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



menuconfig ARCH_DAVINCI

	bool "TI DaVinci"

	depends on ARCH_MULTI_V5

	select DAVINCI_TIMER

	select ZONE_DMA

	select ARCH_HAS_HOLES_MEMORYMODEL

	select PM_GENERIC_DOMAINS if PM

	select PM_GENERIC_DOMAINS_OF if PM && OF

	select REGMAP_MMIO

	select HAVE_IDE

	select PINCTRL_SINGLE



if ARCH_DAVINCI



config ARCH_DAVINCI_DMx

	bool



menu "TI DaVinci Implementations"



comment "DaVinci Core Type"



config ARCH_DAVINCI_DM644x
@@ -225,6 +236,4 @@ config DAVINCI_MUX_WARNINGS 
	  to change the pin multiplexing setup. When there are no warnings

	  printed, it's safe to deselect DAVINCI_MUX for your product.



endmenu



endif

arch/arm/mach-davinci/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#

#



ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include



# Common objects

obj-y 					:= time.o serial.o usb.o \

					   common.o sram.o