diff options
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/linux/em-x270_2.6.23.bb | 29 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.23/em-x270/01-prevent_loop_timespec_add_ns.patch | 19 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.23/em-x270/defconfig (renamed from recipes/linux/em-x270-2.6.23/defconfig) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.23/em-x270/em-x270.patch (renamed from recipes/linux/em-x270-2.6.23/em-x270.patch) | 0 | ||||
| -rw-r--r-- | recipes/linux/linux_2.6.23.bb | 3 |
5 files changed, 22 insertions, 29 deletions
diff --git a/recipes/linux/em-x270_2.6.23.bb b/recipes/linux/em-x270_2.6.23.bb deleted file mode 100644 index fcef7280d0..0000000000 --- a/recipes/linux/em-x270_2.6.23.bb +++ /dev/null @@ -1,29 +0,0 @@ -require linux.inc - -SECTION = "kernel" -DESCRIPTION = "Linux kernel for the Compulab EM-X270 system" -LICENSE = "GPL" -DEPENDS = "u-boot-utils-native" -PR = "r1" - -KERNEL_IMAGETYPE = "uImage" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ - file://em-x270.patch;patch=1 \ - file://defconfig \ - " - -S = "${WORKDIR}/linux-${PV}" - -COMPATIBLE_HOST = 'arm.*-linux' -COMPATIBLE_MACHINE = "em-x270" - -inherit kernel -inherit package - -ARCH = "arm" - -FILES_kernel-image = "" - -S = "${WORKDIR}/linux-${PV}" - diff --git a/recipes/linux/linux-2.6.23/em-x270/01-prevent_loop_timespec_add_ns.patch b/recipes/linux/linux-2.6.23/em-x270/01-prevent_loop_timespec_add_ns.patch new file mode 100644 index 0000000000..a2f6e1765e --- /dev/null +++ b/recipes/linux/linux-2.6.23/em-x270/01-prevent_loop_timespec_add_ns.patch @@ -0,0 +1,19 @@ +--- + include/linux/time.h | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) +diff --git a/include/linux/time.h b/include/linux/time.h +index 2091a19..d32ef0a 100644 +--- a/include/linux/time.h ++++ b/include/linux/time.h +@@ -173,6 +173,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns) + { + ns += a->tv_nsec; + while(unlikely(ns >= NSEC_PER_SEC)) { ++ /* The following asm() prevents the compiler from ++ * optimising this loop into a modulo operation. */ ++ asm("" : "+r"(ns)); ++ + ns -= NSEC_PER_SEC; + a->tv_sec++; + } + diff --git a/recipes/linux/em-x270-2.6.23/defconfig b/recipes/linux/linux-2.6.23/em-x270/defconfig index 3246136571..3246136571 100644 --- a/recipes/linux/em-x270-2.6.23/defconfig +++ b/recipes/linux/linux-2.6.23/em-x270/defconfig diff --git a/recipes/linux/em-x270-2.6.23/em-x270.patch b/recipes/linux/linux-2.6.23/em-x270/em-x270.patch index 3c28be83c7..3c28be83c7 100644 --- a/recipes/linux/em-x270-2.6.23/em-x270.patch +++ b/recipes/linux/linux-2.6.23/em-x270/em-x270.patch diff --git a/recipes/linux/linux_2.6.23.bb b/recipes/linux/linux_2.6.23.bb index 76ebbbe917..0f62a1c37c 100644 --- a/recipes/linux/linux_2.6.23.bb +++ b/recipes/linux/linux_2.6.23.bb @@ -28,6 +28,9 @@ SRC_URI_avr32 = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 file://defconfig \ http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.23.atmel.3.patch.bz2;patch=1 \ " +SRC_URI_append_em-x270 = "\ + file://em-x270.patch;patch=1 \ + file://01-prevent_loop_timespec_add_ns.patch;patch=1" SRC_URI_append_cm-x270 = "\ file://0001-cm-x270-base2.patch;patch=1 \ |