Commit c87b3e97 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

arm64: EXYNOS: Consolidate ARCH_EXYNOS7 symbol into ARCH_EXYNOS 



The ARMv8 Exynos family SoCs in Linux kernel are currently:
 - Exynos5433 (controlled by ARCH_EXYNOS),
 - Exynos7 (controlled by ARCH_EXYNOS7).

It duplicates Kconfig symbols unnecessarily, so consolidate them into
one ARCH_EXYNOS. Future SoCs could fall also under the ARCH_EXYNOS
symbol.

The commit should not bring any visible functional change.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: default avatarPankaj Dubey <pankaj.dubey@samsung.com>
Tested-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@samsung.com>
parent 203f974d

arch/arm64/Kconfig.platforms

+2 −9
Original line number Diff line number Diff line
@@ -14,21 +14,14 @@ config ARCH_BERLIN 
	  This enables support for Marvell Berlin SoC Family



config ARCH_EXYNOS

	bool

	help

	  This enables support for Samsung Exynos SoC family



config ARCH_EXYNOS7

	bool "ARMv8 based Samsung Exynos7"

	select ARCH_EXYNOS

	bool "ARMv8 based Samsung Exynos SoC family"

	select COMMON_CLK_SAMSUNG

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS



	help

	  This enables support for Samsung Exynos7 SoC family

	  This enables support for ARMv8 based Samsung Exynos SoC family.



config ARCH_LAYERSCAPE

	bool "ARMv8 based Freescale Layerscape SoC family"

arch/arm64/boot/dts/exynos/Makefile

+1 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb

dtb-$(CONFIG_ARCH_EXYNOS) += exynos7-espresso.dtb



always		:= $(dtb-y)

subdir-y	:= $(dts-dirs)

arch/arm64/configs/defconfig

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_IOSCHED_DEADLINE is not set

CONFIG_ARCH_BCM_IPROC=y

CONFIG_ARCH_BERLIN=y

CONFIG_ARCH_EXYNOS7=y

CONFIG_ARCH_EXYNOS=y

CONFIG_ARCH_LAYERSCAPE=y

CONFIG_ARCH_HISI=y

CONFIG_ARCH_MEDIATEK=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE