merge of '171104fab4f21e3a390cb753995beffa459843ab'

     and 'f1ae9d5e5629b09643d5895312ada9a356e6b700'

2 files changed, 85 insertions, 11 deletions

diff --git a/conf/machine/netbook-pro.conf b/conf/machine/netbook-pro.conf
index 5b5f81719e..ffb1b01ece 100755
--- a/conf/machine/netbook-pro.conf
+++ b/conf/machine/netbook-pro.conf
@@ -1,21 +1,39 @@
+#@TYPE: Machine
+#@Name: Psion teklogix netbookpro Platform
+#@DESCRIPTION: Machine configuration for Psion teklogix netbookpro Platformm
+
+INHERIT += "linux_modules"
+
 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"
+IPKG_EXTRA_ARCHS = "armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+#don't try to access tty1
+USE_VT = "0"
+
+
+
+#ship in rootfs:
+NBP_MODULES = 	" apm \
+                  pcmcia-core \
+                  ipv6 "
+BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${NBP_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
 
-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"
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySA0 vt100"
+
+# used by some images
+ROOT_FLASH_SIZE = "32"
+#extra jffs2 tweaks
 EXTRA_IMAGECMD_jffs2 = "-e 16384 -p 512 -n --little-endian"
 udevdir = "/dev"
 
 GUI_MACHINE_CLASS = "bigscreen"
 
-include conf/tune-xscale.conf
 
+
+include conf/machine/include/tune-scale.conf
diff --git a/packages/linux/netbookpro-kernel_2.6.17.bb b/packages/linux/netbookpro-kernel_2.6.17.bb
new file mode 100644
index 0000000000..2f15091b40
--- /dev/null
+++ b/packages/linux/netbookpro-kernel_2.6.17.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "Linux Kernel for Psion/Teklogix netbookpro  compatible machines"
+SECTION = "kernel"
+MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
+LICENSE = "GPL"
+PR = "r0"
+
+COMPATIBLE_MACHINE = "netbook-pro"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
+	http://linuxtogo.org/~koen/netbook-base-r0.patch;patch=1 \
+	http://linuxtogo.org/~koen/defconfig \
+		   "
+
+S = "${WORKDIR}/linux-2.6.17"
+
+inherit kernel
+
+KERNEL_IMAGETYPE = "zImage"
+
+
+
+do_configure() {
+        rm -f ${S}/.config
+        
+        if [ ! -e ${WORKDIR}/defconfig ]; then
+                die "No default configuration for ${MACHINE} available."
+        fi
+
+        
+        if [ "${TARGET_OS}" == "linux-gnueabi" ]; then  
+                echo "CONFIG_AEABI=y"                   >> ${S}/.config
+                echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
+        else    
+                echo "# CONFIG_AEABI is not set"        >> ${S}/.config
+                echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
+        fi
+        
+        sed -e '/CONFIG_AEABI/d' \
+            -e '/CONFIG_OABI_COMPAT=/d' \
+            '${WORKDIR}/defconfig' >>'${S}/.config'
+        
+        yes '' | oe_runmake oldconfig
+
+
+}
+
+do_deploy() {
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+}
+
+do_deploy[dirs] = "${S}"
+
+addtask deploy before do_build after do_compile
+
+