[oe-commits] org.oe.dev merge of '318660b8f7240f5e784cdaa0a4b9048cf6216703'
oe commit
oe at amethyst.openembedded.net
Thu May 29 04:44:06 UTC 2008
merge of '318660b8f7240f5e784cdaa0a4b9048cf6216703'
and '9a7b1dbe287eb9e4b90026bdaca80bbeaeef126b'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 4bfc2c59746619a70cfb600a11d1a54ffe8380d6
ViewMTN: http://monotone.openembedded.org/revision/info/4bfc2c59746619a70cfb600a11d1a54ffe8380d6
Files:
1
packages/lcms/lcms_1.15.bb
packages/lcms/lcms_1.17.bb
packages/linux/linux-omap2-git/beagleboard/mcbsp-fix-include.patch
packages/lcms/lcms_1.13.bb
packages/linux/linux-omap2-git/beagleboard/defconfig
packages/linux/linux-omap2_git.bb
packages/gcc/gcc-4.3.0/gcc-arm-frename-registers.patch
packages/linux/linux-omap1-2.6.24-omap1/timespec_add_ns_avoid_udivdi3.patch
packages/gcc/gcc-4.3.0.inc
packages/gcc/gcc-cross_4.3.0.bb
packages/linux/linux-omap1_2.6.24-omap1.bb
Diffs:
#
# mt diff -r318660b8f7240f5e784cdaa0a4b9048cf6216703 -r4bfc2c59746619a70cfb600a11d1a54ffe8380d6
#
#
#
# rename "packages/lcms/lcms_1.15.bb"
# to "packages/lcms/lcms_1.17.bb"
#
# add_file "packages/linux/linux-omap2-git/beagleboard/mcbsp-fix-include.patch"
# content [1cb99f0c5e0e4baeb6e5c7509e03bec851645b93]
#
# patch "packages/lcms/lcms_1.13.bb"
# from [0333d737ca4dbf5ef5a5e56885f77b6f0ded9a5f]
# to [1ed052d95dce2a54ac2ce7f2d2c37e639c908bb7]
#
# patch "packages/lcms/lcms_1.17.bb"
# from [43e2af1e03861f818dc682455cbd7e1c69e909ee]
# to [f431b2ca601e274ae7f142b6669aa5d09584aa76]
#
# patch "packages/linux/linux-omap2-git/beagleboard/defconfig"
# from [d4b765c88df0fa2613af71e14012c83c8ecc97ba]
# to [2aafda9a94285e1f028bf5b138b0b60355509e06]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [4e4b8ac15c6ae6df2894798d615ef4b5ae2b6ff5]
# to [f974b6ddb18fc07f4c03a0dde33905f2e4345ed1]
#
============================================================
--- packages/linux/linux-omap2-git/beagleboard/mcbsp-fix-include.patch 1cb99f0c5e0e4baeb6e5c7509e03bec851645b93
+++ packages/linux/linux-omap2-git/beagleboard/mcbsp-fix-include.patch 1cb99f0c5e0e4baeb6e5c7509e03bec851645b93
@@ -0,0 +1,10 @@
+--- /tmp/mcbsp.c 2008-05-29 00:41:05.793645383 +0200
++++ git/arch/arm/mach-omap2/mcbsp.c 2008-05-29 00:41:31.584031392 +0200
+@@ -14,6 +14,7 @@
+ #include <linux/init.h>
+ #include <linux/clk.h>
+ #include <linux/err.h>
++#include <linux/io.h>
+
+ #include <asm/arch/dma.h>
+ #include <asm/arch/mux.h>
============================================================
--- packages/lcms/lcms_1.13.bb 0333d737ca4dbf5ef5a5e56885f77b6f0ded9a5f
+++ packages/lcms/lcms_1.13.bb 1ed052d95dce2a54ac2ce7f2d2c37e639c908bb7
@@ -1,7 +1,7 @@ LICENSE = "LGPL"
DESCRIPTION = "Little cms is a small-footprint, speed optimized color management engine."
SECTION = "libs"
LICENSE = "LGPL"
-SRC_URI = "http://www.littlecms.com/lcms-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms-${PV}.tar.gz"
inherit autotools pkgconfig
============================================================
--- packages/lcms/lcms_1.15.bb 43e2af1e03861f818dc682455cbd7e1c69e909ee
+++ packages/lcms/lcms_1.17.bb f431b2ca601e274ae7f142b6669aa5d09584aa76
@@ -1,7 +1,7 @@ LICENSE = "LGPL"
DESCRIPTION = "Little cms is a small-footprint, speed optimized color management engine."
SECTION = "libs"
LICENSE = "LGPL"
-SRC_URI = "http://www.littlecms.com/lcms-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms-${PV}.tar.gz"
inherit autotools pkgconfig
============================================================
--- packages/linux/linux-omap2-git/beagleboard/defconfig d4b765c88df0fa2613af71e14012c83c8ecc97ba
+++ packages/linux/linux-omap2-git/beagleboard/defconfig 2aafda9a94285e1f028bf5b138b0b60355509e06
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.26-rc3-omap1
-# Tue May 27 19:21:03 2008
+# Linux kernel version: 2.6.26-rc4-omap1
+# Thu May 29 00:40:28 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -869,6 +869,7 @@ CONFIG_TWL4030_PWRBUTTON=y
# CONFIG_TWL4030_POWEROFF is not set
# CONFIG_SENSORS_MAX6875 is not set
# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_TSL2563 is not set
# CONFIG_LP5521 is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
@@ -913,7 +914,59 @@ CONFIG_HAVE_GPIO_LIB=y
# CONFIG_GPIO_MCP23S08 is not set
# CONFIG_W1 is not set
# CONFIG_POWER_SUPPLY is not set
-# CONFIG_HWMON is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_SENSORS_TSC210X is not set
+CONFIG_SENSORS_OMAP34XX=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y
@@ -1242,6 +1295,7 @@ CONFIG_USB_PRINTER=m
#
CONFIG_USB_ACM=m
CONFIG_USB_PRINTER=m
+# CONFIG_USB_WDM is not set
#
# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1381,6 +1435,7 @@ CONFIG_SDIO_UART=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_BLOCK_BOUNCE=y
CONFIG_SDIO_UART=y
+# CONFIG_MMC_TEST is not set
#
# MMC/SD Host Controller Drivers
============================================================
--- packages/linux/linux-omap2_git.bb 4e4b8ac15c6ae6df2894798d615ef4b5ae2b6ff5
+++ packages/linux/linux-omap2_git.bb f974b6ddb18fc07f4c03a0dde33905f2e4345ed1
@@ -2,9 +2,9 @@ FILESDIR = "${@os.path.dirname(bb.data.g
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MACHINE}"
-SRCREV = "41c13615e46ed02a1aaafcc267603be8ea5244e9"
+SRCREV = "6b403428164c53d94bd9377d84e69052563dd57d"
-PV = "2.6.25+2.6.26-rc3+git${SRCREV}"
+PV = "2.6.25+2.6.26-rc4+git${SRCREV}"
PR = "r18"
@@ -18,6 +18,7 @@ SRC_URI_append_beagleboard = " file://no
file://00004-omap2-mcbsp.patch;patch=1 \
file://0001-ASoC-OMAP-Add-basic-support-for-OMAP34xx-in-McBSP.patch;patch=1 \
file://mux.patch;patch=1 \
+ file://mcbsp-fix-include.patch;patch=1 \
"
COMPATIBLE_MACHINE = "omap2430sdp|omap2420h4|beagleboard"
#
# mt diff -r9a7b1dbe287eb9e4b90026bdaca80bbeaeef126b -r4bfc2c59746619a70cfb600a11d1a54ffe8380d6
#
#
#
# add_file "packages/gcc/gcc-4.3.0/gcc-arm-frename-registers.patch"
# content [8d2fa9a0a67879860a70216b0a96214c848ac5e1]
#
# add_file "packages/linux/linux-omap1-2.6.24-omap1/timespec_add_ns_avoid_udivdi3.patch"
# content [5dbe41ae23b0e8b8dc8169659e11fe40c2f9198f]
#
# patch "packages/gcc/gcc-4.3.0.inc"
# from [323ce0b37791068a29c4c609dc7d22e5e111dfb1]
# to [7dac0d4ea94fbc3071cf13542d7afc9c97598920]
#
# patch "packages/gcc/gcc-cross_4.3.0.bb"
# from [9cd84c8b2ab3edb8dc72fcf69627b4428b4555f6]
# to [92a221642f7dc1aab89b441260e03250310a208a]
#
# patch "packages/linux/linux-omap1_2.6.24-omap1.bb"
# from [4a6c582a9685167ac03820d31261bc5c2ed4d475]
# to [b4a8d9d884b9150241b678e0a16eb076f72715f4]
#
============================================================
--- packages/gcc/gcc-4.3.0/gcc-arm-frename-registers.patch 8d2fa9a0a67879860a70216b0a96214c848ac5e1
+++ packages/gcc/gcc-4.3.0/gcc-arm-frename-registers.patch 8d2fa9a0a67879860a70216b0a96214c848ac5e1
@@ -0,0 +1,25 @@
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35964
+Index: gcc-4.3.0/gcc/regrename.c
+===================================================================
+--- gcc-4.3.0.orig/gcc/regrename.c 2008-05-28 08:31:15.000000000 -0700
++++ gcc-4.3.0/gcc/regrename.c 2008-05-28 08:34:00.000000000 -0700
+@@ -782,6 +782,10 @@
+ || (predicated && recog_data.operand_type[i] == OP_OUT))
+ recog_data.operand_type[i] = OP_INOUT;
+ }
++ /* Unshare dup_loc RTL */
++ for (i = 0; i < recog_data.n_dups; i++)
++ *recog_data.dup_loc[i] = copy_rtx(*recog_data.dup_loc[i]);
++
+
+ /* Step 1: Close chains for which we have overlapping reads. */
+ for (i = 0; i < n_ops; i++)
+@@ -813,7 +817,7 @@
+ OP_IN, 0);
+
+ for (i = 0; i < recog_data.n_dups; i++)
+- *recog_data.dup_loc[i] = copy_rtx (old_dups[i]);
++ *recog_data.dup_loc[i] = old_dups[i];
+ for (i = 0; i < n_ops; i++)
+ *recog_data.operand_loc[i] = old_operands[i];
+ if (recog_data.n_dups)
============================================================
--- packages/linux/linux-omap1-2.6.24-omap1/timespec_add_ns_avoid_udivdi3.patch 5dbe41ae23b0e8b8dc8169659e11fe40c2f9198f
+++ packages/linux/linux-omap1-2.6.24-omap1/timespec_add_ns_avoid_udivdi3.patch 5dbe41ae23b0e8b8dc8169659e11fe40c2f9198f
@@ -0,0 +1,20 @@
+Backport of this patch here
+
+http://www.mail-archive.com/linux-kernel@vger.kernel.org/msg270684.html
+
+Needed for 2.6.24 to compile with gcc 4.3
+Index: linux-2.6.24/include/linux/time.h
+===================================================================
+--- linux-2.6.24.orig/include/linux/time.h 2008-05-28 15:39:46.000000000 -0700
++++ linux-2.6.24/include/linux/time.h 2008-05-28 15:40:48.000000000 -0700
+@@ -173,6 +173,10 @@
+ {
+ 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++;
+ }
============================================================
--- packages/gcc/gcc-4.3.0.inc 323ce0b37791068a29c4c609dc7d22e5e111dfb1
+++ packages/gcc/gcc-4.3.0.inc 7dac0d4ea94fbc3071cf13542d7afc9c97598920
@@ -59,6 +59,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
# file://pr34130.patch;patch=1 \
# file://fortran-static-linking.patch;patch=1 \
# file://intermask-bigendian.patch;patch=1 \
+ file://gcc-arm-frename-registers.patch;patch=1 \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
============================================================
--- packages/gcc/gcc-cross_4.3.0.bb 9cd84c8b2ab3edb8dc72fcf69627b4428b4555f6
+++ packages/gcc/gcc-cross_4.3.0.bb 92a221642f7dc1aab89b441260e03250310a208a
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
require gcc-${PV}.inc
require gcc-cross4.inc
============================================================
--- packages/linux/linux-omap1_2.6.24-omap1.bb 4a6c582a9685167ac03820d31261bc5c2ed4d475
+++ packages/linux/linux-omap1_2.6.24-omap1.bb b4a8d9d884b9150241b678e0a16eb076f72715f4
@@ -5,6 +5,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
http://www.muru.com/linux/omap/patches/patch-2.6.24-omap1.bz2;patch=1 \
file://binutils-buildid-arm.patch;patch=1 \
+ file://timespec_add_ns_avoid_udivdi3.patch;patch=1 \
file://defconfig"
S = "${WORKDIR}/linux-2.6.24"
More information about the Openembedded-commits
mailing list