diff options
-rw-r--r-- | conf/distro/include/nitrogen6x.conf | 2 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend (renamed from meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend) | 0 | ||||
-rw-r--r-- | meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend (renamed from meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend) | 6 |
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 = "\ | |||
28 | ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \ | 28 | ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \ |
29 | ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \ | 29 | ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \ |
30 | ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \ | 30 | ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:imx6dl-nit6xlite.dtb \ |
31 | ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:imx6dl-nitrogen6_max.dtb \ | ||
32 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ | 31 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:imx6q-nitrogen6_max.dtb \ |
33 | 6x_bootscript-${MACHINE}:6x_bootscript \ | 32 | 6x_bootscript-${MACHINE}:6x_bootscript \ |
34 | 6x_upgrade-${MACHINE}:6x_upgrade \ | 33 | 6x_upgrade-${MACHINE}:6x_upgrade \ |
@@ -38,7 +37,6 @@ BOOTFS_CONTENT = "\ | |||
38 | ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \ | 37 | ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:update/imx6dl-${MACHINE}.dtb \ |
39 | ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \ | 38 | ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:update/imx6q-sabrelite.dtb \ |
40 | ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \ | 39 | ${KERNEL_IMAGETYPE}-imx6dl-nit6xlite.dtb:update/imx6dl-nit6xlite.dtb \ |
41 | ${KERNEL_IMAGETYPE}-imx6dl-nitrogen6_max.dtb:update/imx6dl-nitrogen6_max.dtb \ | ||
42 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \ | 40 | ${KERNEL_IMAGETYPE}-imx6q-nitrogen6_max.dtb:update/imx6q-nitrogen6_max.dtb \ |
43 | update/platform:update/platform \ | 41 | update/platform:update/platform \ |
44 | " | 42 | " |
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 @@ | |||
20 | ## | 20 | ## |
21 | ############################################################################# | 21 | ############################################################################# |
22 | 22 | ||
23 | FILESEXTRAPATHS_prepend := "${THISDIR}/../../../recipes/linux/linux:" | ||
24 | SRC_URI += "\ | ||
25 | file://ARM-perf-add-support-for-perf-registers-API.diff \ | ||
26 | file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ | ||
27 | " | ||
28 | |||
29 | # kernel image files are not needed in the image | 23 | # kernel image files are not needed in the image |
30 | RDEPENDS_kernel-base = "" | 24 | RDEPENDS_kernel-base = "" |
31 | 25 | ||