Commit a9f4b135 authored by Olof Johansson's avatar Olof Johansson
Browse files

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/5DB9593D.9050904@hisilicon.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 433b1e8a 88ae095b

arch/arm/mach-hisi/Kconfig

+6 −10
Original line number Diff line number Diff line
@@ -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
@@ -26,7 +25,6 @@ config ARCH_HI3xxx 


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
@@ -35,7 +33,6 @@ config ARCH_HIP01 


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

CRA Git | Maintained and supported by SUSTech CRA and CCSE