From 5c881e6d2ebb00e6a8bf1426bed95b2830916651 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 4 Mar 2016 18:44:30 -0600
Subject: [PATCH] i.MX6: minor updates to last commit

---
 arch/arm/Kconfig             | 2 --
 arch/arm/include/imx6/chip.h | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 507a6718d7..0fc2fab9f9 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -66,8 +66,6 @@ config ARCH_CHIP_IMX1
 config ARCH_CHIP_IMX6
 	bool "NXP/Freescale iMX.6"
 	select ARCH_CORTEXA9
-	select ARCH_HAVE_MULTICPU
-	select ARMV7A_HAVE_GIC
 	select ARMV7A_HAVE_L2CC_PL310
 	select ARCH_HAVE_FPU
 	select ARCH_HAVE_LOWVECTORS
diff --git a/arch/arm/include/imx6/chip.h b/arch/arm/include/imx6/chip.h
index 14cfd061ff..1c595c99a0 100644
--- a/arch/arm/include/imx6/chip.h
+++ b/arch/arm/include/imx6/chip.h
@@ -102,8 +102,8 @@
 #  define IMX_OCRAM_SIZE   (256*1024)   /* Size of the On-Chip RAM (OCRAM) */
 #  define IMX_L2CACHE_SIZE (256*1024)   /* 256KB L2 Cache */
 #  define IMX_NXCPUS       1            /* One CPU */
-#  define IMX_NGPU3D       1            /* One 3D graphics engine */
-#  define IMX_N32SHADERS   1            /* One 3D shaders */
+#  undef  IMX_NGPU3D                    /* No 3D graphics engine */
+#  define IMX_N32SHADERS   0            /* No 3D shaders */
 #  define IMX_NGPU2D       1            /* One 2D graphics engine */
 #  undef  IMX_HAVE_DDR64                /* No 64-bit DDR3 */
 #  define IMX_HAVE_DDR32   1            /* 32-bit DDR3 */