summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/linux/linux-omap-2.6.25/fixes.patch38
-rw-r--r--meta/packages/linux/linux-omap_2.6.25.bb3
2 files changed, 40 insertions, 1 deletions
diff --git a/meta/packages/linux/linux-omap-2.6.25/fixes.patch b/meta/packages/linux/linux-omap-2.6.25/fixes.patch
new file mode 100644
index 0000000000..5df21d5faa
--- /dev/null
+++ b/meta/packages/linux/linux-omap-2.6.25/fixes.patch
@@ -0,0 +1,38 @@
1Index: git/arch/arm/Makefile
2===================================================================
3--- git.orig/arch/arm/Makefile 2008-06-13 13:10:59.000000000 +0100
4+++ git/arch/arm/Makefile 2008-07-19 10:31:31.000000000 +0100
5@@ -47,7 +47,7 @@
6 # Note that GCC does not numerically define an architecture version
7 # macro, but instead defines a whole series of macros which makes
8 # testing for a specific architecture or later rather impossible.
9-arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a)
10+arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
11 arch-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
12 # Only override the compiler option if ARMv6. The ARMv6K extensions are
13 # always available in ARMv7
14Index: git/include/asm-arm/processor.h
15===================================================================
16--- git.orig/include/asm-arm/processor.h 2008-06-13 13:12:19.000000000 +0100
17+++ git/include/asm-arm/processor.h 2008-07-19 10:31:31.000000000 +0100
18@@ -109,14 +109,16 @@
19 #if __LINUX_ARM_ARCH__ >= 5
20
21 #define ARCH_HAS_PREFETCH
22-static inline void prefetch(const void *ptr)
23+#define prefetch(ptr) __builtin_prefetch(ptr)
24+
25+/*static inline void prefetch(const void *ptr)
26 {
27 __asm__ __volatile__(
28- "pld\t%0"
29+ "pld\ta%0"
30 :
31- : "o" (*(char *)ptr)
32+ : "p" (ptr)
33 : "cc");
34-}
35+}*/
36
37 #define ARCH_HAS_PREFETCHW
38 #define prefetchw(ptr) prefetch(ptr)
diff --git a/meta/packages/linux/linux-omap_2.6.25.bb b/meta/packages/linux/linux-omap_2.6.25.bb
index 68d700fc09..356f7551e9 100644
--- a/meta/packages/linux/linux-omap_2.6.25.bb
+++ b/meta/packages/linux/linux-omap_2.6.25.bb
@@ -1,9 +1,10 @@
1require linux-omap.inc 1require linux-omap.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5COMPATIBLE_MACHINE = "omap-3430sdp" 5COMPATIBLE_MACHINE = "omap-3430sdp"
6SRC_URI="git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git;tag=3ce7ba0c3c9566f50725b0108916180db86e1641 \ 6SRC_URI="git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git;tag=3ce7ba0c3c9566f50725b0108916180db86e1641 \
7 file://fixes.patch;patch=1 \
7 file://defconfig-omap-3430sdp" 8 file://defconfig-omap-3430sdp"
8S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
9 10