openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJduTJpAAoJEAvIV27ZiWZcHKEP/RTKGKLQeLblcdhRh9SdzyXZ
 qJoUN6g2CLsMi69DbvOj9ikVz1+97jL8CvmoHWFKLX2/SbCRHWzbl0VUkRmIr9Yz
 NQFh740cE86GhBjiNpVGjScyt3WT/EE0l0P6UO4m6On+ZU7bZD4luVhFEWKxS6SD
 FD/tE3dF9Kjcs7o9eKYWhdDn4K/6E1EDBGcl3fvmEw/WeYoy8O7Lkyy6WvMNplUW
 N6Yoea9C8YeZsVxfR6xo024AYahkIYc6SSy3pdfyYldmeLMnCnGzAREGC8P6fWo7
 YMFhQg5ItEReXazKVePfyvAnOV3dDHykCgEF9xek1ECFzPRHIB+0VPvMFCTlmhS6
 r/fbk73UveBhTsgYN3zjE0VwMG/pPK6GZpd/S+znLA52Yts0qoFnNayIOKvLz/sb
 YhgZGkFTHH5CnaALl6EUsaNkWGTuyMlgybNHcpNXmV/nitaUxB66jjJntSB6AGRd
 WNg4ZnQiEeMEZczioArKe+oaVlpgJr+T2CLMe1PoLr75OXC1wzTeZwV7wBYqlOLm
 Cluk4tXAm9liq/Bip867pHmtlyHI9YLlxg7M44UxpNSn+48qTZO18vLoxqXVH4MH
 S3+6w9sq3kkyoizECSVNebJq8FBQzcyoSVmk1gBsGqN6MYt1yjyXt+X0xCGTx9ym
 jzljqzg6cDlDDtX5CXMn
 =5K1D
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-11-03 16:55:16 -08:00
parent 433b1e8a6c 88ae095b28
commit a9f4b135d1
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mach-hisi/Kconfig
View File

@ -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