Merge branch 'master' of git://openpandora.org/openpandora.oe

diff --git a/recipes/linux/omap3-pandora-kernel/defconfig b/recipes/linux/omap3-pandora-kernel/defconfig
index a05f8ae..40186dc 100755 (executable)
--- a/recipes/linux/omap3-pandora-kernel/defconfig
+++ b/recipes/linux/omap3-pandora-kernel/defconfig
@@ -191,7 +191,7 @@ CONFIG_ARCH_OMAP3=y
 # CONFIG_OMAP_DEBUG_POWERDOMAIN is not set
 # CONFIG_OMAP_DEBUG_CLOCKDOMAIN is not set
 # CONFIG_OMAP_SMARTREFLEX is not set
-# CONFIG_OMAP_RESET_CLOCKS is not set
+CONFIG_OMAP_RESET_CLOCKS=y
 CONFIG_OMAP_BOOT_TAG=y
 CONFIG_OMAP_BOOT_REASON=y
 # CONFIG_OMAP_COMPONENT_VERSION is not set
@@ -334,11 +334,6 @@ CONFIG_BINFMT_MISC=y
 # Power management options
 #
 # CONFIG_PM is not set
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-# CONFIG_APM_EMULATION is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -790,9 +785,10 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
-CONFIG_KEYBOARD_TWL4030=y
+# CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
 CONFIG_KEYBOARD_GPIO=y
+CONFIG_KEYBOARD_TWL4030=y
 CONFIG_INPUT_MOUSE=y
 # CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set

diff --git a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
index d788be3..aa0ee3a 100755 (executable)
--- a/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
+++ b/recipes/linux/omap3-pandora-kernel_2.6.27-pandora.bb
@@ -5,7 +5,7 @@ KERNEL_IMAGETYPE = "uImage"
 
 COMPATIBLE_MACHINE = "omap3-pandora"
 
-SRCREV = "53869101ee3b264caa87a9395aff8532c35e045d"
+SRCREV = "d0d228cbe6533ad6428216dce01424967f86e0a0"
 
 SRC_URI = " \
            git://git.openpandora.org/pandora-kernel.git;protocol=git;branch=pandora-27-omap1 \
@@ -24,25 +24,17 @@ SRC_URI_append = " \
            file://no-cortex-deadlock.patch;patch=1 \
            file://read_die_ids.patch;patch=1 \
            file://fix-install.patch;patch=1 \
-#           file://musb-dma-iso-in.eml;patch=1 \
-#           file://musb-support-high-bandwidth.patch.eml;patch=1 \
            file://mru-fix-timings.diff;patch=1 \
            file://mru-fix-display-panning.diff;patch=1 \
            file://mru-make-dpll4-m4-ck-programmable.diff;patch=1 \
            file://mru-improve-pixclock-config.diff;patch=1 \
            file://mru-make-video-timings-selectable.diff;patch=1 \
            file://mru-enable-overlay-optimalization.diff;patch=1 \
-#           file://musb-fix-ISO-in-unlink.diff;patch=1 \
-#           file://musb-fix-multiple-bulk-transfers.diff;patch=1 \
-#           file://musb-fix-endpoints.diff;patch=1 \
            file://dvb-fix-dma.diff;patch=1 \
            file://0001-Removed-resolution-check-that-prevents-scaling-when.patch;patch=1 \
            file://0001-Implement-downsampling-with-debugs.patch;patch=1 \
            file://sitecomwl168-support.diff;patch=1 \
            file://musb-rxtx.patch;patch=1 \
-           file://0001-SDIO-patches-to-put-some-card-into-into-platform-dev.patch;patch=1 \
-           file://0002-Add-a-very-basic-platform-driver-module-to-bring-up-.patch;patch=1 \
-           file://0003-Remove-old-msm_wifi-hack-as-the-temp-platform-driver.patch;patch=1 \
 "
 
 # SquashFS 4 Patches.

diff --git a/recipes/pandora-system/pandora-misc.bb b/recipes/pandora-system/pandora-misc.bb
index 6db8d0f..d79df57 100644 (file)
--- a/recipes/pandora-system/pandora-misc.bb
+++ b/recipes/pandora-system/pandora-misc.bb
@@ -1,16 +1,16 @@
 DESCRIPTION = "Miscellaneous OpenPandora utilities"
 
-PR = "r2"
+PR = "r3"
 
 PARALLEL_MAKE = ""
 
-DEPENDS = "virtual/libx11"
+DEPENDS = "virtual/libx11 tslib"
 
 SRC_URI = " \
           git://openpandora.org/pandora-misc.git;protocol=git;branch=master \
 "
 
-TARGET_LDFLAGS += "-lpthread -lX11"
+TARGET_LDFLAGS += "-lpthread -lX11 -lts"
 
 SRCREV = "84815134b3dbba81f930ab2476568e7ba1a783d9"
 

diff --git a/recipes/pandora-system/wl1251-modules.bb b/recipes/pandora-system/wl1251-modules.bb
index f53712a..4ee34d8 100755 (executable)
--- a/recipes/pandora-system/wl1251-modules.bb
+++ b/recipes/pandora-system/wl1251-modules.bb
@@ -1,15 +1,13 @@
 DESCRIPTION = "Kernel drivers for the TI WL1251 WiFi chip found on the Pandora - Connected via SDIO"
 LICENSE = "GPLv2"
 
+SRCREV = "aad4586f9b61efc92725b5ebd233c67505d631df"
+
+SRC_URI = " \
+           git://git.openpandora.org/pandora-wifi.git;protocol=git;branch=compat-wireless \
+"
+
 SRC_URI += " \
-       http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/03/compat-wireless-2010-03-10.tar.bz2;name=compat-wireless \
-       file://0001-wl1251-make-local-symbols-static.patch;patch=1 \
-       file://0002-wl1251-fix-ELP_CTRL-register-accesses-when-using-SDI.patch;patch=1 \
-       file://0003-wl1251-reduce-eeprom-read-wait-time.patch;patch=1 \
-       file://0004-wl1251-fix-potential-crash.patch;patch=1 \
-       file://0005-pandora-hacks.patch;patch=1 \
-       file://no-scan-while-connected.patch;patch=1 \
-       file://print-chip-id.patch;patch=1 \
        file://rc.wl1251 \
        file://50-compat_firmware.rules \
        file://compat_firmware.sh \
@@ -17,15 +15,12 @@ SRC_URI += " \
 
 RDEPENDS = "udev"
 
-SRC_URI[compat-wireless.md5sum] = "bd1875aebcc2a72f66529ba625751a8c"
-SRC_URI[compat-wireless.sha256sum] = "dd8d8bc79ccb24a1d043325979e337678991b79f2011df160c2d924f181a82c9"
-
 inherit update-rc.d
 
 INITSCRIPT_NAME = "wl1251-init"
 INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ."
 
-S = "${WORKDIR}/compat-wireless-2010-03-10"
+S = "${WORKDIR}/git"
 
 inherit module