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

Commit aa42587a authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

ARM: S5PV210: Enable multi-platform build support 



This makes it possible to enable the s5pv210 platform as part of a
multiplatform kernel. Also redundant Kconfig options are removed.

Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 6d4ed0f4

arch/arm/Kconfig

+2 −21
Original line number Diff line number Diff line
@@ -758,26 +758,6 @@ config ARCH_S3C64XX 
	help

	  Samsung S3C64XX series based systems



config ARCH_S5PV210

	bool "Samsung S5PV210/S5PC110"

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_SPARSEMEM_ENABLE

	select ATAGS

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK_SAMSUNG

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_GPIO_H

	select NEED_MACH_MEMORY_H

	select SAMSUNG_ATAGS

	help

	  Samsung S5PV210/S5PC110 series based systems



config ARCH_DAVINCI

	bool "TI DaVinci"

	select ARCH_HAS_HOLES_MEMORYMODEL
@@ -1515,7 +1495,8 @@ config ARM_PSCI 
config ARCH_NR_GPIO

	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX

	default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \

		SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210

	default 416 if ARCH_SUNXI

	default 392 if ARCH_U8500

	default 352 if ARCH_VT8500

arch/arm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -210,11 +210,11 @@ machine-$(CONFIG_PLAT_SPEAR) += spear 
plat-$(CONFIG_ARCH_EXYNOS)	+= samsung

plat-$(CONFIG_ARCH_OMAP)	+= omap

plat-$(CONFIG_ARCH_S3C64XX)	+= samsung

plat-$(CONFIG_ARCH_S5PV210)	+= samsung

plat-$(CONFIG_PLAT_IOP)		+= iop

plat-$(CONFIG_PLAT_ORION)	+= orion

plat-$(CONFIG_PLAT_PXA)		+= pxa

plat-$(CONFIG_PLAT_S3C24XX)	+= samsung

plat-$(CONFIG_PLAT_S5P)		+= samsung

plat-$(CONFIG_PLAT_VERSATILE)	+= versatile



ifeq ($(CONFIG_ARCH_EBSA110),y)
@@ -238,7 +238,7 @@ MACHINE := 
endif



machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))

platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y))

platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y)))



ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y)

ifeq ($(KBUILD_SRC),)

arch/arm/mach-s5pv210/Kconfig

+16 −20
Original line number Diff line number Diff line
@@ -7,32 +7,28 @@ 


# Configuration options for the S5PV210/S5PC110



config ARCH_S5PV210

	bool "Samsung S5PV210/S5PC110" if ARCH_MULTI_V7

	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_REQUIRE_GPIOLIB

	select ARM_VIC

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS

	help

	  Samsung S5PV210/S5PC110 series based systems



if ARCH_S5PV210



config CPU_S5PV210

	bool

	def_bool y

	select ARM_AMBA

	select PL330_DMA if DMADEVICES

	select S5P_EXT_INT

	help

	  Enable S5PV210 CPU support



menu "S5PV210 Machines"



config MACH_S5PV210_DT

	bool "Samsung S5PV210/S5PC110 machine using Device Tree"

	select CLKSRC_OF

	select CPU_S5PV210

	select PINCTRL

	select PINCTRL_EXYNOS

	select USE_OF

	help

	  Machine support for Samsung S5PV210/S5PC110 machines with Device Tree

	  enabled.

	  Select this if a fdt blob is available for your S5PV210 SoC based

	  board.

	  Note: This is under development and not all peripherals can be

	  supported with this machine file.

endmenu



endif

arch/arm/mach-s5pv210/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#

# Licensed under GPLv2



ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include



obj-y				:=

obj-m				:=

obj-n				:=
@@ -16,7 +18,4 @@ obj-$(CONFIG_PM_SLEEP) += pm.o sleep.o 


# machine support



obj-$(CONFIG_MACH_S5PV210_DT)	+= s5pv210.o

# device support



obj-y					+= setup-i2c0.o
 
obj-y				+= s5pv210.o

arch/arm/mach-s5pv210/Makefile.boot

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
   zreladdr-y	+= 0x20008000

params_phys-y	:= 0x20000100