On Tue, Sep 06, 2011 at 08:55:45PM +0200, Arnd Bergmann wrote:

On Tuesday 06 September 2011 17:58:39 Shawn Guo wrote:

quoted

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 13e0301..3364b59 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig

@@ -624,3 +624,16 @@ config MACH_VPR200
 	  configurations for the board and its peripherals.
 
 endif
+
+if ARCH_MX6
+comment "i.MX6 machines:"
+
+config MACH_IMX6Q
+	bool "Support i.MX6 Quad platforms from device tree"
+	select SOC_IMX6Q
+	select USE_OF
+	help
+	  Include support for Freescale i.MX6 Quad based platforms
+	  using the device tree for discovery
+
+endif

As we have done on zynq and prima2, I would suggest not to add multiple
machines types at all. You already have the intialization in a generic
imx6q file, it would be logical to get rid of the configuration entry
as well.

This MACH_IMX6Q was added to make the IMX6Q Kconfig hierarchy look
consistent with other SoCs in arch/arm/mach-imx/Kconfig.  If you
do not like it, I can kill it.

-- 
Regards,
Shawn