--- zzzz-none-000/linux-3.10.107/arch/arm/mach-u300/Kconfig	2017-06-27 09:49:32.000000000 +0000
+++ scorpion-7490-727/linux-3.10.107/arch/arm/mach-u300/Kconfig	2021-02-04 17:41:59.000000000 +0000
@@ -1,24 +1,35 @@
-if ARCH_U300
-
-menu "ST-Ericsson AB U300/U335 Platform"
-
-comment "ST-Ericsson Mobile Platform Products"
-
-config MACH_U300
-	bool "U300"
+menuconfig ARCH_U300
+	bool "ST-Ericsson U300 Series" if ARCH_MULTI_V5
+	depends on MMU
+	select ARCH_REQUIRE_GPIOLIB
+	select ARM_AMBA
+	select ARM_VIC
+	select CLKSRC_MMIO
+	select CPU_ARM926T
+	select HAVE_TCM
 	select PINCTRL
 	select PINCTRL_COH901
 	select PINCTRL_U300
+	select MFD_SYSCON
+	help
+	  Support for ST-Ericsson U300 series mobile platforms.
+
+if ARCH_U300
 
-comment "ST-Ericsson U300/U335 Feature Selections"
+config MACH_U300
+	depends on ARCH_U300
+	bool "U300"
+	default y
 
 config U300_DEBUG
+	depends on ARCH_U300
 	bool "Debug support for U300"
 	depends on PM
 	help
 		Debug support for U300 in sysfs, procfs etc.
 
 config MACH_U300_SPIDUMMY
+	depends on ARCH_U300
 	bool "SSP/SPI dummy chip"
 	select SPI
 	select SPI_MASTER
@@ -30,6 +41,4 @@
 		you don't need it. Selecting this will activate the
 		SPI framework and ARM PL022 support.
 
-endmenu
-
 endif