[oe-commits] org.oe.dev merge of '3fd56e976ac5bcaa4320267aaa8b39dceeeebcd4'
pfalcon commit
openembedded-commits at lists.openembedded.org
Tue Dec 25 18:55:20 UTC 2007
merge of '3fd56e976ac5bcaa4320267aaa8b39dceeeebcd4'
and 'd29274157cd7d80d66aa37ae4d3ebf85231e594f'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: ee052ed4280b8c90e00cdccee39cc34ce71af10b
ViewMTN: http://monotone.openembedded.org/revision/info/ee052ed4280b8c90e00cdccee39cc34ce71af10b
Files:
1
packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch
packages/navit/navit_cvs.bb
packages/navit/navit_0.0.3.bb
packages/roadmap/files/qt/roadmap.desktop.patch
packages/roadmap/files/roadmap.desktop.patch
packages/roadmap/roadmap-gtk2_cvs.bb
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2-1.0.12
packages/navit/navit.inc
packages/octave/octave_3.0.0.bb
packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
packages/roadmap/roadmap-gtk2_1.0.12.bb
packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/sane-srcdates.inc
packages/kismet/kismet_2007-10-R1.bb
packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch
packages/linux/linux-rp_2.6.23.bb
packages/navit/navit_0.0.1.bb
packages/navit/navit_0.0.2.bb
packages/python/python-pyqt_4.3.3.bb
packages/roadmap/roadmap.inc
packages/roadmap/zroadmap_1.0.12.bb
packages/roadmap/zroadmap_1.1.0.bb
packages/roadmap/zroadmap_cvs.bb
packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
packages/zaurus-updater/zaurus-updater/updater.sh
packages/zaurus-updater/zaurus-updater.bb
packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig
packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig
packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
Diffs:
#
# mt diff -r3fd56e976ac5bcaa4320267aaa8b39dceeeebcd4 -ree052ed4280b8c90e00cdccee39cc34ce71af10b
#
#
#
# delete "packages/roadmap/zroadmap-1.0.12/qt2-fixes-r1.patch"
#
# rename "packages/navit/navit_cvs.bb"
# to "packages/navit/navit_0.0.3.bb"
#
# rename "packages/roadmap/files/qt/roadmap.desktop.patch"
# to "packages/roadmap/files/roadmap.desktop.patch"
#
# rename "packages/roadmap/roadmap-gtk2_cvs.bb"
# to "packages/roadmap/roadmap-gtk2_1.1.0.bb"
#
# add_dir "packages/roadmap/roadmap-gtk2-1.0.12"
#
# add_file "packages/navit/navit.inc"
# content [926adcffc6471b5c8bf96d43d6eaf5c81bd2debf]
#
# add_file "packages/navit/navit_cvs.bb"
# content [df4f34394db1e519bb35df38f60d90b0c1a13b71]
#
# add_file "packages/octave/octave_3.0.0.bb"
# content [fd814dd8dc7d4aed94aeda8148c85861039e1b40]
#
# add_file "packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch"
# content [72a4e83be42ae269c1a94a7d4b9bfcec143dc775]
#
# add_file "packages/roadmap/roadmap-gtk2_1.0.12.bb"
# content [5c5317b0388798186c0b355406eac18c0fc2ed8b]
#
# add_file "packages/roadmap/roadmap-gtk2_cvs.bb"
# content [511a10a8453ed27a0df812a48cdcba14f90788e9]
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch"
# content [873e511cd3661d256ac9429fd1f8fa41977e8ca7]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [d0ef2c36f1b3189c7ab640814486bc42402933b7]
# to [5c4c13baff9f942bf49f38356a436936e225abbc]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [2210b55702af66bd7496230c31bdd3b1434c3ef5]
# to [cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3]
#
# patch "packages/kismet/kismet_2007-10-R1.bb"
# from [cb2ebd02b717a445eea7d52c0967752bad90862a]
# to [b8971fcf7ccf5f139688680c6faccc7b2cfe9bff]
#
# patch "packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch"
# from [0c5154e470f4e55e2a4fad1e3ff7765a939dc651]
# to [b87e8646dadfb7d5d16757a725aaef9cbc7b7778]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [505c9cf9c63acfb81b9eb656abe42b25f2e89794]
# to [80ed60c8b799a23d2c149a04bbf24f1ed3353a2a]
#
# patch "packages/navit/navit_0.0.1.bb"
# from [f26539d3ae16efb9541db714be3d65c0312fc4a8]
# to [e62a0cfbc62cafa0aeb28e5404dda21160b96d70]
#
# patch "packages/navit/navit_0.0.2.bb"
# from [8f31c0603d8433a2780907e3b27bbcdb87f49f89]
# to [2942d2b0d378026c3e523ebe3834c3aafa8a1e9d]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [bc906c7a1120cb9f65cf1e357eaacd23ff8e0df9]
# to [889d14a50f20feacdb3bfe544505a50b469248d1]
#
# patch "packages/python/python-pyqt_4.3.3.bb"
# from [f4e8b4a75b9b494f6d70e74cc041955ee3af4996]
# to [4c9dd6dd767d79bb118e973d47bbda095cc45c6f]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [3d494fe1e57842d791e68ad3ac1b63b1692305d6]
# to [2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d]
#
# patch "packages/roadmap/roadmap.inc"
# from [18f16cbe822cba5f8dd391e023297f98a693d254]
# to [e3d443eff17119798c0c6deda17bf6ff8785c257]
#
# patch "packages/roadmap/zroadmap_1.0.12.bb"
# from [defdf4312079c65d41c8d23a255e656af962c476]
# to [c6606e496ddb94bd587b0dc254064d721c276aac]
#
# patch "packages/roadmap/zroadmap_1.1.0.bb"
# from [47050a07f10a909f16525fb375ad0bff60a3822e]
# to [deaa33e33e25e1c9b13a64473c53715a50f05d59]
#
# patch "packages/roadmap/zroadmap_cvs.bb"
# from [a3e925537e5fc4d227e62224726e06d610c448b3]
# to [910020856a214de2ce5b21692e857806378508b4]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb"
# from [f9825c85f0e52ef579e9bef9ad5f2469dae32694]
# to [58d9f93157413d0ca323b5aeb9132e14c6bf0210]
#
# patch "packages/zaurus-updater/zaurus-updater/updater.sh"
# from [3414afa63a3d12e6a4cd900e882c8a621de05e1a]
# to [1bed21da6a3b2f4de965a06c2b32af9c3829ea42]
#
# patch "packages/zaurus-updater/zaurus-updater.bb"
# from [f8f7bbf562514bec8076212836576397889ee6ed]
# to [6e0132a319145e0bee0939723f38518cc48760b8]
#
============================================================
--- packages/navit/navit.inc 926adcffc6471b5c8bf96d43d6eaf5c81bd2debf
+++ packages/navit/navit.inc 926adcffc6471b5c8bf96d43d6eaf5c81bd2debf
@@ -0,0 +1,11 @@
+DESCRIPTION = "Navit is a car navigation system with routing engine."
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 gtk+"
+RRECOMMENDS = "gpsd speechd flite"
+
+inherit autotools
+
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+
+FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"
+FILES_${PN}-dev += "${libdir}/${PN}/*/*.so"
============================================================
--- packages/navit/navit_cvs.bb df4f34394db1e519bb35df38f60d90b0c1a13b71
+++ packages/navit/navit_cvs.bb df4f34394db1e519bb35df38f60d90b0c1a13b71
@@ -0,0 +1,13 @@
+require navit.inc
+
+PV = "0.0.3+cvs${SRCDATE}"
+PR = "r0"
+
+S = "${WORKDIR}/navit"
+
+SRC_URI = "cvs://anonymous@navit.cvs.sourceforge.net/cvsroot/navit;module=navit"
+
+EXTRA_OECONF = "--disable-binding-python --disable-gui-sdl --disable-samplemap --enable-avoid-float --enable-avoid-unaligned"
+
+EXTRA_AUTORECONF = " -I m4"
+
============================================================
--- packages/octave/octave_3.0.0.bb fd814dd8dc7d4aed94aeda8148c85861039e1b40
+++ packages/octave/octave_3.0.0.bb fd814dd8dc7d4aed94aeda8148c85861039e1b40
@@ -0,0 +1,27 @@
+require octave.inc
+
+SRC_URI = "ftp://ftp.octave.org/pub/octave/${PN}-${PV}.tar.gz \
+ file://configure.patch;patch=1"
+
+PR = "r0"
+
+PACKAGES =+ "libcruft liboctave liboctinterp octave-oct \
+ libcruft-dev liboctave-dev liboctinterp-dev \
+ libcruft-dbg liboctave-dbg liboctinterp-dbg"
+
+FILES_libcruft = "${libdir}/${PN}-${PV}/libcruft*"
+FILES_libcruft-dev = "${libdir}/${PN}-${PV}/libcruft.so"
+FILES_libcruft-dbg += "${libdir}/${PN}-${PV}/.debug/libcruft*"
+
+FILES_liboctave = "${libdir}/${PN}-${PV}/liboctave*"
+FILES_liboctave-dev = "${libdir}/${PN}-${PV}/liboctave.so"
+FILES_liboctave-dbg += "${libdir}/${PN}-${PV}/.debug/liboctave*"
+
+FILES_liboctinterp = "${libdir}/${PN}-${PV}/liboctinterp*"
+FILES_liboctinterp-dev = "${libdir}/${PN}-${PV}/liboctinterp.so"
+FILES_liboctinterp-dbg += "${libdir}/${PN}-${PV}/.debug/liboctinterp*"
+
+# octave-oct provides subroutines in .oct file format
+FILES_${PN}-oct = "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/*.oct"
+
+FILES_${PN}-dbg += "${libexecdir}/${PN}/${PV}/oct/${TARGET_SYS}/.debug"
============================================================
--- packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch 72a4e83be42ae269c1a94a7d4b9bfcec143dc775
+++ packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch 72a4e83be42ae269c1a94a7d4b9bfcec143dc775
@@ -0,0 +1,11 @@
+--- src/qt/ipkg/zroadgps.desktop.old 2007-12-24 19:35:34.000000000 -0600
++++ src/qt/ipkg/zroadgps.desktop 2007-12-24 19:37:12.000000000 -0600
+@@ -1,6 +1,7 @@
+ [Desktop Entry]
+ Comment=RoadMap
+ Exec=roadgps
+-Icon=zroadgps
++Icon=roadgps
+ Type=Application
+ Name=RoadMapGPS
++Categories=Graphics;Viewer;GTK;
============================================================
--- packages/roadmap/roadmap-gtk2_1.0.12.bb 5c5317b0388798186c0b355406eac18c0fc2ed8b
+++ packages/roadmap/roadmap-gtk2_1.0.12.bb 5c5317b0388798186c0b355406eac18c0fc2ed8b
@@ -0,0 +1,44 @@
+require roadmap.inc
+
+DEPENDS = "gtk+"
+PR = "r0"
+
+SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \
+ file://roadmap.desktop.patch;patch=1 \
+ file://roadgps.desktop.patch;patch=1 \
+ http://www.roadmap.digitalomaha.net/maps-1.0.12/usdir.rdm.tgz \
+ file://zroadgps.png "
+
+S = "${WORKDIR}/roadmap-${PV}/src"
+
+DESKTOP = "GTK2"
+CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \
+ -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
+
+do_compile() {
+ oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a
+ cd gtk2 && oe_runmake
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/pixmaps
+ install -d ${D}${datadir}/roadmap
+
+ install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
+ install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
+
+ install -m 0644 icons/*png ${D}${datadir}/pixmaps/
+ install -m 0644 roadmap.png ${D}${datadir}/pixmaps/
+ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
+
+ install -m 0644 roadmap.desktop ${D}${datadir}/applications/
+ install -m 0644 qt/ipkg/zroadgps.desktop ${D}${datadir}/applications/roadgps.desktop
+
+ install -m 0644 sprites schema preferences ${D}${datadir}/roadmap/
+ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
+
+FILES_${PN} += "${datadir}/roadmap"
+
============================================================
--- packages/roadmap/roadmap-gtk2_cvs.bb 511a10a8453ed27a0df812a48cdcba14f90788e9
+++ packages/roadmap/roadmap-gtk2_cvs.bb 511a10a8453ed27a0df812a48cdcba14f90788e9
@@ -0,0 +1,45 @@
+require roadmap.inc
+
+DEPENDS = "agg expat gtk+"
+PV = "1.1.0+cvs${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \
+ file://cross.patch;patch=1;pnum=2 \
+ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \
+ file://zroadgps.png"
+
+S = "${WORKDIR}/roadmap/src"
+
+DESKTOP = "GTK2"
+AGG = "rgba32"
+CFLAGS += " -I${STAGING_INCDIR}/atk-1.0 -I${STAGING_INCDIR}/cairo -I${STAGING_INCDIR}/pango-1.0 \
+ -I${STAGING_INCDIR}/glib-2.0 -I${STAGING_INCDIR}/gtk-2.0 -I${STAGING_LIBDIR}/gtk-2.0/include -I${S} "
+
+do_compile() {
+ oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a
+ oe_runmake -C gpx libgpx.a
+ oe_runmake -C unix libosroadmap.a
+ oe_runmake -C gtk2 gtkroadmap gtkroadgps
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -d ${D}${datadir}/applications
+ install -d ${D}${datadir}/pixmaps
+ install -d ${D}${datadir}/roadmap
+
+ install -m 0755 gtk2/gtkroadmap ${D}${bindir}/roadmap
+ install -m 0755 gtk2/gtkroadgps ${D}${bindir}/roadgps
+
+ install -m 0644 icons/*png ${D}${datadir}/pixmaps/
+ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${datadir}/pixmaps/roadgps.png
+
+ install -m 0644 roadmap.desktop ${D}${datadir}/applications/
+
+ install -m 0644 sprites preferences ${D}${datadir}/roadmap/
+ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/
+}
+
+FILES_${PN} += "${datadir}/roadmap"
+
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch 873e511cd3661d256ac9429fd1f8fa41977e8ca7
+++ packages/xorg-xserver/xserver-kdrive-1.3.0.0/tosa-fbdev.patch 873e511cd3661d256ac9429fd1f8fa41977e8ca7
@@ -0,0 +1,13 @@
+--- xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c.old 2007-12-24 04:54:13.000000000 -0600
++++ xorg-server-1.3.0.0/hw/kdrive/fbdev/fbdev.c 2007-12-25 01:13:27.000000000 -0600
+@@ -357,10 +357,7 @@ fbdevMapFramebuffer (KdScreenInfo *scree
+ KdMouseMatrix m;
+ FbdevPriv *priv = screen->card->driver;
+
+- if (scrpriv->randr != RR_Rotate_0 || priv->Have18Bpp)
+ scrpriv->shadow = TRUE;
+- else
+- scrpriv->shadow = FALSE;
+
+ KdComputeMouseMatrix (&m, scrpriv->randr, screen->width, screen->height);
+
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc d0ef2c36f1b3189c7ab640814486bc42402933b7
+++ conf/distro/include/angstrom-2007-preferred-versions.inc 5c4c13baff9f942bf49f38356a436936e225abbc
@@ -1659,6 +1659,7 @@ PREFERRED_VERSION_rlpr ?= "2.05"
PREFERRED_VERSION_rglueap ?= "0.1"
PREFERRED_VERSION_rhythmbox ?= "0.8.7"
PREFERRED_VERSION_rlpr ?= "2.05"
+PREFERRED_VERSION_roadmap-gtk2 ?= "1.1.0"
PREFERRED_VERSION_rott ?= "1.0"
PREFERRED_VERSION_rox-filer ?= "2.5"
PREFERRED_VERSION_rp-pppoe ?= "3.8"
@@ -2126,7 +2127,7 @@ PREFERRED_VERSION_zrev7 ?= "1.0.1"
PREFERRED_VERSION_zope ?= "3.3.1"
PREFERRED_VERSION_zrally ?= "0.90"
PREFERRED_VERSION_zrev7 ?= "1.0.1"
-PREFERRED_VERSION_zroadmap ?= "1.0.12"
+PREFERRED_VERSION_zroadmap ?= "1.1.0"
PREFERRED_VERSION_zsafe ?= "2.1.3"
PREFERRED_VERSION_zsh ?= "4.1.1"
PREFERRED_VERSION_zshopi ?= "0.2"
============================================================
--- conf/distro/include/sane-srcdates.inc 2210b55702af66bd7496230c31bdd3b1434c3ef5
+++ conf/distro/include/sane-srcdates.inc cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3
@@ -148,7 +148,6 @@ SRCDATE_yamonenv ?= "20060814"
SRCDATE_xirssi ?= "20060814"
SRCDATE_xsvg ?= "20060814"
SRCDATE_yamonenv ?= "20060814"
-SRCDATE_zroadmap ?= "20060814"
# Freedesktop.org
SRCDATE_poppler0.6 = "20070708"
============================================================
--- packages/kismet/kismet_2007-10-R1.bb cb2ebd02b717a445eea7d52c0967752bad90862a
+++ packages/kismet/kismet_2007-10-R1.bb b8971fcf7ccf5f139688680c6faccc7b2cfe9bff
@@ -1,9 +1,9 @@ LICENSE = "GPLv2"
DESCRIPTION = "Kismet is an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
HOMEPAGE = "http://www.kismetwireless.net/"
SECTION = "console/network"
LICENSE = "GPLv2"
-DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2"
-PR = "r1"
+DEPENDS = "expat gmp imagemagick tiff fakeroot-native zlib bzip2 libpcap"
+PR = "r2"
SRC_URI = "http://www.kismetwireless.net/code/kismet-${PV}.tar.gz"
============================================================
--- packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch 0c5154e470f4e55e2a4fad1e3ff7765a939dc651
+++ packages/linux/linux-rp-2.6.23/tmio-ohci-r9.patch b87e8646dadfb7d5d16757a725aaef9cbc7b7778
@@ -1,10 +1,10 @@ Index: linux-2.6.23/drivers/usb/host/ohc
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Index: linux-2.6.23/drivers/usb/host/ohci-tmio.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-13 01:35:13.049455112 +0300
-@@ -0,0 +1,417 @@
++++ linux-2.6.23/drivers/usb/host/ohci-tmio.c 2007-11-14 16:58:47.637707413 +0300
+@@ -0,0 +1,530 @@
+/*
+ * OHCI HCD(Host Controller Driver) for USB.
+ *
@@ -53,6 +53,14 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+
+/*-------------------------------------------------------------------------*/
+
++#define MAX_TMIO_USB_PORTS 2
++static bool default_tmio_ports[MAX_TMIO_USB_PORTS];
++module_param_array(default_tmio_ports, bool, NULL, 0644);
++MODULE_PARM_DESC(default_tmio_ports,
++ "disable specified TC6393 usb ports (default: all enabled)");
++
++/*-------------------------------------------------------------------------*/
++
+/*
+ * USB Host Controller Configuration Register
+ */
@@ -87,8 +95,8 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+struct {
+ unsigned gcken:1; /* D0 */
+ unsigned ckrnen:1; /* D1 */
-+ unsigned uspw1:1; /* D2 USB Port 1 Power Disable */
-+ unsigned uspw2:1; /* D3 USB Port 2 Power Disable */
++ unsigned uspw0:1; /* D2 USB Port 1 Power Disable */
++ unsigned uspw1:1; /* D3 USB Port 2 Power Disable */
+ unsigned x00:4;
+ unsigned pmee:1; /* D8 */
+ unsigned x01:6;
@@ -100,6 +108,7 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+
+struct tmio_hcd {
+ struct tmio_uhccr __iomem *ccr;
++ bool disabled_ports[MAX_TMIO_USB_PORTS];
+};
+
+#define hcd_to_tmio(hcd) ((struct tmio_hcd *)(hcd_to_ohci(hcd) + 1))
@@ -107,6 +116,39 @@ Index: linux-2.6.23/drivers/usb/host/ohc
+
+/*-------------------------------------------------------------------------*/
+
++struct indexed_device_attribute{
++ struct device_attribute dev_attr;
++ int index;
++};
++#define to_indexed_dev_attr(_dev_attr) \
++ container_of(_dev_attr, struct indexed_device_attribute, dev_attr)
++
++#define INDEXED_ATTR(_name, _mode, _show, _store, _index) \
++ { .dev_attr = __ATTR(_name ## _index, _mode, _show, _store), \
++ .index = _index }
++
++#define INDEXED_DEVICE_ATTR(_name, _mode, _show, _store, _index) \
++struct indexed_device_attribute dev_attr_##_name ## _index \
++ = INDEXED_ATTR(_name, _mode, _show, _store, _index)
++
++/*-------------------------------------------------------------------------*/
++
++
++static void tmio_fill_pm(struct tmio_hcd *tmio, union tmio_uhccr_pm *pm)
++{
++ pm->raw = 0;
++
++ pm->pmee = 1;
++ pm->pmes = 1;
++ pm->gcken = 1;
++ pm->ckrnen = 1;
++
++ if (tmio->disabled_ports[0])
++ pm->us%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rd29274157cd7d80d66aa37ae4d3ebf85231e594f -ree052ed4280b8c90e00cdccee39cc34ce71af10b
#
#
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig"
# from [c986d1a87b8fa694e045a150e5c8b3f104bb912d]
# to [3a22e93941cbb02ca88f84d5e28be0af5f8b5026]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig"
# from [c2c9b620fd8246b79cf6fc9a248a93d13926b09b]
# to [245dec4bfdeee4b8bd4cd6c3f849ce5c820d0aca]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig"
# from [3eab7d807a91664c39d9797521f5e001eb532dc1]
# to [5c0d23858fb69b5c4808b91706f6c6cca41e87bc]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig"
# from [d9f8a03872694e2c0be6681f854850597378c1ae]
# to [af2282487c6fac6e6758af06eaf703ec9dbb832c]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig"
# from [e91cf692230fcbdd091ac4f03bd76d0a90f4d76d]
# to [a7d6a4581c4ef5502c7c7365492d866ceb5d7f8f]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig"
# from [8516de814611730a6b8838cd1e514bfc74949359]
# to [154ba7d94ad69ada836e2b81de5d923c2d43fc0b]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig"
# from [b38e2b0e42d029892edfbdd98314146994a3fd95]
# to [308049f94eba573b71b11dfbad6637b30c1b25f7]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig"
# from [584d8e5084b8a6299e7ccec18f2ca07bddb5a2b2]
# to [f817d1212388679584c68b1319a645d7addd93b6]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig"
# from [d4532b4e939e3d7de2b696337dbc347880be34e4]
# to [5b055972f25e6425864254f0d582a71dc7e9736d]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h4000/defconfig"
# from [a11092b9b193dec862b1bdf2619df7c3b2dd7074]
# to [96616c5f77e89eb3c0fd652f0cb543f77cc3a4ea]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/h5000/defconfig"
# from [bbd3533d10c6c745448c5e92c3799fb591b10dc0]
# to [1588e262a0c87839f9bd790c5b0449c53c320655]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcalpine/defconfig"
# from [916c7fb59ffee9d08c8eea9927fb2f5087fe3bed]
# to [43bfb0072c2146750f6707c92e78d5cfc2d0dff5]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcapache/defconfig"
# from [928f2aee6999e7fb23171cb5d087888c4378daa2]
# to [3821a1ad9cb8ce7d6857c36c1c35cff510a5762e]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcbeetles/defconfig"
# from [2c150fb9e8042a7b8f19d820d120b42df5744f45]
# to [4c2ee65654eb5143259554b7fca8287548b25d85]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcblueangel/defconfig"
# from [4be5cf341de440a0b942bfbab818e10554d0f2eb]
# to [b44ca8ec50300db16875df26ef181473092b145f]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htchimalaya/defconfig"
# from [02d4621765d3dc9cbfedebf028cb011d88a63c5d]
# to [e725c4bddc9a5d23a0b81bef12e2091edde06bcb]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcsable/defconfig"
# from [cfc4330f5746e2b1c98989d3fdbfea4800fb7667]
# to [5ebb86248032b3e69b84dd46a0922021fa9e6686]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcuniversal/defconfig"
# from [1102b410bd3d8153c18f41afde3028d699c7d85f]
# to [f891b5bf5aa2ba8e57f11d12efa1041810712c00]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/htcwallaby/defconfig"
# from [d7e0bd9a6211fe5fefee01e67b04e6bf6356f45a]
# to [d0f6734587de2e7c6d991eba765228bedb4e2740]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/hx4700/defconfig"
# from [f228f1ef12b6ad82b61392c2ea58bf1a534bf43c]
# to [b000531407675137a8a44e8f1611cffa6dad71b8]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/looxc550/defconfig"
# from [f7e08d2a55df3845c408e8966ff07f2aa83bd5b7]
# to [7608495f81b19bc0e32f66a2af2271c174676e2c]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/magician/defconfig"
# from [89afc38bbd5dfffdce8dc5baa7471f4648de4b87]
# to [c08b389dacacfc3954d3d7e233a1475979a6ab9f]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx1950/defconfig"
# from [ccae20c3f62e40debe77a7fbe0a1c9cf01b17fb1]
# to [c6c63c81f10207305412adab5cdbe2ec3296ca65]
#
# patch "packages/linux/linux-handhelds-2.6-2.6.21/rx3000/defconfig"
# from [941f436760a2e74c042122f4fd22e0da0880480c]
# to [982bb2471b087fed87f683028411b87a0325a133]
#
# patch "packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb"
# from [f6bafabbd68cd660896b99cd7c0e97e772393a05]
# to [75393e4feb74ea7e937ef54139a105955ca45032]
#
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig c986d1a87b8fa694e045a150e5c8b3f104bb912d
+++ packages/linux/linux-handhelds-2.6-2.6.21/asus620/defconfig 3a22e93941cbb02ca88f84d5e28be0af5f8b5026
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sat Dec 22 21:02:12 2007
+# Tue Dec 25 16:02:57 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -975,12 +975,13 @@ CONFIG_USB_PXA2XX=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
# CONFIG_USB_PXA2XX_GPIO is not set
@@ -1096,17 +1097,16 @@ CONFIG_RAMFS=y
#
# Network File Systems
#
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig c2c9b620fd8246b79cf6fc9a248a93d13926b09b
+++ packages/linux/linux-handhelds-2.6-2.6.21/asus730/defconfig 245dec4bfdeee4b8bd4cd6c3f849ce5c820d0aca
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sat Dec 22 21:02:12 2007
+# Tue Dec 25 16:02:58 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1079,12 +1079,13 @@ CONFIG_USB_PXA27X=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
# CONFIG_USB_PXA2XX_GPIO is not set
@@ -1217,17 +1218,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
#
# Network File Systems
#
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig 3eab7d807a91664c39d9797521f5e001eb532dc1
+++ packages/linux/linux-handhelds-2.6-2.6.21/aximx50/defconfig 5c0d23858fb69b5c4808b91706f6c6cca41e87bc
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sat Dec 22 21:02:13 2007
+# Tue Dec 25 16:02:58 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -960,12 +960,13 @@ CONFIG_USB_PXA27X=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
# CONFIG_USB_PXA2XX_GPIO is not set
@@ -1081,17 +1082,16 @@ CONFIG_RAMFS=y
#
# Network File Systems
#
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig d9f8a03872694e2c0be6681f854850597378c1ae
+++ packages/linux/linux-handhelds-2.6-2.6.21/eteng500/defconfig af2282487c6fac6e6758af06eaf703ec9dbb832c
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sat Dec 22 21:02:13 2007
+# Tue Dec 25 16:02:58 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -951,12 +951,13 @@ CONFIG_USB_S3C2410=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
@@ -1071,17 +1072,16 @@ CONFIG_RAMFS=y
#
# Network File Systems
#
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig e91cf692230fcbdd091ac4f03bd76d0a90f4d76d
+++ packages/linux/linux-handhelds-2.6-2.6.21/h1910/defconfig a7d6a4581c4ef5502c7c7365492d866ceb5d7f8f
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sat Dec 22 21:02:14 2007
+# Tue Dec 25 16:02:59 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1023,12 +1023,13 @@ CONFIG_USB_PXA2XX=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
# CONFIG_USB_PXA2XX_GPIO is not set
@@ -1151,17 +1152,16 @@ CONFIG_RAMFS=y
#
# Network File Systems
#
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig 8516de814611730a6b8838cd1e514bfc74949359
+++ packages/linux/linux-handhelds-2.6-2.6.21/h2200/defconfig 154ba7d94ad69ada836e2b81de5d923c2d43fc0b
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sat Dec 22 21:02:14 2007
+# Tue Dec 25 16:02:59 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1414,12 +1414,13 @@ CONFIG_USB_PXA2XX=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_DUMMY_HCD is not set
# CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_CHAR is not set
CONFIG_USB_PXA2XX_GPIO=y
@@ -1552,17 +1553,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
#
# Network File Systems
#
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig b38e2b0e42d029892edfbdd98314146994a3fd95
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3600/defconfig 308049f94eba573b71b11dfbad6637b30c1b25f7
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sat Dec 22 21:02:15 2007
+# Tue Dec 25 16:03:00 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -163,7 +163,7 @@ CONFIG_SA1100_H3XXX=y
# CONFIG_SA1100_SIMPAD is not set
# CONFIG_SA1100_SSP is not set
# CONFIG_H3600_SLEEVE is not set
-CONFIG_SA1100_USB=y
+CONFIG_SA1100_USB=m
# CONFIG_SA1100_USB_NETLINK is not set
# CONFIG_SA1100_USB_CHAR is not set
CONFIG_IPAQ_H3600_LCD=y
@@ -1070,17 +1070,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
#
# Network File Systems
#
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig 584d8e5084b8a6299e7ccec18f2ca07bddb5a2b2
+++ packages/linux/linux-handhelds-2.6-2.6.21/h3800/defconfig f817d1212388679584c68b1319a645d7addd93b6
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.21-hh20
-# Sat Dec 22 21:02:15 2007
+# Tue Dec 25 16:03:00 2007
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -162,7 +162,7 @@ CONFIG_SA1100_H3XXX=y
# CONFIG_SA1100_SHANNON is not set
# CONFIG_SA1100_SIMPAD is not set
# CONFIG_SA1100_SSP is not set
-CONFIG_SA1100_USB=y
+CONFIG_SA1100_USB=m
# CONFIG_SA1100_USB_NETLINK is not set
# CONFIG_SA1100_USB_CHAR is not set
@@ -1068,17 +1068,16 @@ CONFIG_JFFS2_CMODE_PRIORITY=y
#
# Network File Systems
#
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
CONFIG_NFS_V3=y
# CONFIG_NFS_V3_ACL is not set
# CONFIG_NFS_V4 is not set
# CONFIG_NFS_DIRECTIO is not set
# CONFIG_NFSD is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=y
+CONFIG_SUNRPC=m
# CONFIG_RPCSEC_GSS_KRB5 is not set
# CONFIG_RPCSEC_GSS_SPKM3 is not set
# CONFIG_SMB_FS is not set
============================================================
--- packages/linux/linux-handhelds-2.6-2.6.21/h3900/defconfig d4532b4e939e3d7de2b696337dbc347880be34e4
+++ packages/linux/linux-handh%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list