From 0d54cfa7adaa7c22abbf4b8cc8d42fdbad25b971 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 29 Feb 2016 13:17:18 -0600
Subject: [PATCH] i.MX6: Some tweaks to the Kconfig files

---
 arch/arm/Kconfig          |  2 ++
 arch/arm/src/imx6/Kconfig | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7a735a4846..485a84f5e3 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -66,6 +66,8 @@ config ARCH_CHIP_IMX1
 config ARCH_CHIP_IMX6
 	bool "NXP/Freescale iMX.6"
 	select ARCH_CORTEXA9
+	select ARCH_HAVE_MULTICPU
+	select ARMV7A_HAVE_L2CC_PL310
 	select ARCH_HAVE_FPU
 	select ARCH_HAVE_LOWVECTORS
 	select ARCH_HAVE_SDRAM
diff --git a/arch/arm/src/imx6/Kconfig b/arch/arm/src/imx6/Kconfig
index e1ad4edc50..a6c36bf210 100644
--- a/arch/arm/src/imx6/Kconfig
+++ b/arch/arm/src/imx6/Kconfig
@@ -5,7 +5,27 @@
 
 if ARCH_CHIP_IMX6
 
-# choice "iMX.6 Chip Selection"
+menu "iMX.6 Chip Selection"
+
+choice
+	prompt "iMX.6 Core Configuration"
+	default IMX6_6QUAD
+
+config ARCH_CHIP_IMX6_6DUAL
+	bool "i.MX 6Dual"
+
+config ARCH_CHIP_IMX6_6QUAD
+	bool "i.MX 6Quad"
+
+endchoice # iMX.6 Chip Selection
+
+config IMX6_HAVE_HDCP
+	bool "HDCP enabled"
+	default n
+	---help---
+		HDCP - High-bandwidth Digital Content Protection
+
+endmenu # "iMX.6 Chip Selection"
 
 menu "iMX.6 Peripheral Selection"