[oe-commits] org.oe.dev neuros osd2: move upk to .inc so osd1 can use it as well

[koen commit]

neuros osd2: move upk to .inc so osd1 can use it as well

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 93bacb62b740082396abe7297548a05005ddca5b
ViewMTN: http://monotone.openembedded.org/revision/info/93bacb62b740082396abe7297548a05005ddca5b
Files:
1
conf/machine/include/neuros.inc
conf/machine/neuros-osd2.conf
Diffs:

#
# mt diff -r608f21be9dbd1924bc708a01c19b13fde7c4cf6e -r93bacb62b740082396abe7297548a05005ddca5b
#
#
#
# add_file "conf/machine/include/neuros.inc"
#  content [de5f79d756f7c7c3c12df72e717041610e1d8b7e]
# 
# patch "conf/machine/neuros-osd2.conf"
#  from [fd8ea8e7c4ce93f8b8afc38fcd40f6d66a11502f]
#    to [f2495e2a624c7ca2fe7ef129ca3425c81ba09941]
#
============================================================
--- conf/machine/include/neuros.inc	de5f79d756f7c7c3c12df72e717041610e1d8b7e
+++ conf/machine/include/neuros.inc	de5f79d756f7c7c3c12df72e717041610e1d8b7e
@@ -0,0 +1,23 @@
+MACHINE_POSTPROCESS_COMMAND = "neuros_make_installkit"
+
+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
+    cp u-boot-${MACHINE}.bin ${IMAGE_NAME}-installkit/u-boot.bin
+    cp default_env.img ${IMAGE_NAME}-installkit/	
+
+    cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
+
+    cd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ 
+      mkfs.jffs2 -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 -n 
+      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/
+}
+
============================================================
--- conf/machine/neuros-osd2.conf	fd8ea8e7c4ce93f8b8afc38fcd40f6d66a11502f
+++ conf/machine/neuros-osd2.conf	f2495e2a624c7ca2fe7ef129ca3425c81ba09941
@@ -15,7 +15,7 @@ PREFERRED_VERSION_u-boot = "git"
 UBOOT_LOADADDRESS = "0x80008000"
 
 PREFERRED_VERSION_u-boot = "git"
-UBOOT_MACHINE = "davinci_ntosd-644x"
+UBOOT_MACHINE = "davinci_ntosd-644x_config"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
@@ -27,27 +27,5 @@ require conf/machine/include/tune-arm926
 MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
 
 require conf/machine/include/tune-arm926ejs.inc
+require conf/machine/include/neuros.inc
 
-#MACHINE_POSTPROCESS_COMMAND = "neuros_make_installkit"
-
-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
-    cp u-boot-${MACHINE}.bin ${IMAGE_NAME}-installkit/u-boot.bin
-    cp default_env.img ${IMAGE_NAME}-installkit/	
-
-    cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
-
-    cd ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/ 
-      mkfs.jffs2 -d ./temp -o uImage.jffs2 -e 0x20000 -s 0x800 -n 
-      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/
-}
-