version28(pre)

diff --git a/kernel-power-2.6.28/debian/changelog b/kernel-power-2.6.28/debian/changelog
index 2bdafc9..e2cd7b3 100644 (file)
--- a/kernel-power-2.6.28/debian/changelog
+++ b/kernel-power-2.6.28/debian/changelog
@@ -1,3 +1,12 @@
+kernel-power (2.6.28-maemo28) fremantle; urgency=low
+
+  * enabled more QoS modules, IP multiple table+multipath,
+    MMC block bouncing, OABI support
+  * kernel-power-modules: fix preinit MODULE_PATH to always load current kernel modules
+  * kernel-power-deinstall: improved script, msg boxes, error checking
+
+ -- Thomas Tanner <maemo@tannerlab.com>  Sun, 16 May 2010 13:46:47 +0200
+

 kernel-power (2.6.28-maemo27) fremantle; urgency=low
 
   * prerm: minor fix to warn check for HAM only during deinstallation, not on upgrades
 kernel-power (2.6.28-maemo27) fremantle; urgency=low
 
   * prerm: minor fix to warn check for HAM only during deinstallation, not on upgrades

diff --git a/kernel-power-2.6.28/debian/fbcon.diff b/kernel-power-2.6.28/debian/fbcon.diff
new file mode 100644 (file)
index 0000000..e1d78b0
--- /dev/null
+++ b/kernel-power-2.6.28/debian/fbcon.diff
@@ -0,0 +1,16 @@
+--- rx51power_defconfig        2010-05-16 13:57:30.000000000 +0200
++++ rx51power_defconfig.orig   2010-05-16 13:57:01.000000000 +0200
+@@ -1530,7 +1530,12 @@
+ #
+ # CONFIG_VGA_CONSOLE is not set
+ CONFIG_DUMMY_CONSOLE=y
+-# CONFIG_FRAMEBUFFER_CONSOLE is not set
++CONFIG_FRAMEBUFFER_CONSOLE=y
++# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
++# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
++# CONFIG_FONTS is not set
++CONFIG_FONT_8x8=y
++CONFIG_FONT_8x16=y
+ # CONFIG_LOGO is not set
+ CONFIG_SOUND=y
+ # CONFIG_SOUND_OSS_CORE is not set

diff --git a/kernel-power-2.6.28/debian/kernel-power-deinstall b/kernel-power-2.6.28/debian/kernel-power-deinstall
index 666bedf..08fc2bf 100755 (executable)
--- a/kernel-power-2.6.28/debian/kernel-power-deinstall
+++ b/kernel-power-2.6.28/debian/kernel-power-deinstall
@@ -1,7 +1,6 @@
 #!/bin/sh
 #!/bin/sh

-
-f=/tmp/kernel-power-msg
-cat > $f <<EOF
+tmp=/tmp/kernel-deinstall
+cat > $tmp <<EOF

 This program will remove the enhanced power-user Linux kernel
 and restore the original Nokia kernel.
 The settings will be kept but will have no effect.
 This program will remove the enhanced power-user Linux kernel
 and restore the original Nokia kernel.
 The settings will be kept but will have no effect.

@@ -16,30 +15,51 @@ Otherwise confirm the dialog to proceed with the deinstallation.
 After the installation, you need to shutdown your device and
 boot it again to activate the original Nokia kernel.
 EOF
 After the installation, you need to shutdown your device and
 boot it again to activate the original Nokia kernel.
 EOF

-maemo-confirm-text "Kernel-Power Flasher" $f
+maemo-confirm-text "Kernel-Power Flasher" $tmp

 res=$?
 res=$?

-rm -f $f
-dbusmsg="run-standalone.sh dbus-send --type=method_call --dest=org.freedesktop.Notifications /org/freedesktop/Notifications org.freedesktop.Notifications.SystemNoteInfoprint"
+rm -f $tmp
+dbus="run-standalone.sh dbus-send --type=method_call --dest=org.freedesktop.Notifications /org/freedesktop/Notifications"
+dbusmsg () { $dbus org.freedesktop.Notifications.SystemNoteInfoprint string:"$1"; }
+dbusbox () { $dbus org.freedesktop.Notifications.SystemNoteDialog string:"$1" uint32:0 string:OK; }

 
 

-if test ! "$res" = 0; then
-    $dbusmsg string:"User has cancelled the deinstallation. No changes were made."
+if test "$res" != 0; then
+    dbusmsg "User has cancelled the deinstallation. No changes were made."

     exit 1
 fi
 
 if pgrep -f /usr/bin/hildon-application-manager > /dev/null; then
     exit 1
 fi
 
 if pgrep -f /usr/bin/hildon-application-manager > /dev/null; then

-    $dbusmsg string:"Error: Application Manager is running. Please close it before deinstallation."
+    dbusbox "Error: Application Manager is running. Please close it before deinstallation."
+    exit 1
+fi
+if pgrep -f apt-worker > /dev/null; then
+    dbusbox "Error: apt is running. Please wait and try again later."

     exit 1
 fi
 
     exit 1
 fi
 

-$dbusmsg string:"Please wait while deinstalling enhanced kernel..."
+dbusmsg "Please wait while restoring Nokia kernel..."

 
 

-if apt-get install --reinstall -y kernel kernel-flasher | grep "cannot be downloaded"; then
-    $dbusmsg string:"Error during deinstallation. Could not install Nokia kernel."
+apt-get install --reinstall -y kernel kernel-flasher > $tmp
+ok=$?
+cat $tmp
+if grep -qE "(Could not resolve host|cannot be downloaded)" $tmp; then
+    dbusbox "Error during deinstallation: Could not download Nokia kernel. Please make sure the internet connection is working."
+    rm $tmp

     exit 1
 fi
     exit 1
 fi

-if ! apt-get remove -y kernel-power kernel-power-modules; then
-    $dbusmsg string:"Warning: Could not remove enhanced kernel."
+if test $ok = 0 && grep -q "Image flashed successfully" $tmp; then :

 else
 else

-    $dbusmsg string:"Kernel sucessfully deinstalled. Nokia kernel was restored."
+    dbusbox "Error during deinstallation: Could not install Nokia kernel."
+    rm $tmp
+    exit 1

 fi
 fi

-
+dbusmsg "Nokia kernel was restored. Removing enhanced kernel packages..."
+apt-get remove -y kernel-power kernel-power-modules > $tmp
+ok=$?
+cat $tmp
+if test $ok = 0; then
+    dbusbox "Kernel sucessfully deinstalled. Nokia kernel was restored."
+else
+    dbusbox "Warning: Nokia kernel was restored but could not remove enhanced kernel."
+fi
+rm $tmp
+exit $ok

diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in
index 79dac83..8264cc2 100644 (file)
--- a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in
+++ b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in
@@ -10,5 +10,11 @@ ls -1d * | grep -v current | while read i; do
 done
 ln -s @KVER@ /lib/modules/current
 
 done
 ln -s @KVER@ /lib/modules/current
 

+if grep -q "MODULE_PATH=/lib/modules/current" /sbin/preinit; then
+    sed 's%MODULE_PATH=/lib/modules/current%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%' /sbin/preinit > /sbin/preinit.tmp && \
+    chmod +x /sbin/preinit.tmp && \
+    mv /sbin/preinit.tmp /sbin/preinit
+fi
+

 #DEBHELPER#
 
 #DEBHELPER#
 

diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in
index 885e561..ed1e2cb 100644 (file)
--- a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in
+++ b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in
@@ -6,5 +6,11 @@ test -d /lib/modules/@KVER@ && rm -f /lib/modules/@KVER@/modules.*
 rm -f /lib/modules/current
 ln -s 2.6.28-omap1 /lib/modules/current
 
 rm -f /lib/modules/current
 ln -s 2.6.28-omap1 /lib/modules/current
 

+if test "$1" != upgrade && grep -q 'MODULE_PATH=/lib/modules/`uname -r`' /sbin/preinit; then
+    sed 's%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%MODULE_PATH=/lib/modules/current%' /sbin/preinit > /sbin/preinit.tmp && \
+    chmod +x /sbin/preinit.tmp && \
+    mv /sbin/preinit.tmp /sbin/preinit
+fi
+

 #DEBHELPER#
 
 #DEBHELPER#
 

diff --git a/kernel-power-2.6.28/debian/mmc.diff b/kernel-power-2.6.28/debian/mmc.diff
new file mode 100644 (file)
index 0000000..01476d0
--- /dev/null
+++ b/kernel-power-2.6.28/debian/mmc.diff
@@ -0,0 +1,30 @@
+--- rx51power_defconfig        2010-05-16 13:59:55.000000000 +0200
++++ rx51power_defconfig.orig   2010-05-13 13:52:17.000000000 +0200
+@@ -1813,15 +1835,15 @@
+ CONFIG_USB_IP_COMMON=m
+ CONFIG_USB_IP_VHCI_HCD=m
+ # CONFIG_USB_IP_HOST is not set
+-CONFIG_MMC=m
++CONFIG_MMC=y
+ # CONFIG_MMC_DEBUG is not set
+ CONFIG_MMC_UNSAFE_RESUME=y
+ 
+ #
+ # MMC/SD/SDIO Card Drivers
+ #
+-CONFIG_MMC_BLOCK=m
+-#CONFIG_MMC_BLOCK_BOUNCE=y
++CONFIG_MMC_BLOCK=y
++CONFIG_MMC_BLOCK_BOUNCE=y
+ # CONFIG_SDIO_UART is not set
+ # CONFIG_MMC_TEST is not set
+ 
+@@ -1829,7 +1851,7 @@
+ # MMC/SD/SDIO Host Controller Drivers
+ #
+ # CONFIG_MMC_SDHCI is not set
+-CONFIG_MMC_OMAP_HS=m
++CONFIG_MMC_OMAP_HS=y
+ # CONFIG_MMC_SPI is not set
+ # CONFIG_MEMSTICK is not set
+ # CONFIG_ACCESSIBILITY is not set

diff --git a/kernel-power-2.6.28/debian/patches/nootg.diff b/kernel-power-2.6.28/debian/patches/nootg.diff
new file mode 100644 (file)
index 0000000..065e824
--- /dev/null
+++ b/kernel-power-2.6.28/debian/patches/nootg.diff
@@ -0,0 +1,115 @@
+--- kernel-power-2.6.28.orig/drivers/usb/musb/musb_core.c
++++ kernel-power-2.6.28/drivers/usb/musb/musb_core.c
+@@ -241,8 +241,10 @@
+                       r = musb_readb(musb->mregs, MUSB_DEVCTL);
+                       if ((r & MUSB_DEVCTL_VBUS)
+                                       == (3 << MUSB_DEVCTL_VBUS_SHIFT)) {
++#ifdef        CONFIG_USB_MUSB_OTG
+                               musb_save_ctx_and_suspend(&musb->g, 0);
+                               musb_restore_ctx_and_resume(&musb->g);
++#endif
+                               if (musb->board && musb->board->set_pm_limits)
+                                       musb->board->set_pm_limits(
+                                                       musb->controller, 1);
+@@ -1980,7 +1982,11 @@
+       int             ret = -EINVAL;
+ 
+       spin_lock_irqsave(&musb->lock, flags);
++#ifdef        CONFIG_USB_MUSB_OTG
+       ret = sprintf(buf, "%d\n", musb->softconnect);
++#else
++        ret = 0;
++#endif
+       spin_unlock_irqrestore(&musb->lock, flags);
+ 
+       return ret;
+@@ -2003,6 +2009,7 @@
+       }
+ 
+       spin_lock_irqsave(&musb->lock, flags);
++#ifdef        CONFIG_USB_MUSB_OTG
+ 
+       power = musb_readb(musb->mregs, MUSB_POWER);
+ 
+@@ -2013,7 +2020,7 @@
+ 
+       musb->softconnect = !!val;
+       musb_writeb(musb->mregs, MUSB_POWER, power);
+-
++#endif
+       spin_unlock_irqrestore(&musb->lock, flags);
+ 
+       return n;
+@@ -2462,8 +2469,10 @@
+       /* Resets the controller. Has to be done. Without this, most likely
+        * the state machine inside the transceiver doesn't get fixed properly
+        */
++#ifdef        CONFIG_USB_MUSB_OTG
+       musb_save_ctx_and_suspend(&musb->g, 0);
+       musb_restore_ctx_and_resume(&musb->g);
++#endif
+ 
+       return 0;
+ 
+--- kernel-power-2.6.28.orig/drivers/usb/musb/omap2430.c
++++ kernel-power-2.6.28/drivers/usb/musb/omap2430.c
+@@ -161,7 +161,9 @@
+ }
+ void musb_platform_disable(struct musb *musb)
+ {
++#ifdef CONFIG_USB_MUSB_OTG
+       twl4030_upd_usb_suspended(musb->is_suspended);
++#endif
+ }
+ static void omap_vbus_power(struct musb *musb, int is_on, int sleeping)
+ {
+@@ -364,6 +366,7 @@
+ }
+ 
+ #ifdef CONFIG_PM
++#ifdef CONFIG_USB_MUSB_OTG
+ 
+ void musb_save_ctx_and_suspend(struct usb_gadget *gadget, int overwrite)
+ {
+@@ -471,3 +474,4 @@
+ }
+ EXPORT_SYMBOL_GPL(musb_restore_ctx_and_resume);
+ #endif
++#endif
+--- kernel-power-2.6.28.orig/drivers/usb/otg/twl4030-usb.c
++++ kernel-power-2.6.28/drivers/usb/otg/twl4030-usb.c
+@@ -475,8 +475,11 @@
+       }
+ }
+ 
++#ifdef CONFIG_USB_MUSB_OTG
++
+ extern void musb_save_ctx_and_suspend(struct usb_gadget *gadget, int overwrite);
+ extern void musb_restore_ctx_and_resume(struct usb_gadget *gadget);
++#endif
+ 
+ static void twl4030_phy_suspend(struct twl4030_usb *twl, int controller_off)
+ {
+@@ -487,8 +490,10 @@
+       if (!controller_off)
+               twl->asleep = 1;
+ 
++#ifdef CONFIG_USB_MUSB_OTG
+       if (twl->otg.gadget)
+               musb_save_ctx_and_suspend(twl->otg.gadget, 0);
++#endif
+ }
+ 
+ static void twl4030_phy_resume(struct twl4030_usb *twl)
+@@ -502,9 +507,10 @@
+       if (twl->usb_mode == T2_USB_MODE_ULPI)
+               twl4030_i2c_access(twl, 0);
+       twl->asleep = 0;
+-
++#ifdef CONFIG_USB_MUSB_OTG
+       if (twl->otg.gadget)
+               musb_restore_ctx_and_resume(twl->otg.gadget);
++#endif
+ }
+ 
+ static int twl4030_usb_ldo_init(struct twl4030_usb *twl)

diff --git a/kernel-power-2.6.28/debian/patches/series b/kernel-power-2.6.28/debian/patches/series
index ce8be60..9fec7af 100644 (file)
--- a/kernel-power-2.6.28/debian/patches/series
+++ b/kernel-power-2.6.28/debian/patches/series
@@ -21,5 +21,7 @@ led_dbrightness.diff
 wl1251-monitor-mode.diff
 mmcnames-fanoush.diff
 gethercharge.diff
 wl1251-monitor-mode.diff
 mmcnames-fanoush.diff
 gethercharge.diff

+#usbhost_egoshin.diff
+#nootg.diff

 ondemand-avoid.diff
 overclock.diff
 ondemand-avoid.diff
 overclock.diff

diff --git a/kernel-power-2.6.28/debian/patches/usbhost_egoshin.diff b/kernel-power-2.6.28/debian/patches/usbhost_egoshin.diff
new file mode 100644 (file)
index 0000000..2c85263
--- /dev/null
+++ b/kernel-power-2.6.28/debian/patches/usbhost_egoshin.diff
@@ -0,0 +1,41 @@
+--- kernel-power-2.6.28.orig/drivers/usb/core/otg_whitelist.h
++++ kernel-power-2.6.28/drivers/usb/core/otg_whitelist.h
+@@ -14,7 +14,7 @@
+ #else
+ static inline int is_targeted(struct usb_device *d)
+ {
+-      return 0;
++      return 1;
+ }
+ #endif
+ 
+--- kernel-power-2.6.28.orig/drivers/usb/otg/twl4030-usb.c
++++ kernel-power-2.6.28/drivers/usb/otg/twl4030-usb.c
+@@ -621,6 +621,7 @@
+ #endif
+ 
+       status = twl4030_usb_linkstat(twl);
++printk(KERN_WARNING "twl4030_usb_irq: status=0x%0x\n",status);
+       if (status != USB_LINK_UNKNOWN) {
+ 
+               /* FIXME add a set_power() method so that B-devices can
+@@ -669,6 +670,9 @@
+ 
+       twl = xceiv_to_twl(x);
+       twl->otg.gadget = gadget;
++printk(KERN_WARNING "twl4030_set_peripheral() 4030 OTG_CTRL=0x%0x\n",twl4030_usb_read(twl,TWL4030_OTG_CTRL));
++      twl4030_usb_clear_bits(twl,TWL4030_OTG_CTRL,TWL4030_OTG_CTRL_DRVVBUS);
++printk(KERN_WARNING "twl4030_set_peripheral() after 4030 OTG_CTRL=0x%0x\n",twl4030_usb_read(twl,TWL4030_OTG_CTRL));
+       if (!gadget)
+               twl->otg.state = OTG_STATE_UNDEFINED;
+ 
+@@ -684,6 +688,9 @@
+ 
+       twl = xceiv_to_twl(x);
+       twl->otg.host = host;
++printk(KERN_WARNING "twl4030_set_host() 4030 OTG_CTRL=0x%0x\n",twl4030_usb_read(twl,TWL4030_OTG_CTRL));
++      twl4030_usb_set_bits(twl,TWL4030_OTG_CTRL,TWL4030_OTG_CTRL_DRVVBUS);
++printk(KERN_WARNING "twl4030_set_host() after 4030 OTG_CTRL=0x%0x\n",twl4030_usb_read(twl,TWL4030_OTG_CTRL));
+       if (!host)
+               twl->otg.state = OTG_STATE_UNDEFINED;
+ 

diff --git a/kernel-power-2.6.28/debian/rules b/kernel-power-2.6.28/debian/rules
index a551eaf..81e822d 100644 (file)
--- a/kernel-power-2.6.28/debian/rules
+++ b/kernel-power-2.6.28/debian/rules
@@ -4,6 +4,7 @@
 WEEK := $(shell date +%Y%W)
 RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10power\2/')
 WEEK := $(shell date +%Y%W)
 RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
 REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10power\2/')

+#REVISION := $(shell echo "$(RELEASE)" | sed 's/\(.*\)-maemo\(.*\)/.10powerusb\2/')

 EXTRAVERSION := EXTRAVERSION=$(REVISION)
 
 PACKAGE := kernel
 EXTRAVERSION := EXTRAVERSION=$(REVISION)
 
 PACKAGE := kernel

@@ -42,6 +43,7 @@ endif
 configure-stamp:
        dh_testdir
        mkdir -p $(BUILDTMP)
 configure-stamp:
        dh_testdir
        mkdir -p $(BUILDTMP)

+       $(MAKE) mrproper KBUILD_OUTPUT=$(CURDIR)

        $(MAKE) clean
        QUILT_PATCHES=debian/patches quilt push -a -q || test $$? = 2
        cp debian/$(DEFCONFIG) arch/arm/configs/
        $(MAKE) clean
        QUILT_PATCHES=debian/patches quilt push -a -q || test $$? = 2
        cp debian/$(DEFCONFIG) arch/arm/configs/

diff --git a/kernel-power-2.6.28/debian/rx51power_defconfig b/kernel-power-2.6.28/debian/rx51power_defconfig
index 71dc4fa..5b2e6dd 100644 (file)
--- a/kernel-power-2.6.28/debian/rx51power_defconfig
+++ b/kernel-power-2.6.28/debian/rx51power_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28.10power-omap1
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28.10power-omap1

-# Sun May  2 13:08:58 2010
+# Sun May 16 14:27:26 2010

 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

@@ -295,7 +295,7 @@ CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PREEMPT=y
 CONFIG_HZ=128
 CONFIG_AEABI=y
 CONFIG_PREEMPT=y
 CONFIG_HZ=128
 CONFIG_AEABI=y

-# CONFIG_OABI_COMPAT is not set
+CONFIG_OABI_COMPAT=y

 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

@@ -354,6 +354,8 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 # At least one emulation must be selected
 #
 #
 # At least one emulation must be selected
 #

+# CONFIG_FPE_NWFPE is not set
+# CONFIG_FPE_FASTFPE is not set

 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_NEON=y

@@ -401,8 +403,8 @@ CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 CONFIG_IP_FIB_HASH=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_IP_FIB_TRIE is not set
 CONFIG_IP_FIB_HASH=y

-# CONFIG_IP_MULTIPLE_TABLES is not set
-# CONFIG_IP_ROUTE_MULTIPATH is not set
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y

 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
 # CONFIG_IP_ROUTE_VERBOSE is not set
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y

@@ -613,7 +615,7 @@ CONFIG_NET_SCH_TBF=m
 # CONFIG_NET_SCH_GRED is not set
 CONFIG_NET_SCH_DSMARK=m
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NET_SCH_GRED is not set
 CONFIG_NET_SCH_DSMARK=m
 # CONFIG_NET_SCH_NETEM is not set

-# CONFIG_NET_SCH_INGRESS is not set
+CONFIG_NET_SCH_INGRESS=m

 
 #
 # Classification
 
 #
 # Classification

@@ -627,7 +629,7 @@ CONFIG_NET_CLS_U32=m
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CLS_U32_MARK is not set
 CONFIG_NET_CLS_RSVP=m
 # CONFIG_CLS_U32_PERF is not set
 # CONFIG_CLS_U32_MARK is not set
 CONFIG_NET_CLS_RSVP=m

-# CONFIG_NET_CLS_RSVP6 is not set
+CONFIG_NET_CLS_RSVP6=m

 CONFIG_NET_CLS_FLOW=m
 # CONFIG_NET_EMATCH is not set
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_FLOW=m
 # CONFIG_NET_EMATCH is not set
 CONFIG_NET_CLS_ACT=y

@@ -675,6 +677,7 @@ CONFIG_BT_HIDP=m
 CONFIG_BT_HCIH4P=m
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_BT_HCIH4P=m
 # CONFIG_BT_HCIVHCI is not set
 # CONFIG_AF_RXRPC is not set

+CONFIG_FIB_RULES=y

 CONFIG_WIRELESS=y
 CONFIG_CFG80211=y
 CONFIG_NL80211=y
 CONFIG_WIRELESS=y
 CONFIG_CFG80211=y
 CONFIG_NL80211=y

@@ -1529,12 +1532,7 @@ CONFIG_DISPLAY_SUPPORT=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 #
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y

-#CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-# CONFIG_FONTS is not set
-#CONFIG_FONT_8x8=y
-#CONFIG_FONT_8x16=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set

 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set
 # CONFIG_LOGO is not set
 CONFIG_SOUND=y
 # CONFIG_SOUND_OSS_CORE is not set

@@ -1825,7 +1823,7 @@ CONFIG_MMC_UNSAFE_RESUME=y
 # MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=m
 # MMC/SD/SDIO Card Drivers
 #
 CONFIG_MMC_BLOCK=m

-# CONFIG_MMC_BLOCK_BOUNCE is not set
+CONFIG_MMC_BLOCK_BOUNCE=y

 # CONFIG_SDIO_UART is not set
 # CONFIG_MMC_TEST is not set
 
 # CONFIG_SDIO_UART is not set
 # CONFIG_MMC_TEST is not set
 

diff --git a/kernel-power-2.6.28/debian/uhost.diff b/kernel-power-2.6.28/debian/uhost.diff
new file mode 100644 (file)
index 0000000..929df13
--- /dev/null
+++ b/kernel-power-2.6.28/debian/uhost.diff
@@ -0,0 +1,83 @@
+--- rx51power_defconfig        2010-05-16 13:59:55.000000000 +0200
++++ rx51power_defconfig.host   2010-05-13 15:56:18.000000000 +0200
+@@ -953,7 +953,24 @@
+ # CONFIG_USB_KAWETH is not set
+ # CONFIG_USB_PEGASUS is not set
+ # CONFIG_USB_RTL8150 is not set
+-# CONFIG_USB_USBNET is not set
++CONFIG_USB_USBNET=m
++CONFIG_USB_NET_AX8817X=m
++CONFIG_USB_NET_CDCETHER=m
++# CONFIG_USB_NET_DM9601 is not set
++# CONFIG_USB_NET_SMSC95XX is not set
++# CONFIG_USB_NET_GL620A is not set
++CONFIG_USB_NET_NET1080=m
++# CONFIG_USB_NET_PLUSB is not set
++# CONFIG_USB_NET_MCS7830 is not set
++# CONFIG_USB_NET_RNDIS_HOST is not set
++CONFIG_USB_NET_CDC_SUBSET=m
++# CONFIG_USB_ALI_M5632 is not set
++# CONFIG_USB_AN2720 is not set
++CONFIG_USB_BELKIN=y
++CONFIG_USB_ARMLINUX=y
++# CONFIG_USB_EPSON2888 is not set
++# CONFIG_USB_KC2190 is not set
++CONFIG_USB_NET_ZAURUS=m
+ # CONFIG_WAN is not set
+ CONFIG_PPP=m
+ # CONFIG_PPP_MULTILINK is not set
+@@ -1608,8 +1630,8 @@
+ CONFIG_USB_ARCH_HAS_OHCI=y
+ CONFIG_USB_ARCH_HAS_EHCI=y
+ CONFIG_USB=y
+-# CONFIG_USB_DEBUG is not set
+-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
++CONFIG_USB_DEBUG=y
++CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+ 
+ #
+ # Miscellaneous USB options
+@@ -1618,7 +1640,7 @@
+ # CONFIG_USB_DEVICE_CLASS is not set
+ CONFIG_USB_DYNAMIC_MINORS=y
+ CONFIG_USB_SUSPEND=y
+-CONFIG_USB_OTG=y
++# CONFIG_USB_OTG is not set
+ CONFIG_USB_OTG_WHITELIST=y
+ # CONFIG_USB_OTG_BLACKLIST_HUB is not set
+ CONFIG_USB_MON=y
+@@ -1648,10 +1670,10 @@
+ #
+ # OMAP 343x high speed USB support
+ #
+-# CONFIG_USB_MUSB_HOST is not set
++CONFIG_USB_MUSB_HOST=y
+ # CONFIG_USB_MUSB_PERIPHERAL is not set
+-CONFIG_USB_MUSB_OTG=y
+-CONFIG_USB_GADGET_MUSB_HDRC=y
++# CONFIG_USB_MUSB_OTG is not set
++# CONFIG_USB_GADGET_MUSB_HDRC is not set
+ CONFIG_USB_MUSB_HDRC_HCD=y
+ # CONFIG_MUSB_PIO_ONLY is not set
+ CONFIG_USB_INVENTRA_DMA=y
+@@ -1778,7 +1800,8 @@
+ # CONFIG_USB_GADGET_ATMEL_USBA is not set
+ # CONFIG_USB_GADGET_FSL_USB2 is not set
+ # CONFIG_USB_GADGET_LH7A40X is not set
+-# CONFIG_USB_GADGET_OMAP is not set
++CONFIG_USB_GADGET_OMAP=y
++CONFIG_USB_OMAP=m
+ # CONFIG_USB_GADGET_PXA25X is not set
+ # CONFIG_USB_GADGET_PXA27X is not set
+ # CONFIG_USB_GADGET_S3C2410 is not set
+@@ -1788,9 +1811,8 @@
+ # CONFIG_USB_GADGET_NET2280 is not set
+ # CONFIG_USB_GADGET_GOKU is not set
+ # CONFIG_USB_GADGET_DUMMY_HCD is not set
+-CONFIG_USB_GADGET_DUALSPEED=y
++# CONFIG_USB_GADGET_DUALSPEED is not set
+ CONFIG_USB_ZERO=m
+-# CONFIG_USB_ZERO_HNPTEST is not set
+ CONFIG_USB_ETH=m
+ CONFIG_USB_ETH_RNDIS=y
+ # CONFIG_USB_GADGETFS is not set

diff --git a/kernel-power-2.6.28/debian/usb.diff b/kernel-power-2.6.28/debian/usb.diff
new file mode 100644 (file)
index 0000000..0bef41a
--- /dev/null
+++ b/kernel-power-2.6.28/debian/usb.diff
@@ -0,0 +1,66 @@
+--- rx51power_defconfig.28     2010-05-16 13:59:55.000000000 +0200
++++ rx51power_defconfig        2010-05-16 14:00:00.000000000 +0200
+@@ -953,7 +953,24 @@
+ # CONFIG_USB_KAWETH is not set
+ # CONFIG_USB_PEGASUS is not set
+ # CONFIG_USB_RTL8150 is not set
+-# CONFIG_USB_USBNET is not set
++CONFIG_USB_USBNET=m
++CONFIG_USB_NET_AX8817X=m
++CONFIG_USB_NET_CDCETHER=m
++# CONFIG_USB_NET_DM9601 is not set
++# CONFIG_USB_NET_SMSC95XX is not set
++# CONFIG_USB_NET_GL620A is not set
++CONFIG_USB_NET_NET1080=m
++# CONFIG_USB_NET_PLUSB is not set
++# CONFIG_USB_NET_MCS7830 is not set
++# CONFIG_USB_NET_RNDIS_HOST is not set
++CONFIG_USB_NET_CDC_SUBSET=m
++# CONFIG_USB_ALI_M5632 is not set
++# CONFIG_USB_AN2720 is not set
++CONFIG_USB_BELKIN=y
++CONFIG_USB_ARMLINUX=y
++# CONFIG_USB_EPSON2888 is not set
++# CONFIG_USB_KC2190 is not set
++CONFIG_USB_NET_ZAURUS=m
+ # CONFIG_WAN is not set
+ CONFIG_PPP=m
+ # CONFIG_PPP_MULTILINK is not set
+@@ -1608,8 +1625,8 @@
+ CONFIG_USB_ARCH_HAS_OHCI=y
+ CONFIG_USB_ARCH_HAS_EHCI=y
+ CONFIG_USB=y
+-# CONFIG_USB_DEBUG is not set
+-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
++CONFIG_USB_DEBUG=y
++CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+ 
+ #
+ # Miscellaneous USB options
+@@ -1619,7 +1636,7 @@
+ CONFIG_USB_DYNAMIC_MINORS=y
+ CONFIG_USB_SUSPEND=y
+ CONFIG_USB_OTG=y
+-CONFIG_USB_OTG_WHITELIST=y
++# CONFIG_USB_OTG_WHITELIST is not set
+ # CONFIG_USB_OTG_BLACKLIST_HUB is not set
+ CONFIG_USB_MON=y
+ # CONFIG_USB_WUSB is not set
+@@ -1769,7 +1786,7 @@
+ # CONFIG_USB_ISIGHTFW is not set
+ # CONFIG_USB_VST is not set
+ CONFIG_USB_GADGET=m
+-# CONFIG_USB_GADGET_DEBUG is not set
++CONFIG_USB_GADGET_DEBUG=y
+ # CONFIG_USB_GADGET_DEBUG_FILES is not set
+ # CONFIG_USB_GADGET_DEBUG_FS is not set
+ CONFIG_USB_GADGET_VBUS_DRAW=2
+@@ -1807,7 +1824,7 @@
+ # OTG and related infrastructure
+ #
+ CONFIG_USB_OTG_UTILS=y
+-# CONFIG_USB_GPIO_VBUS is not set
++CONFIG_USB_GPIO_VBUS=m
+ # CONFIG_ISP1301_OMAP is not set
+ CONFIG_TWL4030_USB=y
+ CONFIG_USB_IP_COMMON=m