Commit ae3c5d74 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Kukjin Kim
Browse files

ARM: EXYNOS: remove CONFIG_MACH_EXYNOS[4, 5]_DT config options 



EXYNOS is now Device Tree (DT) only platform so it makes no sense to have
config options responsible for enabling platform specific DT support.

Moreover the kernel image won't even link if neither CONFIG_MACH_EXYNOS4_DT
nor CONFIG_MACH_EXYNOS5_DT config option is enabled (linker fails with "no
machine record defined" error).

Remove CONFIG_MACH_EXYNOS[4,5]_DT config options and just use the standard
CONFIG_ARCH_EXYNOS[4,5] ones instead.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent cbee750e

arch/arm/mach-exynos/Kconfig

+9 −29
Original line number Diff line number Diff line
@@ -14,19 +14,28 @@ menu "SAMSUNG EXYNOS SoCs Support" 
config ARCH_EXYNOS4

	bool "SAMSUNG EXYNOS4"

	default y

	select ARM_AMBA

	select CLKSRC_OF

	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210

	select CPU_EXYNOS4210

	select GIC_NON_BANKED

	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD

	select HAVE_ARM_SCU if SMP

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select PINCTRL

	select S5P_DEV_MFC

	help

	  Samsung EXYNOS4 SoCs based systems



config ARCH_EXYNOS5

	bool "SAMSUNG EXYNOS5"

	select ARM_AMBA

	select CLKSRC_OF

	select HAVE_ARM_SCU if SMP

	select HAVE_SMP

	select PINCTRL

	select USB_ARCH_HAS_XHCI

	help

	  Samsung EXYNOS5 (Cortex-A15) SoC based systems
@@ -110,35 +119,6 @@ config SOC_EXYNOS5440 
	help

	  Enable EXYNOS5440 SoC support



comment "Flattened Device Tree based board for EXYNOS SoCs"



config MACH_EXYNOS4_DT

	bool "Samsung Exynos4 Machine using device tree"

	default y

	depends on ARCH_EXYNOS4

	select ARM_AMBA

	select CLKSRC_OF

	select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210

	select CPU_EXYNOS4210

	select KEYBOARD_SAMSUNG if INPUT_KEYBOARD

	select S5P_DEV_MFC

	help

	  Machine support for Samsung Exynos4 machine with device tree enabled.

	  Select this if a fdt blob is available for the Exynos4 SoC based board.

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

	  with this machine file.



config MACH_EXYNOS5_DT

	bool "SAMSUNG EXYNOS5 Machine using device tree"

	default y

	depends on ARCH_EXYNOS5

	select ARM_AMBA

	select CLKSRC_OF

	select USB_ARCH_HAS_XHCI

	help

	  Machine support for Samsung EXYNOS5 machine with device tree enabled.

	  Select this if a fdt blob is available for the EXYNOS5 SoC based board.



endmenu



endif

arch/arm/mach-exynos/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -32,5 +32,5 @@ AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec) 


# machine support



obj-$(CONFIG_MACH_EXYNOS4_DT)		+= mach-exynos4-dt.o

obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 
obj-$(CONFIG_ARCH_EXYNOS4)	+= mach-exynos4-dt.o

obj-$(CONFIG_ARCH_EXYNOS5)	+= mach-exynos5-dt.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE