version46

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 146548d..6c3ff37 100644 (file)
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,3 +1,10 @@
+kernel-power (2.6.28-maemo46) fremantle; urgency=low
+
+  * disable u-boot as causes too much trouble
+  * bluetooth patch to make mice work (by freemangordon)
+
+ -- Thomas Tanner <maemo@tannerlab.com>  Thu, 18 Nov 2010 14:40:58 +0100
+
 kernel-power (2.6.28-maemo45) fremantle; urgency=low
 
   * revert to old binary u-boot image for now

diff --git a/kernel-power-2.6.28/debian/patches/bt-mice.diff b/kernel-power-2.6.28/debian/patches/bt-mice.diff
new file mode 100644 (file)
index 0000000..0b5fd92
--- /dev/null
+++ b/kernel-power-2.6.28/debian/patches/bt-mice.diff
@@ -0,0 +1,15 @@
+--- kernel-power-2.6.28.orig/net/bluetooth/hci_event.c
++++ kernel-power-2.6.28/net/bluetooth/hci_event.c
+@@ -1486,12 +1486,6 @@
+               conn->mode = ev->mode;
+               conn->interval = __le16_to_cpu(ev->interval);
+ 
+-              if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {
+-                      if (conn->mode == HCI_CM_ACTIVE)
+-                              conn->power_save = 1;
+-                      else
+-                              conn->power_save = 0;
+-              }
+       }
+ 
+       hci_dev_unlock(hdev);

diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series
index 7dc7cd9..8104c85 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/series
+++ b/kernel-power-2.6.28/debian/patches/series
@@ -37,3 +37,4 @@ fmtx.unlock.diff
 radio-bcm2048.diff
 i2c-battery.diff
 usbhostmode.diff
+bt-mice.diff

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index a26fb1c..d813bb4 100644 (file)
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -49,17 +49,17 @@ configure-stamp:
        $(MAKE) clean
        QUILT_PATCHES=debian/patches quilt push -a -q || test $$? = 2
        cp debian/$(DEFCONFIG) arch/arm/configs/
-       uudecode debian/u-boot.bin.gz.b64 -o - | gunzip -dc > debian/u-boot.bin
-       dd if=debian/u-boot.bin of=debian/u-boot.pad bs=262144 count=1 conv=sync
+       #uudecode debian/u-boot.bin.gz.b64 -o - | gunzip -dc > debian/u-boot.bin
+       #dd if=debian/u-boot.bin of=debian/u-boot.pad bs=262144 count=1 conv=sync
        cd $(KSRC) && $(MAKE) $(EXTRAVERSION) $(DEFCONFIG)
        touch $@
 
 kernel-stamp: configure-stamp
        echo "compile $(PRODUCT) kernel"
        cd $(KSRC) && $(MAKE) $(NJOBS) $(EXTRAVERSION) zImage
-       mkimage  -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n kernel-power -d $(BUILDTMP)/arch/arm/boot/zImage $(BUILDTMP)/arch/arm/boot/uImage
+       #mkimage  -A arm -O linux -T kernel -C none -a 80008000 -e 80008000 -n kernel-power -d $(BUILDTMP)/arch/arm/boot/zImage $(BUILDTMP)/arch/arm/boot/uImage
        #cat /usr/lib/u-boot/u-boot.bin.0x38000/u-boot.bin.0x38000 $(BUILDTMP)/arch/arm/boot/uImage > debian/uImage
-       cat debian/u-boot.pad $(BUILDTMP)/arch/arm/boot/uImage > debian/uImage
+       #cat debian/u-boot.pad $(BUILDTMP)/arch/arm/boot/uImage > debian/uImage
        touch $@
 
 modules-stamp: configure-stamp
@@ -106,8 +106,8 @@ install-kernel:
 
        install -d -m 755 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot
        fiasco-gen -o $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco -g \
+                       -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
                        -k debian/uImage -v $(RELEASE)
-       #               -k $(BUILDTMP)/arch/arm/boot/zImage -v $(RELEASE)
        chmod 644 $(CURDIR)/debian/$(KERNEL_PACKAGE)/boot/zImage-$(RELEASE).fiasco
 
 install-bootimg: