diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-11 00:07:15 (GMT) |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-11 00:07:15 (GMT) |
| commit | 259413afbf21c5e774e5aa2c633257b2952ece31 (patch) | |
| tree | 4369878f6728431c6ae461724280721560b5feb6 /arch/arm64 | |
| parent | 7609ea2a3fb554da4948d0c7c21ea1b79673f4fb (diff) | |
| parent | 85fe946e8c8485d868edcbdcef78f04e4a259a6a (diff) | |
| download | linux-259413afbf21c5e774e5aa2c633257b2952ece31.tar.xz | |
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
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 7796af4..cb8fa34 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -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 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 2ed7449..1d293ea 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -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 |