imx: upstream kernel versions have been updated

linux-imx is now new enough, so it doesn't require perf patches.
DL version of nitrogen6_max is not supported.

Change-Id: Ic5d6fce0f1ed904aed3795d4f82abc5f71b16b30
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>

3 files changed, 0 insertions, 8 deletions

diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 819960d..0b41513 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -28,7 +28,6 @@ BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
     ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:imx6dl-nitrogen6_max.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \
     6x_bootscript-${MACHINE}:6x_bootscript \
     6x_upgrade-${MACHINE}:6x_upgrade \
@@ -38,7 +37,6 @@ BOOTFS_CONTENT = "\
     ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \
     ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \
-    ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:update/imx6dl-nitrogen6_max.dtb \
     ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \
     update/platform:update/platform \
     "
diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
index 1d7f942..1d7f942 100644
--- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend
diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
index 6861aff..e12bde0 100644
--- a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend
+++ b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend
@@ -20,12 +20,6 @@
 ##
 #############################################################################
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/../../../recipes/linux/linux:"
-SRC_URI += "\
-    file://ARM-perf-add-support-for-perf-registers-API.diff \
-    file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \
-    "
-
 # kernel image files are not needed in the image
 RDEPENDS_kernel-base = ""