1 files changed, 27 insertions, 19 deletions

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 52af00446a63..9ec635812349 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -5,50 +5,58 @@ config UX500_SOC_COMMON
         default y
         select ARM_GIC
         select HAS_MTU
-        select ARM_ERRATA_753970
+        select PL310_ERRATA_753970
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369
-
-menu "Ux500 SoC"
+        select CACHE_L2X0
 
 config UX500_SOC_DB5500
-        bool "DB5500"
+        bool
         select MFD_DB5500_PRCMU
 
 config UX500_SOC_DB8500
-        bool "DB8500"
+        bool
         select MFD_DB8500_PRCMU
         select REGULATOR_DB8500_PRCMU
-
-endmenu
+        select CPU_FREQ_TABLE if CPU_FREQ
 
 menu "Ux500 target platform (boards)"
 
-config MACH_U8500
-        bool "U8500 Development platform"
-        depends on UX500_SOC_DB8500
-        select TPS6105X
+config MACH_MOP500
+        bool "U8500 Development platform, MOP500 versions"
+        select UX500_SOC_DB8500
+        select I2C
+        select I2C_NOMADIK
         help
-          Include support for the mop500 development platform.
+          Include support for the MOP500 development platform.
 
 config MACH_HREFV60
-       bool "U85000 Development platform, HREFv60 version"
-       depends on UX500_SOC_DB8500
-       help
-         Include support for the HREFv60 new development platform.
+        bool "U8500 Development platform, HREFv60 version"
+        select MACH_MOP500
+        help
+          Include support for the HREFv60 new development platform.
+          Includes HREFv70, v71 etc.
 
 config MACH_SNOWBALL
         bool "U8500 Snowball platform"
-        depends on UX500_SOC_DB8500
-        select MACH_U8500
+        select MACH_MOP500
         help
           Include support for the snowball development platform.
 
 config MACH_U5500
         bool "U5500 Development platform"
-        depends on UX500_SOC_DB5500
+        select UX500_SOC_DB5500
         help
           Include support for the U5500 development platform.
+
+config UX500_AUTO_PLATFORM
+        def_bool y
+        depends on !MACH_U5500
+        select MACH_MOP500
+        help
+          At least one platform needs to be selected in order to build
+          a working kernel. If everything else is disabled, this
+          automatically enables MACH_MOP500.
 endmenu
 
 config UX500_DEBUG_UART