Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/03 19:19:51+02:00 utwente.nl!koen
Adjust nokia770.conf, add Xserver-kdrive-omap + tslib-meamo + nokia X extensions, courtesy Florian Boor

BKrev: 42a095fayXaGlEPCkp032bAjDOrnSg

10 files changed, 20 insertions, 13 deletions

diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 468e1e9c54..fafcd13b4e 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -4,7 +4,9 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm armv4 armv5te"
 
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive-omap"
+PREFERRED_PROVIDER_virtual/bootloader = ""
+PREFERRED_PROVIDER_tslib = "tslib-maemo"
 
 # 800x480 is big enough for me
 GUI_MACHINE_CLASS = "bigscreen"
@@ -19,8 +21,13 @@ include conf/machine/tune-arm926ejs.conf
 
 #size of the root partition (yes, it is 123 MB)
 ROOT_FLASH_SIZE = "123"
+EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000 --no-cleanmarkers"
 
-#build omap1 till nokia releases the patches
+# serial console port on devboard rev. B3
+SERIAL_CONSOLE = "115200 ttyS0"
+
+
+#buid omap1 till nokia releases the patches
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_VERSION_orinoco-modules = "0.15rc1"
 
@@ -31,23 +38,23 @@ BOOTSTRAP_EXTRA_RDEPENDS = "kernel        udev sysfsutils  \
 pcmcia-cs apm  ppp wireless-tools irda-utils udev-utils console-tools"
 
 # NFS Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
 # Crypto Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5"
 # SMB and CRAMFS
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs"
 # Serial Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 "
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 "
 # Bluetooth Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
-                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
+#                             kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco"
 # Infrared Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
-                             kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \
+#                             kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
 # PPP Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async"
 
 #USB Gadget Modules
-BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
-							 kernel-module-g-ether"
+#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
+#							 kernel-module-g-ether"
 
diff --git a/packages/maemo/xpext/auxdir.patch b/packages/maemo/xpext/auxdir.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/maemo/xpext/auxdir.patch
diff --git a/packages/tslib/tslib-maemo/multievent.patch b/packages/tslib/tslib-maemo/multievent.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib-maemo/multievent.patch
diff --git a/packages/tslib/tslib-maemo/nokia770/ts.conf b/packages/tslib/tslib-maemo/nokia770/ts.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib-maemo/nokia770/ts.conf
diff --git a/packages/tslib/tslib-maemo/ts.conf b/packages/tslib/tslib-maemo/ts.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib-maemo/ts.conf
diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib-maemo_0.0.1-15.bb
diff --git a/packages/xserver/xserver-kdrive-omap/configure-tslib.patch b/packages/xserver/xserver-kdrive-omap/configure-tslib.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver/xserver-kdrive-omap/configure-tslib.patch
diff --git a/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch b/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver/xserver-kdrive-omap/fbdev-not-fix.patch
diff --git a/packages/xserver/xserver-kdrive-omap/kmode.patch b/packages/xserver/xserver-kdrive-omap/kmode.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver/xserver-kdrive-omap/kmode.patch
diff --git a/packages/xserver/xserver-kdrive-omap_6.6.3.bb b/packages/xserver/xserver-kdrive-omap_6.6.3.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xserver/xserver-kdrive-omap_6.6.3.bb