merge of '4ced2a6d71f9eeefb5a83f0584348d666b56065a'

     and '9a6c7bec4be483b56e6305d978adce9e49f1e29c'

4 files changed, 37 insertions, 4 deletions

diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index da6dafd6bc..33380b6dd4 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -2,6 +2,7 @@ SRCREV_pn-frameworkd = "${AUTOREV}"
 SRCREV_pn-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-pygsm = "${AUTOREV}"
+SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
 SRCREV_pn-pyneod = "${AUTOREV}"
 SRCREV_pn-pynoeg = "${AUTOREV}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 6e5ca31d8b..f646ee55cb 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -38,7 +38,6 @@ SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-ffmpeg ?= "12186"
 SRCREV_pn-frameworkd ?= "0c2b55d857ac1e62c1c8538b86c0d8d62a80ccd6"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
@@ -81,6 +80,7 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
+SRCREV_pn-mickeydbus ?= "5cf2a90d86601b2666b4634784853fb51d0d5896"
 SRCREV_pn-mickeyterm ?= "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
 SRCREV_pn-moko-gtk-engine ?= "3612"
 SRCREV_pn-mpd-alsa ?= "6952"
@@ -154,7 +154,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-today2 ?= "4168"
 SRCREV_pn-openmoko-today2-folders ?= "3704"
-SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
+SRCREV_pn-openmoko-toolchain-scripts ?= "4430"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
@@ -187,7 +187,7 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "4297"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-webkit-gtk ?= "32839"
+SRCREV_pn-webkit-gtk ?= "35062"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
 SRCREV_pn-wesnoth ?= "22021"
diff --git a/conf/machine/include/neuros.inc b/conf/machine/include/neuros.inc
new file mode 100644
index 0000000000..d744bf9082
--- /dev/null
+++ b/conf/machine/include/neuros.inc
@@ -0,0 +1,29 @@
+MACHINE_POSTPROCESS_COMMAND = "neuros_make_installkit"
+EXTRA_IMAGECMD_yaffs2 = "0"
+
+EXTRA_IMAGEDEPENDS += "u-boot u-boot-env virtual/kernel neuros-pkggen-native"
+
+neuros_make_installkit () {
+    cd ${DEPLOY_DIR_IMAGE}
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+    mkdir -p ${IMAGE_NAME}-installkit/temp
+
+    # Get the latest kernel and u-boot using the foo-<machine>.bin symlinks
+    cp uImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/temp/uImage
+    [ -f u-boot-${MACHINE}.bin ] && cp u-boot-${MACHINE}.bin ${IMAGE_NAME}-installkit/u-boot.bin
+    [ -f default_env.img ] && cp default_env.img ${IMAGE_NAME}-installkit/	
+
+    cp ${IMAGE_NAME}.rootfs.yaffs2 ${IMAGE_NAME}-installkit/rootfs.yaffs2 
+
+    cd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ 
+      mkfs.jffs2 -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 -n 
+      echo "${MACHINE}" > rootfs.version
+      echo "${MACHINE}" > u-boot.version
+      echo "${MACHINE}" > uImage.version
+      packet_osd2 osd20.pkg '${DISTRO} Developer UPK' default_env.img u-boot.bin uImage.jffs2 rootfs.yaffs2 
+      cd ${DEPLOY_DIR_IMAGE} 
+    
+    cp ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/osd20.pkg ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-osd20.pkg
+    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
+}
+
diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
index 4a540270f4..89e14ce363 100644
--- a/conf/machine/neuros-osd2.conf
+++ b/conf/machine/neuros-osd2.conf
@@ -15,14 +15,17 @@ UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 
 PREFERRED_VERSION_u-boot = "git"
-#UBOOT_MACHINE = "davinci_dvevm_config"
+UBOOT_MACHINE = "davinci_ntosd_644xA_config"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
+IMAGE_FSTYPES += "jffs2 yaffs2"
+
 ROOT_FLASH_SIZE = "29"
 
 MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
 
 require conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/neuros.inc