summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-07-07 19:55:29 +0000
committerKoen Kooi <koen@openembedded.org>2008-07-07 19:55:29 +0000
commitf20b74ae9176a7c3afe0c204ce03e8a22dbb8999 (patch)
treedf2ad6a49080067cbca0887ae5a79476b6298449 /conf
parent1aaa03d906a91f3b00b518d3a5d2260d06a4b750 (diff)
neuros osd2: move upk to .inc so osd1 can use it as well
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/neuros.inc23
-rw-r--r--conf/machine/neuros-osd2.conf26
2 files changed, 25 insertions, 24 deletions
diff --git a/conf/machine/include/neuros.inc b/conf/machine/include/neuros.inc
new file mode 100644
index 0000000000..ae3cd4ba32
--- /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 a1d8c9bebd..4ac165b9a4 100644
--- 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