diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 23:34:26 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-19 23:34:26 +0300 |
| commit | 6f9a53ee2376329a3e8d08d852cd08540b4070b2 (patch) | |
| tree | f56b688fa565988c05e52a009c031a9dbd73fab3 /arch/arm64/Kconfig.platforms | |
| parent | dc8c76dd821329bb739a30d3e506e47c96f82f5a (diff) | |
| parent | 12496aea0887fc067ad9ba0aa28798317f47a1e0 (diff) | |
| download | linux-6f9a53ee2376329a3e8d08d852cd08540b4070b2.tar.xz | |
Merge tag 'zte-soc64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/arm64
Pull "ZTE arm64 SoC changes for 4.9" from Shawn Guo:
- Add a Kconfig option for ZTE ZX SoC family support
* tag 'zte-soc64-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: add ZTE ZX SoC family
Diffstat (limited to 'arch/arm64/Kconfig.platforms')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 092c31551176..86e520ac3136 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -214,6 +214,11 @@ config ARCH_XGENE help This enables support for AppliedMicro X-Gene SOC Family +config ARCH_ZX + bool "ZTE ZX SoC Family" + help + This enables support for ZTE ZX SoC Family + config ARCH_ZYNQMP bool "Xilinx ZynqMP Family" help |