[meta-freescale] [meta-fsl-arm][PATCH v2 02/15] linux-imx-mfgtool: Upgrade to 3.10.31-1.1.0 Beta version

[Lauren Post]

Signed-off-by: Lauren Post <lauren.post at freescale.com>
---
 .../mx6/defconfig                                  |    5 ++++-
 ...ool_3.10.17.bb => linux-imx-mfgtool_3.10.31.bb} |    2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)
 rename recipes-kernel/linux/{linux-imx-mfgtool-3.10.17 => linux-imx-mfgtool-3.10.31}/mx6/defconfig (98%)
 rename recipes-kernel/linux/{linux-imx-mfgtool_3.10.17.bb => linux-imx-mfgtool_3.10.31.bb} (87%)

diff --git a/recipes-kernel/linux/linux-imx-mfgtool-3.10.17/mx6/defconfig b/recipes-kernel/linux/linux-imx-mfgtool-3.10.31/mx6/defconfig
similarity index 98%
rename from recipes-kernel/linux/linux-imx-mfgtool-3.10.17/mx6/defconfig
rename to recipes-kernel/linux/linux-imx-mfgtool-3.10.31/mx6/defconfig
index a4e880b..677eaa0 100644
--- a/recipes-kernel/linux/linux-imx-mfgtool-3.10.17/mx6/defconfig
+++ b/recipes-kernel/linux/linux-imx-mfgtool-3.10.31/mx6/defconfig
@@ -25,6 +25,7 @@ CONFIG_MACH_EUKREA_CPUIMX51SD=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
+CONFIG_SOC_IMX6SX=y
 CONFIG_SOC_VF610=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SMP=y
@@ -67,7 +68,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
 CONFIG_CMA=y
-CONFIG_CMA_SIZE_MBYTES=256
+CONFIG_CMA_SIZE_MBYTES=320
 CONFIG_IMX_WEIM=y
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
@@ -85,6 +86,8 @@ CONFIG_MTD_SST25L=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_NAND_MXC=y
+CONFIG_MTD_SPI_NOR_BASE=y
+CONFIG_SPI_FSL_QUADSPI=y
 CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
diff --git a/recipes-kernel/linux/linux-imx-mfgtool_3.10.17.bb b/recipes-kernel/linux/linux-imx-mfgtool_3.10.31.bb
similarity index 87%
rename from recipes-kernel/linux/linux-imx-mfgtool_3.10.17.bb
rename to recipes-kernel/linux/linux-imx-mfgtool_3.10.31.bb
index 1400973..5a0fb42 100644
--- a/recipes-kernel/linux/linux-imx-mfgtool_3.10.17.bb
+++ b/recipes-kernel/linux/linux-imx-mfgtool_3.10.31.bb
@@ -1,4 +1,6 @@
 # Copyright (C) 2014 O.S. Systems Software LTDA.
+# Copyright (C) 2014 Freescale Semiconductor
+
 SUMMARY = "Produces a Manufacturing Tool compatible Linux Kernel"
 DESCRIPTION = "Linux Kernel provided and supported by Freescale that produces a \
 Manufacturing Tool compatible Linux Kernel to be used in updater environment"
-- 
1.7.9.5