diff options
Diffstat (limited to 'packages')
23 files changed, 88 insertions, 385 deletions
diff --git a/packages/classpath/classpath-native_0.97.1.bb b/packages/classpath/classpath-native_0.97.1.bb deleted file mode 100644 index 02328b8a21..0000000000 --- a/packages/classpath/classpath-native_0.97.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require classpath-native.inc - -PR = "r0" diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb index 1c30fc7fe4..71181d961d 100644 --- a/packages/dbus-java/dbus-java_2.3.bb +++ b/packages/dbus-java/dbus-java_2.3.bb @@ -4,10 +4,10 @@ DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" LICENSE = "GPLv2 AFL" SECTION = "libs" -HOMEPAGE = "http://jalimo.org" +HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>" -PR = "r2" +PR = "r3" inherit java-library @@ -15,7 +15,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz S = "${WORKDIR}/dbus-java-${PV}" -DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native" +DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" RSUGGESTS_libdbus-java = "libmatthew-java dbus" RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}" RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}" @@ -25,8 +25,8 @@ do_compile () { oe_runmake \ JCFLAGS="-source 1.5" \ JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR}/java" \ - JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \ + JARPREFIX="${STAGING_DATADIR_JAVA}" \ + JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ CLASSPATH="${S}/classes" \ JAR="fastjar" \ .binclasses @@ -34,8 +34,8 @@ do_compile () { oe_runmake \ JCFLAGS="-source 1.5" \ JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR}/java" \ - JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \ + JARPREFIX="${STAGING_DATADIR_JAVA}" \ + JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ CLASSPATH="${S}/classes" \ JAR="fastjar" \ all @@ -47,8 +47,8 @@ do_compile () { oe_runmake \ JAVAC="oefatal \"No Java compilation expected here.\"" \ JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir}/java \ - JAVAUNIXPATH=${datadir}/java \ + JARPREFIX=${datadir_java} \ + JAVAUNIXPATH=${datadir_java} \ all # Trigger generation of all documentation files to prevent this @@ -56,12 +56,12 @@ do_compile () { oe_runmake \ JAVAC="oefatal \"No Java compilation expected here.\"" \ JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir}/java \ - JAVAUNIXPATH=${datadir}/java \ + JARPREFIX=${datadir_java} \ + JAVAUNIXPATH=${datadir_java} \ CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1 } -do_staging () { +do_stage () { oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar } diff --git a/packages/docbook-utils/docbook-utils-native_0.6.13.bb b/packages/docbook-utils/docbook-utils-native_0.6.13.bb deleted file mode 100644 index 19aa327107..0000000000 --- a/packages/docbook-utils/docbook-utils-native_0.6.13.bb +++ /dev/null @@ -1,24 +0,0 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "openjade-native docbook-sgml-dtd-3.1-native docbook-dsssl-stylesheets-native" - -SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz" -S = "${WORKDIR}/docbook-utils-${PV}" - -inherit autotools native - -do_stage () { - for b in docbook2dvi docbook2man docbook2ps docbook2tex \ - docbook2txt docbook2html docbook2pdf docbook2rtf \ - docbook2texi jw; do - install -m 0755 ${S}/bin/$b ${STAGING_BINDIR}/ - done - for i in backends/dvi backends/html backends/man \ - backends/pdf backends/ps backends/rtf backends/tex \ - backends/texi backends/txt frontends/docbook \ - helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \ - docbook-utils.dsl; do - install -d ${STAGING_DATADIR}/sgml/docbook/utils-${PV}/`dirname $i` - install ${S}/$i ${STAGING_DATADIR}/sgml/docbook/utils-${PV}/$i - done -} diff --git a/packages/docbook-utils/docbook-utils_0.6.13.bb b/packages/docbook-utils/docbook-utils_0.6.13.bb deleted file mode 100644 index ab27062970..0000000000 --- a/packages/docbook-utils/docbook-utils_0.6.13.bb +++ /dev/null @@ -1,13 +0,0 @@ -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "" -DESCRIPTION = "docbook-utils contains scripts for easy conversion \ -from DocBook SGML files to other formats (for example, HTML, RTF, \ -and PostScript), and for comparing SGML files." - -# Not tested. -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz" - -inherit autotools diff --git a/packages/dsplink/dsplink_1.50.bb b/packages/dsplink/dsplink_1.50.bb index 1711fc5c29..9d0e1134d8 100644 --- a/packages/dsplink/dsplink_1.50.bb +++ b/packages/dsplink/dsplink_1.50.bb @@ -1,5 +1,7 @@ DESCRIPTION = "DSP Link for TI ARM/DSP processors" +DEPENDS = "virtual/kernel" + PR = "r0" # Get dsplink tarball from TI website, place in sources and calculate @@ -12,16 +14,20 @@ file://c64xx_5.xx_linux.mk \ file://davinci_mvlpro5.0.mk \ " -S = "${WORKDIR}/dsplink_1_50" +S = "${WORKDIR}/dsplink_1_50/dsplink" + +# Needed for buildscripts +export DSPLINK = "${S}" do_configure () { - cp ${WORKDIR}/CURRENTCFG.MK ${S}/dsplink/config - cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/dsplink/make/Linux - cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/dsplink/make/DspBios + cp ${WORKDIR}/CURRENTCFG.MK ${S}/config + cp ${WORKDIR}/davinci_mvlpro5.0.mk ${S}/make/Linux + cp ${WORKDIR}/c64xx_5.xx_linux.mk ${S}/make/DspBios } do_compile () { - export DSPLINK=${S}/dsplink make -C ${S}/dsplink/gpp/src } +PACKAGE_ARCH = "${MACHINE_ARCH}" + diff --git a/packages/gcc/gcc-4.2.2.inc b/packages/gcc/gcc-4.2.2.inc index 1392b3e830..5691fb647a 100644 --- a/packages/gcc/gcc-4.2.2.inc +++ b/packages/gcc/gcc-4.2.2.inc @@ -76,6 +76,6 @@ FORTRAN = "" FORTRAN_linux-gnueabi = ",fortran" JAVA = "" -EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" ARM_INSTRUCTION_SET = "arm" diff --git a/packages/gcc/gcc-4.3.0.inc b/packages/gcc/gcc-4.3.0.inc index 02ceea7364..96b7d02501 100644 --- a/packages/gcc/gcc-4.3.0.inc +++ b/packages/gcc/gcc-4.3.0.inc @@ -67,5 +67,5 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 " FORTRAN = "" JAVA = "" -EXTRA_OECONF_BASE = " --disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_BASE = " --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" diff --git a/packages/gcc/gcc-cross_4.2.2.bb b/packages/gcc/gcc-cross_4.2.2.bb index 4149179d8e..dc3ee94a52 100644 --- a/packages/gcc/gcc-cross_4.2.2.bb +++ b/packages/gcc/gcc-cross_4.2.2.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/packages/gcc/gcc-cross_4.3.0.bb b/packages/gcc/gcc-cross_4.3.0.bb index f51e60ce13..9821d3cd83 100644 --- a/packages/gcc/gcc-cross_4.3.0.bb +++ b/packages/gcc/gcc-cross_4.3.0.bb @@ -1,4 +1,4 @@ -PR = "r4" +PR = "r5" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/packages/gcc/gcc-cross_csl-arm-2008q1.bb b/packages/gcc/gcc-cross_csl-arm-2008q1.bb index c5a7a93f31..85fcaecec7 100644 --- a/packages/gcc/gcc-cross_csl-arm-2008q1.bb +++ b/packages/gcc/gcc-cross_csl-arm-2008q1.bb @@ -1,4 +1,4 @@ -PR = "r0" +PR = "r1" require gcc-csl-arm-2008q1.inc require gcc-cross4.inc diff --git a/packages/gcc/gcc-csl-arm-2008q1.inc b/packages/gcc/gcc-csl-arm-2008q1.inc index d5cc41d376..d4f6ef1e37 100644 --- a/packages/gcc/gcc-csl-arm-2008q1.inc +++ b/packages/gcc/gcc-csl-arm-2008q1.inc @@ -44,7 +44,7 @@ FORTRAN = "" #FORTRAN_linux-gnueabi = ",fortran" #JAVA = ",java" -EXTRA_OECONF_BASE = "--disable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" +EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap" ARM_INSTRUCTION_SET = "arm" addtask unpack2 after do_unpack before do_patch diff --git a/packages/gcc/gcc-package-cross.inc b/packages/gcc/gcc-package-cross.inc index 54294f4fa6..b95ef88e6f 100644 --- a/packages/gcc/gcc-package-cross.inc +++ b/packages/gcc/gcc-package-cross.inc @@ -2,11 +2,13 @@ INHIBIT_PACKAGE_STRIP ?= "" OLD_INHIBIT_PACKAGE_STRIP := "${INHIBIT_PACKAGE_STRIP}" INHIBIT_PACKAGE_STRIP = "1" -PACKAGES = "libgcc libstdc++ libg2c libgfortran" +PACKAGES = "libgcc libssp libstdc++ libg2c libgfortran" # Called from within gcc-cross, so libdir is set wrong FILES_libg2c = "${target_libdir}/libg2c.so.*" +FILES_libssp = "${target_libdir}/libssp.so.*" + FILES_libgfortran = "${target_libdir}/libgfortran.so.*" FILES_libgcc = "${target_base_libdir}/libgcc_s.so.1" @@ -40,11 +42,13 @@ do_install () { mv -f ${D}${prefix}/*/lib/nof/libstdc++.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/nof/libg2c.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/nof/libgfortran*.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/lib/nof/libssp*.so* ${D}${target_libdir} || true else mv -f ${D}${prefix}/*/lib/libstdc++.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/libg2c.so* ${D}${target_libdir} || true mv -f ${D}${prefix}/*/lib/libgfortran*.so* ${D}${target_libdir} || true + mv -f ${D}${prefix}/*/lib/libssp*.so* ${D}${target_libdir} || true fi diff --git a/packages/libmatthew/libmatthew_0.5.bb b/packages/libmatthew/libmatthew_0.5.bb index 7a1b05478b..fb7ea3cce8 100644 --- a/packages/libmatthew/libmatthew_0.5.bb +++ b/packages/libmatthew/libmatthew_0.5.bb @@ -1,12 +1,14 @@ DESCRIPTION = "Unix socket, debug and hexdump libraries" LICENSE = "LGPL" SECTION = "libs" -HOMEPAGE = "http://jalimo.org" +HOMEPAGE = "http://www.matthew.ath.cx/projects/java" AUTHOR = "Matthew Johnson <web@matthew.ath.cx>" +PR = "r1" + inherit java-library -DEPENDS = "classpath-native classpath" +DEPENDS = "classpath-native classpath fastjar-native" SRC_URI = "http://www.matthew.ath.cx/projects/java/libmatthew-java-${PV}.tar.gz" @@ -40,14 +42,14 @@ do_install() { oe_jarinstall io-0.1.jar io.jar oe_jarinstall unix-0.2.jar unix.jar - oe_libinstall -so libcgi-java ${D}${libdir}/jni - oe_libinstall -so libunix-java ${D}${libdir}/jni + oe_libinstall -so libcgi-java ${D}${libdir_jni} + oe_libinstall -so libunix-java ${D}${libdir_jni} } PACKAGES += "${PN}-jni ${PN}-jni-dbg" RDEPENDS_${JPN} = "${PN}-jni" -FILES_${PN}-jni = "${libdir}/jni/lib*.so" -FILES_${PN}-jni-dbg = "${libdir}/jni/.debug/lib*.so" +FILES_${PN}-jni = "${libdir_jni}/lib*.so" +FILES_${PN}-jni-dbg = "${libdir_jni}/.debug/lib*.so" diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb index 1ecc983b14..dc378d0646 100644 --- a/packages/libopie/libopie2_1.2.3.bb +++ b/packages/libopie/libopie2_1.2.3.bb @@ -1,10 +1,11 @@ require ${PN}.inc -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ - file://gcc-syntax-fix.patch;patch=1 \ - file://h4000_and_default_rot.patch;patch=1" + file://gcc-syntax-fix.patch;patch=1 \ + file://h4000_and_default_rot.patch;patch=1 \ + file://remove_h2200_rotate_fix.patch;patch=1" SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch b/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch deleted file mode 100644 index 3f861ebf9d..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3f8441b4e1fc297caf5cf712c1bc3f506ec28065 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@openembedded.org> -Date: Thu, 8 May 2008 18:30:41 +0200 -Subject: [PATCH] This patch adds RTC support to the omap3 based beagleboard - -Signed-off-by: Koen Kooi <koen@openembedded.org> ---- - arch/arm/mach-omap2/board-omap3beagle.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c -index 626f004..0c0cbfc 100644 ---- a/arch/arm/mach-omap2/board-omap3beagle.c -+++ b/arch/arm/mach-omap2/board-omap3beagle.c -@@ -58,13 +58,25 @@ static struct omap_mmc_config omap3beagle_mmc_config __initdata = { - }, - }; - -+static struct platform_device omap3_beagle_twl4030rtc_device = { -+ .name = "twl4030_rtc", -+ .id = -1, -+}; -+ - static struct omap_board_config_kernel omap3_beagle_config[] __initdata = { - { OMAP_TAG_UART, &omap3_beagle_uart_config }, - { OMAP_TAG_MMC, &omap3beagle_mmc_config }, - }; - -+static struct platform_device *omap3_beagle_devices[] __initdata = { -+#ifdef CONFIG_RTC_DRV_TWL4030 -+ &omap3_beagle_twl4030rtc_device, -+#endif -+}; -+ - static void __init omap3_beagle_init(void) - { -+ platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices)); - omap_board_config = omap3_beagle_config; - omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); - omap_serial_init(); --- -1.5.4.3 - diff --git a/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch b/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch new file mode 100644 index 0000000000..55e9bf7b54 --- /dev/null +++ b/packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch @@ -0,0 +1,36 @@ +From eddf57fb9748791e021ef550d651cc72c48add5c Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@openembedded.org> +Date: Thu, 15 May 2008 09:32:23 +0200 +Subject: [PATCH] ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code + +This patch fixes the merge-damage in the beagleboard RTC code + +Signed-off-by: Koen Kooi <koen@openembedded.org> +--- + arch/arm/mach-omap2/board-omap3beagle.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c +index 0c15ca0..0c0cbfc 100644 +--- a/arch/arm/mach-omap2/board-omap3beagle.c ++++ b/arch/arm/mach-omap2/board-omap3beagle.c +@@ -76,6 +76,7 @@ static struct platform_device *omap3_beagle_devices[] __initdata = { + + static void __init omap3_beagle_init(void) + { ++ platform_add_devices(omap3_beagle_devices, ARRAY_SIZE(omap3_beagle_devices)); + omap_board_config = omap3_beagle_config; + omap_board_config_size = ARRAY_SIZE(omap3_beagle_config); + omap_serial_init(); +@@ -88,8 +89,6 @@ arch_initcall(omap3_beagle_i2c_init); + + static void __init omap3_beagle_map_io(void) + { +- platform_add_devices(omap3_beagle_devices, +- ARRAY_SIZE(omap3_beagle_devices)); + omap2_set_globals_343x(); + omap2_map_common_io(); + } +-- +1.5.4.3 + diff --git a/packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch b/packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch deleted file mode 100644 index 311260d790..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/convert-rwsem-to-rwclock.patch +++ /dev/null @@ -1,220 +0,0 @@ -The generic rwsem implementation of down_read() and down_write() does not
-save and restore interrupt state. This causes powerdomain code to
-inadvertently enable interrupts early in the boot process, causing
-init/main.c to complain. This patch converts powerdomain locking to
-r-w spinlocks instead.
-
-I'm also curious to know if this fixes the BeagleBoard boot problem.
-
-Signed-off-by: Paul Walmsley <paul@pwsan.com>
----
-
- arch/arm/mach-omap2/powerdomain.c | 46 ++++++++++++++++++++++---------------
- 1 files changed, 27 insertions(+), 19 deletions(-)
-
-
-diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c
-index 939efe4..0a6caaf 100644
---- a/arch/arm/mach-omap2/powerdomain.c
-+++ b/arch/arm/mach-omap2/powerdomain.c
-@@ -18,7 +18,7 @@
- #include <linux/module.h>
- #include <linux/types.h>
- #include <linux/delay.h>
--#include <linux/rwsem.h>
-+#include <linux/spinlock.h>
- #include <linux/list.h>
- #include <linux/errno.h>
- #include <linux/err.h>
-@@ -38,10 +38,10 @@
- static LIST_HEAD(pwrdm_list);
-
- /*
-- * pwrdm_rwsem protects pwrdm_list add and del ops - also reused to
-+ * pwrdm_rwlock protects pwrdm_list add and del ops - also reused to
- * protect pwrdm_clkdms[] during clkdm add/del ops
- */
--static DECLARE_RWSEM(pwrdm_rwsem);
-+static DEFINE_RWLOCK(pwrdm_rwlock);
-
-
- /* Private functions */
-@@ -131,6 +131,7 @@ void pwrdm_init(struct powerdomain **pwrdm_list)
- */
- int pwrdm_register(struct powerdomain *pwrdm)
- {
-+ unsigned long flags;
- int ret = -EINVAL;
-
- if (!pwrdm)
-@@ -139,7 +140,7 @@ int pwrdm_register(struct powerdomain *pwrdm)
- if (!omap_chip_is(pwrdm->omap_chip))
- return -EINVAL;
-
-- down_write(&pwrdm_rwsem);
-+ write_lock_irqsave(&pwrdm_rwlock, flags);
- if (_pwrdm_lookup(pwrdm->name)) {
- ret = -EEXIST;
- goto pr_unlock;
-@@ -151,7 +152,7 @@ int pwrdm_register(struct powerdomain *pwrdm)
- ret = 0;
-
- pr_unlock:
-- up_write(&pwrdm_rwsem);
-+ write_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
-@@ -165,12 +166,14 @@ pr_unlock:
- */
- int pwrdm_unregister(struct powerdomain *pwrdm)
- {
-+ unsigned long flags;
-+
- if (!pwrdm)
- return -EINVAL;
-
-- down_write(&pwrdm_rwsem);
-+ write_lock_irqsave(&pwrdm_rwlock, flags);
- list_del(&pwrdm->node);
-- up_write(&pwrdm_rwsem);
-+ write_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- pr_debug("powerdomain: unregistered %s\n", pwrdm->name);
-
-@@ -187,13 +190,14 @@ int pwrdm_unregister(struct powerdomain *pwrdm)
- struct powerdomain *pwrdm_lookup(const char *name)
- {
- struct powerdomain *pwrdm;
-+ unsigned long flags;
-
- if (!name)
- return NULL;
-
-- down_read(&pwrdm_rwsem);
-+ read_lock_irqsave(&pwrdm_rwlock, flags);
- pwrdm = _pwrdm_lookup(name);
-- up_read(&pwrdm_rwsem);
-+ read_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return pwrdm;
- }
-@@ -204,7 +208,7 @@ struct powerdomain *pwrdm_lookup(const char *name)
- *
- * Call the supplied function for each registered powerdomain. The
- * callback function can return anything but 0 to bail out early from
-- * the iterator. The callback function is called with the pwrdm_rwsem
-+ * the iterator. The callback function is called with the pwrdm_rwlock
- * held for reading, so no powerdomain structure manipulation
- * functions should be called from the callback, although hardware
- * powerdomain control functions are fine. Returns the last return
-@@ -215,18 +219,19 @@ struct powerdomain *pwrdm_lookup(const char *name)
- int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm))
- {
- struct powerdomain *temp_pwrdm;
-+ unsigned long flags;
- int ret = 0;
-
- if (!fn)
- return -EINVAL;
-
-- down_read(&pwrdm_rwsem);
-+ read_lock_irqsave(&pwrdm_rwlock, flags);
- list_for_each_entry(temp_pwrdm, &pwrdm_list, node) {
- ret = (*fn)(temp_pwrdm);
- if (ret)
- break;
- }
-- up_read(&pwrdm_rwsem);
-+ read_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
-@@ -243,6 +248,7 @@ int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm))
- */
- int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- {
-+ unsigned long flags;
- int i;
- int ret = -EINVAL;
-
-@@ -252,7 +258,7 @@ int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- pr_debug("powerdomain: associating clockdomain %s with powerdomain "
- "%s\n", clkdm->name, pwrdm->name);
-
-- down_write(&pwrdm_rwsem);
-+ write_lock_irqsave(&pwrdm_rwlock, flags);
-
- for (i = 0; i < PWRDM_MAX_CLKDMS; i++) {
- if (!pwrdm->pwrdm_clkdms[i])
-@@ -278,7 +284,7 @@ int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- ret = 0;
-
- pac_exit:
-- up_write(&pwrdm_rwsem);
-+ write_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
-@@ -295,6 +301,7 @@ pac_exit:
- */
- int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- {
-+ unsigned long flags;
- int ret = -EINVAL;
- int i;
-
-@@ -304,7 +311,7 @@ int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- pr_debug("powerdomain: dissociating clockdomain %s from powerdomain "
- "%s\n", clkdm->name, pwrdm->name);
-
-- down_write(&pwrdm_rwsem);
-+ write_lock_irqsave(&pwrdm_rwlock, flags);
-
- for (i = 0; i < PWRDM_MAX_CLKDMS; i++)
- if (pwrdm->pwrdm_clkdms[i] == clkdm)
-@@ -322,7 +329,7 @@ int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
- ret = 0;
-
- pdc_exit:
-- up_write(&pwrdm_rwsem);
-+ write_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
-@@ -335,7 +342,7 @@ pdc_exit:
- * Call the supplied function for each clockdomain in the powerdomain
- * 'pwrdm'. The callback function can return anything but 0 to bail
- * out early from the iterator. The callback function is called with
-- * the pwrdm_rwsem held for reading, so no powerdomain structure
-+ * the pwrdm_rwlock held for reading, so no powerdomain structure
- * manipulation functions should be called from the callback, although
- * hardware powerdomain control functions are fine. Returns -EINVAL
- * if presented with invalid pointers; or passes along the last return
-@@ -346,18 +353,19 @@ int pwrdm_for_each_clkdm(struct powerdomain *pwrdm,
- int (*fn)(struct powerdomain *pwrdm,
- struct clockdomain *clkdm))
- {
-+ unsigned long flags;
- int ret = 0;
- int i;
-
- if (!fn)
- return -EINVAL;
-
-- down_read(&pwrdm_rwsem);
-+ read_lock_irqsave(&pwrdm_rwlock, flags);
-
- for (i = 0; i < PWRDM_MAX_CLKDMS && !ret; i++)
- ret = (*fn)(pwrdm, pwrdm->pwrdm_clkdms[i]);
-
-- up_read(&pwrdm_rwsem);
-+ read_unlock_irqrestore(&pwrdm_rwlock, flags);
-
- return ret;
- }
---
-To unsubscribe from this list: send the line "unsubscribe linux-omap" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at http://vger.kernel.org/majordomo-info.html
-
diff --git a/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch b/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch deleted file mode 100644 index d81f03880c..0000000000 --- a/packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch +++ /dev/null @@ -1,45 +0,0 @@ -Content-Type: text/plain; charset=ISO-8859-1; format=flowed -Content-Transfer-Encoding: 7bit - - -Enabling L2 cache of Cortex-A8 based OMAP3 has to be done by -bootloader. Check if this is done and warn if not. - -Signed-off-by: Dirk Behme <dirk.behme@gmail.com> - ----- - -Changes in v2: Fix a typo. - -Index: linux-beagle/arch/arm/mach-omap2/id.c -=================================================================== ---- linux-beagle.orig/arch/arm/mach-omap2/id.c -+++ linux-beagle/arch/arm/mach-omap2/id.c -@@ -267,3 +267,26 @@ void __init omap2_check_revision(void) - - } - -+#ifdef CONFIG_ARCH_OMAP3 -+/* -+ * OMAP3 has L2 cache which has to be enabled by bootloader. -+ */ -+static int __init omap3_check_l2cache(void) -+{ -+ u32 val; -+ -+ /* Get CP15 AUX register, bit 1 enabled indicates L2 cache is on */ -+ asm volatile("mrc p15, 0, %0, c1, c0, 1":"=r" (val)); -+ -+ if ((val & 0x2) == 0) { -+ printk(KERN_WARNING "Warning: L2 cache not enabled. Check " -+ "your bootloader. L2 off results in performance loss\n"); -+ } else { -+ pr_info("OMAP3 L2 cache enabled"); -+ } -+ -+ return 0; -+} -+ -+arch_initcall(omap3_check_l2cache); -+#endif /* CONFIG_ARCH_OMAP3 */ - diff --git a/packages/linux/linux-omap2_git.bb b/packages/linux/linux-omap2_git.bb index aaa3c4a6f5..356d26664a 100644 --- a/packages/linux/linux-omap2_git.bb +++ b/packages/linux/linux-omap2_git.bb @@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-omap2-git/${MA SRCREV = "74c89552b4a5f9b5b066f74fa265248f9b5d3f1d" PV = "2.6.25+2.6.26-rc2+git${SRCREV}" -PR = "r12" +PR = "r13" SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ @@ -13,7 +13,8 @@ SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \ SRC_URI_append_beagleboard = " file://no-harry-potter.diff;patch=1 \ file://usb-timout.patch;patch=1 \ - file://l2-cache.patch;patch=1 \ + file://l2-cache.patch;patch=1 \ + file://0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch;patch=1 \ file://0001-omap3beagle-add-driver-to-turn-on-the-TFP410-framer.patch;patch=1 \ " diff --git a/packages/linux/linux_2.6.23+2.6.24-rc5.bb b/packages/linux/linux_2.6.23+2.6.24-rc5.bb index 648fe6b756..d22d5e8f27 100644 --- a/packages/linux/linux_2.6.23+2.6.24-rc5.bb +++ b/packages/linux/linux_2.6.23+2.6.24-rc5.bb @@ -2,7 +2,6 @@ require linux.inc # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_alix = "1" PR = "r3" diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index aea1347767..ca15db543f 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -6,6 +6,7 @@ DEFAULT_PREFERENCE_mpc8313e-rdb = "1" DEFAULT_PREFERENCE_kilauea = "1" DEFAULT_PREFERENCE_sequoia = "1" DEFAULT_PREFERENCE_cm-x270 = "1" +DEFAULT_PREFERENCE_alix = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \ file://defconfig" diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index 9b69b00b48..6f0b1344b3 100644 --- a/packages/qte/qte-common_2.3.10.inc +++ b/packages/qte/qte-common_2.3.10.inc @@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m file://kernel-keymap-corgi.patch;patch=1 \ file://kernel-asm-page.patch;patch=1 \ file://remove-unused-kbdhandler.patch;patch=1 \ + file://disable-dup-rotation.patch;patch=1 \ file://sharp_char.h \ file://switches.h " diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index d9c3de136f..9e3ee5c584 100644 --- a/packages/qte/qte-mt_2.3.10.bb +++ b/packages/qte/qte-mt_2.3.10.bb @@ -1,5 +1,5 @@ require qte-common_${PV}.inc -PR = "r25" +PR = "r26" EXTRA_OECONF += "-thread" |