diff options
| author | Olof Johansson <[email protected]> | 2019-11-03 16:55:16 -0800 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2019-11-03 16:55:17 -0800 |
| commit | a9f4b135d1c6837e420de75a38663e1118e74d3b (patch) | |
| tree | 66eb590630d99cc62aad413efb7dbe095e61fc9d | |
| parent | 433b1e8a6cd9cfa3f003d592c11eb3b2f8e92046 (diff) | |
| parent | 88ae095b2855c5caf18cc476b03f5b0c96b040a2 (diff) | |
Merge tag 'hisi-armv7-soc-for-5.5' of git://github.com/hisilicon/linux-hisi into arm/soc
ARM: mach-hisi: Hisilicon SoC updates for 5.5
- drop the ARCH_MULTI_V7 dependency in the sub-menu of ARCH_HISI
since ARCH_HISI depends on ARCH_MULTI_V7
* tag 'hisi-armv7-soc-for-5.5' of git://github.com/hisilicon/linux-hisi:
ARM: hisi: drop useless depend on ARCH_MULTI_V7
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Olof Johansson <[email protected]>
| -rw-r--r-- | arch/arm/mach-hisi/Kconfig | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig index 98338a489921..3b010fe7c0e9 100644 --- a/arch/arm/mach-hisi/Kconfig +++ b/arch/arm/mach-hisi/Kconfig @@ -15,7 +15,6 @@ menu "Hisilicon platform type" config ARCH_HI3xxx bool "Hisilicon Hi36xx family" - depends on ARCH_MULTI_V7 select CACHE_L2X0 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP @@ -25,17 +24,15 @@ config ARCH_HI3xxx Support for Hisilicon Hi36xx SoC family config ARCH_HIP01 - bool "Hisilicon HIP01 family" - depends on ARCH_MULTI_V7 - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP - select ARM_GLOBAL_TIMER - help - Support for Hisilicon HIP01 SoC family + bool "Hisilicon HIP01 family" + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if SMP + select ARM_GLOBAL_TIMER + help + Support for Hisilicon HIP01 SoC family config ARCH_HIP04 bool "Hisilicon HiP04 Cortex A15 family" - depends on ARCH_MULTI_V7 select ARM_ERRATA_798181 if SMP select HAVE_ARM_ARCH_TIMER select MCPM if SMP @@ -46,7 +43,6 @@ config ARCH_HIP04 config ARCH_HIX5HD2 bool "Hisilicon X5HD2 family" - depends on ARCH_MULTI_V7 select CACHE_L2X0 select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP |