diff options
| author | Mahesh Mahadevan <mahesh.mahadevan@freescale.com> | 2012-09-28 15:22:01 -0500 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-09-28 17:20:07 -0300 |
| commit | da40e8fa317e609fcaa6f9b1cd6acf027305b03a (patch) | |
| tree | fc6453fa8ded023173fe7cc1d45bbcb9a11911bc | |
| parent | 63d9b97403b3514f2166d2d92a3dbf8966a43b1b (diff) | |
| download | meta-freescale-da40e8fa317e609fcaa6f9b1cd6acf027305b03a.tar.gz | |
linux-imx (2.6.35.3): Update to newer GIT versions
This removes the patch to fix build issues with the perf tool,
an equivalent fix from open-source kernel was added to the Freescale
GIT. The kernel has been updated to mxs and mx5 SoCs.
Signed-off-by: Mahesh Mahadevan <mahesh.mahadevan@freescale.com>
| -rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Allow-building-with-gcc-4.6.patch | 28 | ||||
| -rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb | 7 |
2 files changed, 3 insertions, 32 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Allow-building-with-gcc-4.6.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Allow-building-with-gcc-4.6.patch deleted file mode 100644 index ab14abfbb..000000000 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Allow-building-with-gcc-4.6.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | From 45e0440a7bf7b1549de7af0e6ce62fc0c73b4b51 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
| 3 | Date: Mon, 24 Sep 2012 09:02:31 -0300 | ||
| 4 | Subject: [PATCH] perf tools: Allow building with gcc 4.6 | ||
| 5 | |||
| 6 | The option -Wno-unused-but-set-variable has been add to EXTRA_WARNINGS | ||
| 7 | to allow building with newer gcc versions. | ||
| 8 | |||
| 9 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
| 10 | --- | ||
| 11 | tools/perf/Makefile | 1 + | ||
| 12 | 1 file changed, 1 insertion(+) | ||
| 13 | |||
| 14 | diff --git a/tools/perf/Makefile b/tools/perf/Makefile | ||
| 15 | index d75c28a..817872e 100644 | ||
| 16 | --- a/tools/perf/Makefile | ||
| 17 | +++ b/tools/perf/Makefile | ||
| 18 | @@ -217,6 +217,7 @@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wnested-externs | ||
| 19 | EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wold-style-definition | ||
| 20 | EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes | ||
| 21 | EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wdeclaration-after-statement | ||
| 22 | +EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wno-unused-but-set-variable | ||
| 23 | |||
| 24 | ifeq ("$(origin DEBUG)", "command line") | ||
| 25 | PERF_DEBUG = $(DEBUG) | ||
| 26 | -- | ||
| 27 | 1.7.10.4 | ||
| 28 | |||
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb index 20c77b8a8..e3bc57025 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb | |||
| @@ -1,23 +1,22 @@ | |||
| 1 | # Copyright (C) 2011-2012 Freescale Semiconductor | 1 | # Copyright (C) 2011-2012 Freescale Semiconductor |
| 2 | # Released under the MIT license (see COPYING.MIT for the terms) | 2 | # Released under the MIT license (see COPYING.MIT for the terms) |
| 3 | 3 | ||
| 4 | PR = "${INC_PR}.13" | 4 | PR = "${INC_PR}.14" |
| 5 | 5 | ||
| 6 | include linux-imx.inc | 6 | include linux-imx.inc |
| 7 | 7 | ||
| 8 | COMPATIBLE_MACHINE = "(mxs|mx5)" | 8 | COMPATIBLE_MACHINE = "(mxs|mx5)" |
| 9 | 9 | ||
| 10 | # Revision of imx_2.6.35_10.12.01 branch | 10 | # Revision of imx_2.6.35_10.12.01 branch |
| 11 | SRCREV_mxs = "5910faa40398a445e6b76c2edd1793aa852f738a" | 11 | SRCREV_mxs = "0ea8cb9453379388f870f9b8d13269fb9dc0761c" |
| 12 | LOCALVERSION = "-10.12.01+yocto-${DATE}" | 12 | LOCALVERSION = "-10.12.01+yocto-${DATE}" |
| 13 | 13 | ||
| 14 | # Revision of imx_2.6.35_11.09.01 branch | 14 | # Revision of imx_2.6.35_11.09.01 branch |
| 15 | SRCREV_mx5 = "7bd2ccd2539dba25eee4107122cbe0df70544d7f" | 15 | SRCREV_mx5 = "b279c81dbdc42d22e7e77a59956e894f8f9f81aa" |
| 16 | LOCALVERSION = "-11.09.01+yocto-${DATE}" | 16 | LOCALVERSION = "-11.09.01+yocto-${DATE}" |
| 17 | 17 | ||
| 18 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ | 18 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ |
| 19 | file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ | 19 | file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \ |
| 20 | file://perf-tools-Allow-building-with-gcc-4.6.patch \ | ||
| 21 | " | 20 | " |
| 22 | 21 | ||
| 23 | SRC_URI_append_mxs = " \ | 22 | SRC_URI_append_mxs = " \ |
