2 files changed, 15 insertions, 3 deletions

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index a1e21e81b7aa..14c7e4a541c8 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -156,7 +156,7 @@ machine-$(CONFIG_ARCH_EP93XX)		+= ep93xx
 machine-$(CONFIG_ARCH_EXYNOS)           += exynos
 machine-$(CONFIG_ARCH_GEMINI)           += gemini
 machine-$(CONFIG_ARCH_HIGHBANK)         += highbank
-machine-$(CONFIG_ARCH_HI3xxx)           += hisi
+machine-$(CONFIG_ARCH_HISI)             += hisi
 machine-$(CONFIG_ARCH_INTEGRATOR)       += integrator
 machine-$(CONFIG_ARCH_IOP13XX)          += iop13xx
 machine-$(CONFIG_ARCH_IOP32X)           += iop32x
diff --git a/arch/arm/mach-hisi/Kconfig b/arch/arm/mach-hisi/Kconfig
index feee4dbb0760..da16efd3c927 100644
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
@@ -1,8 +1,16 @@
-config ARCH_HI3xxx
-        bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7
+config ARCH_HISI
+        bool "Hisilicon SoC Support"
+        depends on ARCH_MULTIPLATFORM
         select ARM_AMBA
         select ARM_GIC
         select ARM_TIMER_SP804
+
+if ARCH_HISI
+
+menu "Hisilicon platform type"
+
+config ARCH_HI3xxx
+        bool "Hisilicon Hi36xx/Hi37xx family" if ARCH_MULTI_V7
         select CACHE_L2X0
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
@@ -10,3 +18,7 @@ config ARCH_HI3xxx
         select PINCTRL_SINGLE
         help
           Support for Hisilicon Hi36xx/Hi37xx processor family
+
+endmenu
+
+endif