]> code.ossystems Code Review - meta-freescale.git/commitdiff
linux-imx (2.6.35.3): Update to newer GIT versions
authorMahesh Mahadevan <mahesh.mahadevan@freescale.com>
Fri, 28 Sep 2012 20:22:01 +0000 (15:22 -0500)
committerOtavio Salvador <otavio@ossystems.com.br>
Fri, 28 Sep 2012 20:20:07 +0000 (17:20 -0300)
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>
meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/perf-tools-Allow-building-with-gcc-4.6.patch [deleted file]
meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb

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 (file)
index ab14abf..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 45e0440a7bf7b1549de7af0e6ce62fc0c73b4b51 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Mon, 24 Sep 2012 09:02:31 -0300
-Subject: [PATCH] perf tools: Allow building with gcc 4.6
-
-The option -Wno-unused-but-set-variable has been add to EXTRA_WARNINGS
-to allow building with newer gcc versions.
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- tools/perf/Makefile |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/perf/Makefile b/tools/perf/Makefile
-index d75c28a..817872e 100644
---- a/tools/perf/Makefile
-+++ b/tools/perf/Makefile
-@@ -217,6 +217,7 @@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wnested-externs
- EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wold-style-definition
- EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-prototypes
- EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wdeclaration-after-statement
-+EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wno-unused-but-set-variable
- ifeq ("$(origin DEBUG)", "command line")
-   PERF_DEBUG = $(DEBUG)
--- 
-1.7.10.4
-
index 20c77b8a8824b9a5eeddedac469a3e04ad1395e6..e3bc5702514c828da5db000209255071951cdd1f 100644 (file)
@@ -1,23 +1,22 @@
 # Copyright (C) 2011-2012 Freescale Semiconductor
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-PR = "${INC_PR}.13"
+PR = "${INC_PR}.14"
 
 include linux-imx.inc
 
 COMPATIBLE_MACHINE = "(mxs|mx5)"
 
 # Revision of imx_2.6.35_10.12.01 branch
-SRCREV_mxs = "5910faa40398a445e6b76c2edd1793aa852f738a"
+SRCREV_mxs = "0ea8cb9453379388f870f9b8d13269fb9dc0761c"
 LOCALVERSION = "-10.12.01+yocto-${DATE}"
 
 # Revision of imx_2.6.35_11.09.01 branch
-SRCREV_mx5 = "7bd2ccd2539dba25eee4107122cbe0df70544d7f"
+SRCREV_mx5 = "b279c81dbdc42d22e7e77a59956e894f8f9f81aa"
 LOCALVERSION = "-11.09.01+yocto-${DATE}"
 
 SRC_URI += "file://NFS-Fix-nfsroot-support.patch \
             file://NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch \
-            file://perf-tools-Allow-building-with-gcc-4.6.patch \
 "
 
 SRC_URI_append_mxs = " \