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

Commit 259413af authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'hi6220-soc-for-4.2' of git://github.com/hisilicon/linux-hisi into next/soc 

ARM64: Hisilicon ARM64 SoC Updates for V4.2

- Added Hisilicon ARM64 SoC family support in Kconfig and defconfig

* tag 'hi6220-soc-for-4.2' of git://github.com/hisilicon/linux-hisi:
  arm64: Enable Hisilicon ARMv8 SoC family in Kconfig and defconfig
parents 7609ea2a 85fe946e

arch/arm64/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -181,6 +181,11 @@ config ARCH_FSL_LS2085A 
	help

	  This enables support for Freescale LS2085A SOC.



config ARCH_HISI

	bool "Hisilicon SoC Family"

	help

	  This enables support for Hisilicon ARMv8 SoC family



config ARCH_MEDIATEK

	bool "Mediatek MT65xx & MT81xx ARMv8 SoC"

	select ARM_GIC

arch/arm64/configs/defconfig

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

CONFIG_ARCH_EXYNOS7=y

CONFIG_ARCH_FSL_LS2085A=y

CONFIG_ARCH_HISI=y

CONFIG_ARCH_MEDIATEK=y

CONFIG_ARCH_SEATTLE=y

CONFIG_ARCH_TEGRA=y