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

diff --git a/conf/machine/include/neuros.inc b/conf/machine/include/neuros.inc
new file mode 100644 (file)
index 0000000..ae3cd4b
--- /dev/null
+++ b/conf/machine/include/neuros.inc
@@ -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/
+}
+

diff --git a/conf/machine/neuros-osd2.conf b/conf/machine/neuros-osd2.conf
index a1d8c9b..4ac165b 100644 (file)
--- a/conf/machine/neuros-osd2.conf
+++ b/conf/machine/neuros-osd2.conf
@@ -15,7 +15,7 @@ UBOOT_ENTRYPOINT = "0x80008000"
 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 @@ ROOT_FLASH_SIZE = "29"
 MACHINE_FEATURES = "kernel26 pcmcia usbhost screen"
 
 require conf/machine/include/tune-arm926ejs.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/
-}
+require conf/machine/include/neuros.inc