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

Commit 199642bf authored by Kukjin Kim's avatar Kukjin Kim
Browse files

ARM: SAMSUNG: merge plat-s5p into plat-samsung 



Since just plat-samsung can support all of Samsung stuff so
that there is no more need to keep the plat-s5p for S5P SoCs.

Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent e033ca9b

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1087,7 +1087,6 @@ source "arch/arm/mach-sa1100/Kconfig" 


source "arch/arm/plat-samsung/Kconfig"

source "arch/arm/plat-s3c24xx/Kconfig"

source "arch/arm/plat-s5p/Kconfig"



source "arch/arm/plat-spear/Kconfig"

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik 
plat-$(CONFIG_PLAT_ORION)	:= orion

plat-$(CONFIG_PLAT_PXA)		:= pxa

plat-$(CONFIG_PLAT_S3C24XX)	:= s3c24xx samsung

plat-$(CONFIG_PLAT_S5P)		:= s5p samsung

plat-$(CONFIG_PLAT_S5P)		:= samsung

plat-$(CONFIG_PLAT_SPEAR)	:= spear

plat-$(CONFIG_PLAT_VERSATILE)	:= versatile

arch/arm/plat-s5p/Kconfig

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
# arch/arm/plat-s5p/Kconfig

#

# Copyright (c) 2009 Samsung Electronics Co., Ltd.

#		http://www.samsung.com/

#

# Licensed under GPLv2



config PLAT_S5P

	bool

	depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)

	default y

	select ARM_VIC if !ARCH_EXYNOS

	select ARM_GIC if ARCH_EXYNOS

	select GIC_NON_BANKED if ARCH_EXYNOS4

	select NO_IOPORT

	select ARCH_REQUIRE_GPIOLIB

	select S3C_GPIO_TRACK

	select S5P_GPIO_DRVSTR

	select SAMSUNG_GPIOLIB_4BIT

	select PLAT_SAMSUNG

	select SAMSUNG_CLKSRC

	select SAMSUNG_IRQ_VIC_TIMER

	help

	  Base platform code for Samsung's S5P series SoC.

arch/arm/plat-s5p/Makefile

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
# arch/arm/plat-s5p/Makefile

#

# Copyright (c) 2009 Samsung Electronics Co., Ltd.

# 		http://www.samsung.com/

#

# Licensed under GPLv2



obj-y				:=

obj-m				:=

obj-n				:= dummy.o

obj-				:=

arch/arm/plat-samsung/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -13,6 +13,24 @@ config PLAT_SAMSUNG 
	help

	  Base platform code for all Samsung SoC based systems



config PLAT_S5P

	bool

	depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)

	default y

	select ARM_VIC if !ARCH_EXYNOS

	select ARM_GIC if ARCH_EXYNOS

	select GIC_NON_BANKED if ARCH_EXYNOS4

	select NO_IOPORT

	select ARCH_REQUIRE_GPIOLIB

	select S3C_GPIO_TRACK

	select S5P_GPIO_DRVSTR

	select SAMSUNG_GPIOLIB_4BIT

	select PLAT_SAMSUNG

	select SAMSUNG_CLKSRC

	select SAMSUNG_IRQ_VIC_TIMER

	help

	  Base platform code for Samsung's S5P series SoC.



if PLAT_SAMSUNG



# boot configurations