Skip to content

Commit 7685b12

Browse files
hzhuang1olofj
authored andcommitted
ARM: hisi: add ARCH_HISI
Since multiple ARCH configuration will be appended into mach-hisi directory, add ARCH_HISI as common configuration for different platforms in mach-hisi. Signed-off-by: Haojian Zhuang <[email protected]> Acked-by: Wei Xu <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
1 parent 21b9554 commit 7685b12

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

arch/arm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ machine-$(CONFIG_ARCH_EP93XX) += ep93xx
156156
machine-$(CONFIG_ARCH_EXYNOS) += exynos
157157
machine-$(CONFIG_ARCH_GEMINI) += gemini
158158
machine-$(CONFIG_ARCH_HIGHBANK) += highbank
159-
machine-$(CONFIG_ARCH_HI3xxx) += hisi
159+
machine-$(CONFIG_ARCH_HISI) += hisi
160160
machine-$(CONFIG_ARCH_INTEGRATOR) += integrator
161161
machine-$(CONFIG_ARCH_IOP13XX) += iop13xx
162162
machine-$(CONFIG_ARCH_IOP32X) += iop32x

arch/arm/mach-hisi/Kconfig

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
1-
config ARCH_HI3xxx
2-
bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7
1+
config ARCH_HISI
2+
bool "Hisilicon SoC Support"
3+
depends on ARCH_MULTIPLATFORM
34
select ARM_AMBA
45
select ARM_GIC
56
select ARM_TIMER_SP804
7+
8+
if ARCH_HISI
9+
10+
menu "Hisilicon platform type"
11+
12+
config ARCH_HI3xxx
13+
bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7
614
select CACHE_L2X0
715
select HAVE_ARM_SCU if SMP
816
select HAVE_ARM_TWD if SMP
917
select PINCTRL
1018
select PINCTRL_SINGLE
1119
help
1220
Support for Hisilicon Hi36xx/Hi37xx processor family
21+
22+
endmenu
23+
24+
endif

0 commit comments

Comments
 (0)