fsl: update freescale meta layers & related .bbappend entries

* Update meta-freescale & meta-freescale-3rdparty layers to the latest
  SHA1s in morty branches
* Update related meta-boot2qt/meta-fsl-extras .bbappend entries by
  removing duplicate/obsolete entries
* Update CMA-reserved-size patch for nitrogen6x
* Remove Add-recovery-support patch

Change-Id: Ifa1063d7b8bb4f76eea0c9c735f483136d2cd8bb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

4 files changed, 0 insertions, 14 deletions

diff --git a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
index c4e0158..9a50c92 100644
--- a/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-fslc-imx_4.%.bbappend
@@ -35,12 +35,7 @@ do_preconfigure_prepend() {
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 
     # Enable USB serial support
-    echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
     echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
 
     echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
-    echo "CONFIG_FHANDLE=y"                 >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
index c4e0158..208ec74 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_4.%.bbappend
@@ -35,11 +35,7 @@ do_preconfigure_prepend() {
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
 
     # Enable USB serial support
-    echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
     echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_ACM=m"                 >> ${WORKDIR}/defconfig
 
     echo "CONFIG_NAMESPACES=y"              >> ${WORKDIR}/defconfig
     echo "CONFIG_FHANDLE=y"                 >> ${WORKDIR}/defconfig
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
index f8fac0d..58c64de 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_3.14.%.bbappend
@@ -33,5 +33,4 @@ RDEPENDS_kernel-base = ""
 do_preconfigure_prepend () {
     # FunctionFS for adb
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
 }
diff --git a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
index 5830238..431005b 100644
--- a/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-toradex_4.%.bbappend
@@ -32,9 +32,5 @@ RDEPENDS_kernel-base = "kernel-image kernel-devicetree"
 do_preconfigure_prepend () {
     # FunctionFS for adb
     echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-    echo "CONFIG_USB_ACM=m"         >> ${WORKDIR}/defconfig
     echo "TOUCHSCREEN_FUSION_F0710A=y" >> ${WORKDIR}/defconfig
-
-    echo "CONFIG_EXTCON=y"          >> ${WORKDIR}/defconfig
-    echo "CONFIG_EXTCON_USB_GPIO=y" >> ${WORKDIR}/defconfig
 }