---

yaml
---
r: 295544
b: refs/heads/master
c: ded547a
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67ae14fcaf1b73ffd91feff630dc5911b20d5394
+refs/heads/master: ded547a443723f0f29bce513356fe10f96cae315

trunk/arch/arm/mach-ux500/Kconfig

@@ -9,46 +9,50 @@ config UX500_SOC_COMMON
 	select ARM_ERRATA_754322
 	select ARM_ERRATA_764369
 
-menu "Ux500 SoC"
-
 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
-
 menu "Ux500 target platform (boards)"
 
 config MACH_U8500
 	bool "U8500 Development platform"
-	depends on UX500_SOC_DB8500
+	select UX500_SOC_DB8500
 	select TPS6105X
 	help
 	  Include support for the mop500 development platform.
 
 config MACH_HREFV60
        bool "U85000 Development platform, HREFv60 version"
-       depends on UX500_SOC_DB8500
+       select UX500_SOC_DB8500
        help
          Include support for the HREFv60 new development platform.
 
 config MACH_SNOWBALL
 	bool "U8500 Snowball platform"
-	depends on UX500_SOC_DB8500
 	select MACH_U8500
 	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_U8500
+	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_U8500.
 endmenu
 
 config UX500_DEBUG_UART