projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
Kconfig.platforms
diff --git
a/arch/arm64/Kconfig.platforms
b/arch/arm64/Kconfig.platforms
index 23800a19a7bc5cc5bafc48c79e20fcb335ae97ea..4043c35962cca5411e4edf26c0fa8da50ab9fda9 100644
(file)
--- a/
arch/arm64/Kconfig.platforms
+++ b/
arch/arm64/Kconfig.platforms
@@
-7,6
+7,7
@@
config ARCH_BCM_IPROC
config ARCH_BERLIN
bool "Marvell Berlin SoC Family"
config ARCH_BERLIN
bool "Marvell Berlin SoC Family"
+ select ARCH_REQUIRE_GPIOLIB
select DW_APB_ICTL
help
This enables support for Marvell Berlin SoC Family
select DW_APB_ICTL
help
This enables support for Marvell Berlin SoC Family
@@
-28,10
+29,10
@@
config ARCH_EXYNOS7
help
This enables support for Samsung Exynos7 SoC family
help
This enables support for Samsung Exynos7 SoC family
-config ARCH_
FSL_LS2085A
- bool "
Freescale LS2085A SOC
"
+config ARCH_
LAYERSCAPE
+ bool "
ARMv8 based Freescale Layerscape SoC family
"
help
help
- This enables support for
Freescale LS2085A SOC
.
+ This enables support for
the Freescale Layerscape SoC family
.
config ARCH_HISI
bool "Hisilicon SoC Family"
config ARCH_HISI
bool "Hisilicon SoC Family"
@@
-66,6
+67,11
@@
config ARCH_SEATTLE
help
This enables support for AMD Seattle SOC Family
help
This enables support for AMD Seattle SOC Family
+config ARCH_STRATIX10
+ bool "Altera's Stratix 10 SoCFPGA Family"
+ help
+ This enables support for Altera's Stratix 10 SoCFPGA Family.
+
config ARCH_TEGRA
bool "NVIDIA Tegra SoC Family"
select ARCH_HAS_RESET_CONTROLLER
config ARCH_TEGRA
bool "NVIDIA Tegra SoC Family"
select ARCH_HAS_RESET_CONTROLLER