merge of 5979643441d3c55d014e5c0f2955c6c482b2d0bf

     and 8718924d1b4932954af92b862bc4ca06150cf900

7 files changed, 41 insertions, 1 deletions

diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
new file mode 100755
index 0000000000..5b5f81719e
--- /dev/null
+++ b/conf/machine/netbook-pro.conf
@@ -0,0 +1,21 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm"
+BOOTSTRAP_EXTRA_DEPENDS = "pcmcia-cs xserver-kdrive wireless-tools hostap-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "pcmcia-cs xserver-kdrive-epson wireless-tools"
+BOOTSTRAP_EXTRA_RRECOMMENDS ="hostap-modules-cs"
+
+GPE_EXTRA_DEPENDS += "gpe-mini-browser tinymail"
+GPE_EXTRA_INSTALL += "gpe-mini-browser tinymail"
+
+# Why?!
+SERIAL_CONSOLE = "/dev/ttySA0 115200 vt100"
+IMAGE_FSTYPE = "jffs2"
+PREFERRED_PROVIDER_virtual/kernel = "linux-netbook"
+#for lx: EXTRA_IMAGECMD_jffs2 = "-e 32768 -p 512 -n --little-endian"
+EXTRA_IMAGECMD_jffs2 = "-e 16384 -p 512 -n --little-endian"
+udevdir = "/dev"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+include conf/tune-xscale.conf
+
diff --git a/packages/base-files/base-files/netbook-pro/.mtn2git_empty b/packages/base-files/base-files/netbook-pro/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/base-files/base-files/netbook-pro/.mtn2git_empty
diff --git a/packages/base-files/base-files/netbook-pro/fstab b/packages/base-files/base-files/netbook-pro/fstab
new file mode 100644
index 0000000000..d10c78bd66
--- /dev/null
+++ b/packages/base-files/base-files/netbook-pro/fstab
@@ -0,0 +1,5 @@
+rootfs               /                    auto       defaults              1 1
+proc                 /proc                proc       defaults              0 0
+devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
+usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
+tmpfs                /var                 tmpfs      defaults              0 0
diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb
index d30df061b7..85c0e84d6e 100644
--- a/packages/base-files/base-files_3.0.14.bb
+++ b/packages/base-files/base-files_3.0.14.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Miscellaneous files for the base system."
 SECTION = "base"
 PRIORITY = "required"
-PR = "r52"
+PR = "r53"
 LICENSE = "GPL"
 
 SRC_URI = " \
@@ -131,6 +131,10 @@ do_install_append_slugos() {
 	ln -s ../root ${D}/home/root
 }
 
+do_install_append_netbook-pro () {
+	mkdir -p ${D}/initrd
+}
+
 PACKAGES = "${PN}-doc ${PN}"
 FILES_${PN} = "/"
 FILES_${PN}-doc = "${docdir} ${datadir}/common-licenses"
diff --git a/packages/tslib/tslib/netbook-pro/.mtn2git_empty b/packages/tslib/tslib/netbook-pro/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/tslib/tslib/netbook-pro/.mtn2git_empty
diff --git a/packages/tslib/tslib/netbook-pro/ts.conf b/packages/tslib/tslib/netbook-pro/ts.conf
new file mode 100644
index 0000000000..6d94a8f468
--- /dev/null
+++ b/packages/tslib/tslib/netbook-pro/ts.conf
@@ -0,0 +1,5 @@
+module_raw input
+module variance delta=80
+#module dejitter delta=2
+module linear
+
diff --git a/packages/tslib/tslib/netbook-pro/tslib.sh b/packages/tslib/tslib/netbook-pro/tslib.sh
new file mode 100644
index 0000000000..d31bc76368
--- /dev/null
+++ b/packages/tslib/tslib/netbook-pro/tslib.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+
+export TSLIB_TSDEVICE